Mercurial > emacs

changeset 109481:19ca6f3cc339

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Tue, 20 Jul 2010 22:54:46 +0000
parents 20f9503a8859 (current diff) d12162869c07 (diff)
children 893ec0a03db8
files
diffstat 29 files changed, 348 insertions(+), 296 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Jul 20 01:19:04 2010 +0000
+++ b/ChangeLog	Tue Jul 20 22:54:46 2010 +0000
@@ -44,7 +44,8 @@
 	Fix CFLAGS for non-GCC compilers.
 	* configure.in (CFLAGS): Always use -g like it was done before the
 	2010-03-30 change.
-	(REAL_CFLAGS): Use CFLAGS for non-GCC to get optimization flags.  (Bug#6538)
+	(REAL_CFLAGS): Use CFLAGS for non-GCC to get optimization flags.
+	(Bug#6538)
 
 2010-06-30  Glenn Morris  <rgm@gnu.org>
 
@@ -82,8 +83,7 @@
 
 2010-06-12  Glenn Morris  <rgm@gnu.org>
 
-	* Makefile.in (install-arch-indep): Delete any old info .gz files
-	first.
+	* Makefile.in (install-arch-indep): Delete any old info .gz files first.
 
 2010-06-11  Glenn Morris  <rgm@gnu.org>
 
@@ -509,7 +509,7 @@
 	* configure.in: Remove support for old UNIX System V systems and
 	for Unixware on non-x86 machines.
 
-	* configure.in:	Remove support for Solaris on PPC and for old versions.
+	* configure.in: Remove support for Solaris on PPC and for old versions.
 
 	* configure.in: Remove non-working lynxos port.
 
--- a/doc/lispref/ChangeLog	Tue Jul 20 01:19:04 2010 +0000
+++ b/doc/lispref/ChangeLog	Tue Jul 20 22:54:46 2010 +0000
@@ -25,8 +25,7 @@
 
 2010-06-19  Chong Yidong  <cyd@stupidchicken.com>
 
-	* errors.texi (Standard Errors): Remove unnecessary markup
-	(Bug#6461).
+	* errors.texi (Standard Errors): Remove unnecessary markup (Bug#6461).
 
 2010-06-02  Chong Yidong  <cyd@stupidchicken.com>
 
@@ -45,8 +44,7 @@
 
 2010-05-22  Chong Yidong  <cyd@stupidchicken.com>
 
-	* display.texi (Image Cache): Update documentation about image
-	caching.
+	* display.texi (Image Cache): Update documentation about image caching.
 
 2010-05-08  Štěpán Němec  <stepnem@gmail.com>  (tiny change)
 
--- a/doc/misc/ChangeLog	Tue Jul 20 01:19:04 2010 +0000
+++ b/doc/misc/ChangeLog	Tue Jul 20 22:54:46 2010 +0000
@@ -109,7 +109,7 @@
 
 	* Version 23.2 released.
 
-2010-05-01  Daniel E. Doherty <ddoherty03@gmail.com> (tiny change)
+2010-05-01  Daniel E. Doherty  <ddoherty03@gmail.com>  (tiny change)
 
 	* calc.texi (Tutorial): Use "^{\prime}" to indicate primes.
 
@@ -258,7 +258,7 @@
 2010-01-17  Michael Albinus  <michael.albinus@gmx.de>
 
 	* tramp.texi (Frequently Asked Questions): Add GNU Emacs 23 and
-	SXEmacs	22 to the supported systems.  New item for hung ssh sessions.
+	SXEmacs 22 to the supported systems.  New item for hung ssh sessions.
 
 2010-01-17  Glenn Morris  <rgm@gnu.org>
 
--- a/etc/ChangeLog	Tue Jul 20 01:19:04 2010 +0000
+++ b/etc/ChangeLog	Tue Jul 20 22:54:46 2010 +0000
@@ -1,3 +1,7 @@
+2010-07-20  Juanma Barranquero  <lekktu@gmail.com>
+
+	* PROBLEMS: Add note about use of backslashes in Windows paths.
+
 2010-07-19  Juanma Barranquero  <lekktu@gmail.com>
 
 	* NEWS: Mention --enable-checking is now supported on Windows.
@@ -7,7 +11,6 @@
 	* refcards/orgcard.tex: Remove the key for the TODO sparse tree
 	and add the new key.  Document new keys for image and entity
 	display.  Document the Org Babel keys.
-	
 
 2010-06-19  Ken Brown  <kbrown@cornell.edu>
 
--- a/etc/PROBLEMS	Tue Jul 20 01:19:04 2010 +0000
+++ b/etc/PROBLEMS	Tue Jul 20 22:54:46 2010 +0000
@@ -1037,7 +1037,7 @@
 
 This happens sometimes when using Metacity.  Resizing Emacs or ALT-Tab:bing
 makes the system unresponsive to the mouse or the keyboard.  Killing Emacs
-or shifting out from X11 and back again usually cures it (i.e. Ctrl-Alt-F1 
+or shifting out from X11 and back again usually cures it (i.e. Ctrl-Alt-F1
 and then Alt-F7).  A bug for it is here:
 https://bugs.launchpad.net/ubuntu/+source/metacity/+bug/231034.
 Note that a permanent fix seems to be to disable "assistive technologies".
@@ -1514,7 +1514,7 @@
 (the one running rlogin, not the one running rlogind) using the
 stty command, before starting the rlogin process.  On many systems,
 "stty start u stop u" will do this.  On some systems, use
-"stty -ixon" instead. 
+"stty -ixon" instead.
 
 Some versions of tcsh will prevent even this from working.  One way
 around this is to start another shell before starting rlogin, and
@@ -2433,6 +2433,20 @@
 	2. Install the latest Windows SDK.
 	3. Replace emacs.ico with an older or edited icon.
 
+*** Building the MS-Windows port complains about unknown escape sequences.
+
+Errors and warnings can look like this:
+
+ w32.c:1959:27: error: \x used with no following hex digits
+ w32.c:1959:27: warning: unknown escape sequence '\i'
+
+This happens when paths using backslashes are passed to the compiler or
+linker (via -I and possibly other compiler flags); when these paths are
+included in source code, the backslashes are interpreted as escape sequences.
+See http://lists.gnu.org/archive/html/emacs-devel/2010-07/msg00995.html
+
+The fix is to use forward slashes in all paths passed to the compiler.
+
 ** Linking
 
 *** Building Emacs with a system compiler fails to link because of an
--- a/lib-src/ChangeLog	Tue Jul 20 01:19:04 2010 +0000
+++ b/lib-src/ChangeLog	Tue Jul 20 22:54:46 2010 +0000
@@ -1,3 +1,12 @@
+2010-07-20  Juanma Barranquero  <lekktu@gmail.com>
+
+	* emacsclient.c (get_current_dir_name, w32_get_resource)
+	(w32_getenv, w32_set_user_model_id, w32_window_app, w32_execvp)
+	(close_winsock, initialize_sockets, w32_find_emacs_process)
+	(w32_give_focus):
+	* ntlib.c (getlogin, getuid, getgid, getegid):
+	Convert definitions to standard C.
+
 2010-07-12  Andreas Schwab  <schwab@linux-m68k.org>
 
 	* Makefile.in (C_WARNINGS_SWITCH, PROFILING_CFLAGS)
@@ -20,7 +29,7 @@
 
 2010-07-11  Eli Zaretskii  <eliz@gnu.org>
 
-	* makefile.w32-in (obj): Add menu.o, bidi.o, w32uniscrobe.o,
+	* makefile.w32-in (obj): Add menu.o, bidi.o, w32uniscribe.o,
 	and unexw32.o.  (Bug#6603)
 
 2010-07-10  Eli Zaretskii  <eliz@gnu.org>
@@ -272,8 +281,7 @@
 
 2010-01-29  Kester Habermann  <kester@linuxtag.org>  (tiny change)
 
-	* etags.c (Fortran_functions): Handle recursive keyword
-	(Bug#5484).
+	* etags.c (Fortran_functions): Handle recursive keyword (Bug#5484).
 
 2010-01-11  Glenn Morris  <rgm@gnu.org>
 
--- a/lib-src/emacsclient.c	Tue Jul 20 01:19:04 2010 +0000
+++ b/lib-src/emacsclient.c	Tue Jul 20 22:54:46 2010 +0000
@@ -235,7 +235,7 @@
    Any other returned value must be freed with free.  This is used
    only when get_current_dir_name is not defined on the system.  */
 char*
-get_current_dir_name ()
+get_current_dir_name (void)
 {
   char *buf;
   char *pwd;
@@ -311,10 +311,7 @@
    Return NULL if the variable was not found, or it was empty.
    This code is based on w32_get_resource (w32.c).  */
 char *
-w32_get_resource (predefined, key, type)
-     HKEY predefined;
-     char *key;
-     LPDWORD type;
+w32_get_resource (HKEY predefined, char *key, LPDWORD type)
 {
   HKEY hrootkey = NULL;
   char *result = NULL;
@@ -347,8 +344,7 @@
   variables in the registry if they don't appear in the environment.
 */
 char *
-w32_getenv (envvar)
-     char *envvar;
+w32_getenv (char *envvar)
 {
   char *value;
   DWORD dwType;
@@ -396,7 +392,7 @@
 }
 
 void
-w32_set_user_model_id ()
+w32_set_user_model_id (void)
 {
   HMODULE shell;
   HRESULT (WINAPI * set_user_model) (wchar_t * id);
@@ -423,7 +419,7 @@
 }
 
 int
-w32_window_app ()
+w32_window_app (void)
 {
   static int window_app = -1;
   char szTitle[MAX_PATH];
@@ -446,13 +442,11 @@
   This is necessary due to the broken implementation of exec* routines in
   the Microsoft libraries: they concatenate the arguments together without
   quoting special characters, and pass the result to CreateProcess, with
-  predictably bad results.  By contrast, Posix execvp passes the arguments
+  predictably bad results.  By contrast, POSIX execvp passes the arguments
   directly into the argv array of the child process.
 */
 int
-w32_execvp (path, argv)
-     char *path;
-     char **argv;
+w32_execvp (const char *path, char **argv)
 {
   int i;
 
@@ -900,15 +894,15 @@
 
 #ifdef WINDOWSNT
 /* Wrapper to make WSACleanup a cdecl, as required by atexit.  */
-void
-__cdecl close_winsock ()
+void __cdecl
+close_winsock (void)
 {
   WSACleanup ();
 }
 
 /* Initialize the WinSock2 library.  */
 void
-initialize_sockets ()
+initialize_sockets (void)
 {
   WSADATA wsaData;
 
@@ -1408,9 +1402,7 @@
 FARPROC get_wc;  /* Pointer to RealGetWindowClassA.  */
 
 BOOL CALLBACK
-w32_find_emacs_process (hWnd, lParam)
-     HWND hWnd;
-     LPARAM lParam;
+w32_find_emacs_process (HWND hWnd, LPARAM lParam)
 {
   DWORD pid;
   char class[6];
@@ -1438,7 +1430,7 @@
  * process id = emacs_pid.  If found, allow it to grab the focus.
  */
 void
-w32_give_focus ()
+w32_give_focus (void)
 {
   HANDLE user32;
 
--- a/lib-src/ntlib.c	Tue Jul 20 01:19:04 2010 +0000
+++ b/lib-src/ntlib.c	Tue Jul 20 22:54:46 2010 +0000
@@ -38,7 +38,7 @@
    would necessitate including windows.h in the files that used it.
    This is much easier.  */
 void
-sleep(unsigned long seconds)
+sleep (unsigned long seconds)
 {
   Sleep (seconds * 1000);
 }
@@ -56,7 +56,7 @@
 static int    getppid_ppid;
 
 int
-getppid(void)
+getppid (void)
 {
   char *ppid;
   DWORD result;
@@ -64,7 +64,7 @@
   ppid = getenv ("EM_PARENT_PROCESS_ID");
   if (!ppid)
     {
-      printf("no pid.\n");
+      printf ("no pid.\n");
       return 0;
     }
   else
@@ -74,11 +74,11 @@
 
   if (!getppid_parent)
     {
-      getppid_parent = OpenProcess (SYNCHRONIZE, FALSE, atoi(ppid));
+      getppid_parent = OpenProcess (SYNCHRONIZE, FALSE, atoi (ppid));
       if (!getppid_parent)
 	{
 	  printf ("Failed to open handle to parent process: %d\n",
-		 GetLastError());
+		 GetLastError ());
 	  exit (1);
 	}
     }
@@ -94,13 +94,13 @@
       return 1;
     case WAIT_FAILED:
     default:
-      printf ("Checking parent status failed: %d\n", GetLastError());
+      printf ("Checking parent status failed: %d\n", GetLastError ());
       exit (1);
     }
 }
 
 char *
-getlogin ()
+getlogin (void)
 {
   static char user_name[256];
   DWORD  length = sizeof (user_name);
@@ -120,19 +120,19 @@
 }
 
 unsigned
-getuid ()
+getuid (void)
 {
   return 0;
 }
 
 unsigned
-getgid ()
+getgid (void)
 {
   return 0;
 }
 
 unsigned
-getegid ()
+getegid (void)
 {
   return 0;
 }
@@ -219,7 +219,7 @@
 }
 
 FILE *
-sys_fopen(const char * path, const char * mode)
+sys_fopen (const char * path, const char * mode)
 {
   return fopen (path, mode);
 }
--- a/lisp/ChangeLog	Tue Jul 20 01:19:04 2010 +0000
+++ b/lisp/ChangeLog	Tue Jul 20 22:54:46 2010 +0000
@@ -1,3 +1,17 @@
+2010-07-20  Michael Albinus  <michael.albinus@gmx.de>
+
+	* net/tramp.el (tramp-file-name-handler): Trace 'quit.
+	(tramp-open-connection-setup-interactive-shell): Apply
+	workaround for IRIX64 bug.  Move argument of last
+	`tramp-send-command' where it belongs to.
+
+2010-07-20  Michael Albinus  <michael.albinus@gmx.de>
+
+	* net/tramp.el (tramp-perl-file-attributes)
+	(tramp-perl-directory-files-and-attributes): Don't pass "$3".
+	(tramp-maybe-open-connection): Use `async-args' and `gw-args' in
+	front of `login-args'.
+
 2010-07-19  Juanma Barranquero  <lekktu@gmail.com>
 
 	* time.el (display-time-world-mode): Define with `define-derived-mode'.
@@ -7,7 +21,7 @@
 2010-07-18  Alan Mackenzie  <acm@muc.de>
 
 	Enhance `c-file-style' in file/directory local variables.
-	* cc-mode.el (c-count-cfss): New function.
+	* progmodes/cc-mode.el (c-count-cfss): New function.
 	(c-before-hack-hook): Call `c-set-style' differently according to
 	whether c-file-style was set in file or directory local
 	variables.
@@ -40,8 +54,7 @@
 	(sql-connection-alist): New variable.
 	(sql-connect): New function.
 	(sql--alt-buffer-part, sql--alt-if-not-empty)
-	(sql-make-alternate-buffer-name): Improved alternative buffer
-	name.
+	(sql-make-alternate-buffer-name): Improved alternative buffer name.
 
 2010-07-17  Thierry Volpiatto  <thierry.volpiatto@gmail.com>
 
@@ -72,7 +85,7 @@
 
 2010-07-16  Reiner Steib  <Reiner.Steib@gmx.de>
 
-	* vc.el (vc-coding-system-inherit-eol): New defvar.
+	* vc/vc.el (vc-coding-system-inherit-eol): New defvar.
 	(vc-coding-system-for-diff): Use it to decide whether to inherit
 	from the file the EOL format for reading the diffs of that file.
 	(Bug#4451)
@@ -125,7 +138,7 @@
 	* menu-bar.el (menu-bar-enable-clipboard): Don't overwrite
 	Cut/Copy/Paste menu bar items.
 
-2010-07-13  Thierry Volpiatto <thierry.volpiatto@gmail.com>
+2010-07-13  Thierry Volpiatto  <thierry.volpiatto@gmail.com>
 
 	Allow C-w when setting a bookmark in a Gnus Article buffer (Bug#5975).
 	Patch applied by Karl Fogel.
@@ -135,7 +148,7 @@
 	another buffer (e.g gnus-art).
 
 2010-07-13  Karl Fogel  <kfogel@red-bean.com>
-            Thierry Volpiatto <thierry.volpiatto@gmail.com>
+            Thierry Volpiatto  <thierry.volpiatto@gmail.com>
 
 	Preparation for setting bookmarks in Gnus article buffers (Bug#5975).
 
@@ -237,7 +250,8 @@
 
 2010-07-07  Agustín Martín  <agustin.martin@hispalinux.es>
 
-	* ispell.el (ispell-alternate-dictionary): Use file-readable-p.
+	* textmodes/ispell.el (ispell-alternate-dictionary):
+	Use file-readable-p.
 	Return nil if no word-list is found at default locations.
 	(ispell-complete-word-dict): Default to nil.
 	(ispell-command-loop): Use 'word-list' when using lookup-words.
@@ -378,7 +392,7 @@
 	* bindings.el (global-map): Bind delete and DEL, the former to
 	delete-forward-char.
 
-2010-01-16  Lennart Borgman  <lennart.borgman@gmail.com>
+2010-06-27  Lennart Borgman  <lennart.borgman@gmail.com>
 
 	* progmodes/ruby-mode.el (ruby-mode-map): Don't bind TAB.
 	(ruby-mode): Bind indent-line-function (Bug#5119).
@@ -406,11 +420,11 @@
 
 2010-06-25  Agustín Martín  <agustin.martin@hispalinux.es>
 
-	* flyspell.el (flyspell-check-previous-highlighted-word): Make
-	sure `flyspell-word' re-checks word after function run (Bug#6504).
-
-	* ispell.el (ispell-init-process): Make sure ispell and default
-	directories are expanded. (Bug#6143).
+	* textmodes/flyspell.el (flyspell-check-previous-highlighted-word):
+	Make sure `flyspell-word' re-checks word after function run (Bug#6504).
+
+	* textmodes/ispell.el (ispell-init-process): Make sure ispell and
+	default directories are expanded. (Bug#6143).
 
 2010-06-24  Juri Linkov  <juri@jurta.org>
 
@@ -466,7 +480,7 @@
 2010-06-30  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	Avoid displaying files with a nil state in vc-dir.
-	* vc-dir.el (vc-dir-update): Obey the noinsert argument in all
+	* vc/vc-dir.el (vc-dir-update): Obey the noinsert argument in all
 	cases that cause insertion.
 	(vc-dir-resynch-file): Tell vc-dir-update to avoid inserting files
 	with a nil state.
@@ -587,8 +601,8 @@
 
 2010-06-17  Agustín Martín  <agustin.martin@hispalinux.es>
 
-	* ispell.el (ispell-aspell-find-dictionary): Fix regexp for
-	languages like Portuguese with pt_{BR,PT} and no plain pt.
+	* textmodes/ispell.el (ispell-aspell-find-dictionary): Fix regexp
+	for languages like Portuguese with pt_{BR,PT} and no plain pt.
 
 2010-06-17  Juanma Barranquero  <lekktu@gmail.com>
 
@@ -651,7 +665,8 @@
 	Fix annotating other revisions for renamed files in vc-annotate.
 	* vc-annotate.el (vc-annotate): Add an optional argument for the
 	VC backend.  Use it when non-nil.
-	(vc-annotate-warp-revision): Pass the VC backend to vc-annotate.  (Bug#6487)
+	(vc-annotate-warp-revision): Pass the VC backend to vc-annotate.
+	(Bug#6487)
 
 	Fix vc-annotate-show-changeset-diff-revision-at-line for git.
 	* vc-annotate.el (vc-annotate-show-diff-revision-at-line-internal):
@@ -744,7 +759,7 @@
 
 2010-06-16  Agustín Martín  <agustin.martin@hispalinux.es>
 
-	* ispell.el (ispell-dictionary-base-alist): Fix
+	* textmodes/ispell.el (ispell-dictionary-base-alist): Fix
 	portuguese casechars/not-casechars for missing 'çÇ'.
 	Suggested by Rolando Pereira (bug#6434).
 
@@ -1072,8 +1087,7 @@
 
 2010-06-03  Chong Yidong  <cyd@stupidchicken.com>
 
-	* net/rcirc.el (rcirc-nickname<, rcirc-sort-nicknames-join): Doc
-	fix.
+	* net/rcirc.el (rcirc-nickname<, rcirc-sort-nicknames-join): Doc fix.
 
 2010-06-03  Stefan Monnier  <monnier@iro.umontreal.ca>
 
@@ -1452,7 +1466,7 @@
 	* net/rcirc.el (rcirc-server-alist): Add :pass.
 	(rcirc): When prompting for connection parameters, also prompt for
 	username and password.
-	(rcirc-connect): Take a PASS argument.	If PASS is non-nil, send
+	(rcirc-connect): Take a PASS argument.  If PASS is non-nil, send
 	value to server when connecting.
 
 2010-05-25  Stefan Monnier  <monnier@iro.umontreal.ca>
@@ -1834,8 +1848,8 @@
 
 2010-05-13  Agustín Martín  <agustin.martin@hispalinux.es>
 
-	* ispell.el (ispell-init-process): Do not kill ispell process
-	everytime when spellchecking from the minibuffer (bug#6143).
+	* textmodes/ispell.el (ispell-init-process): Do not kill ispell
+	process everytime when spellchecking from the minibuffer (bug#6143).
 
 2010-05-13  Stefan Monnier  <monnier@iro.umontreal.ca>
 
@@ -2496,8 +2510,8 @@
 
 2010-04-27  Agustín Martín  <agustin.martin@hispalinux.es>
 
-	* ispell.el (ispell-init-process): Fix personal dictionary condition
-	in default directory check.
+	* textmodes/ispell.el (ispell-init-process): Fix personal dictionary
+	condition in default directory check.
 	(ispell-init-process,ispell-kill-ispell,kill-buffer-hook):
 	Kill ispell process when killing its associated buffer.
 
--- a/lisp/gnus/ChangeLog	Tue Jul 20 01:19:04 2010 +0000
+++ b/lisp/gnus/ChangeLog	Tue Jul 20 22:54:46 2010 +0000
@@ -110,7 +110,7 @@
 2010-05-12  Andreas Seltenreich  <seltenreich@gmx.de>
 
 	* gnus-sum.el (gnus-summary-read-group-1): Don't jump to next group
-	when catching the `C-g'.  Reported by: "Leo"
+	when catching the `C-g'.  Reported by "Leo".
 
 2010-05-12  Katsumi Yamaoka  <yamaoka@jpl.org>
 
@@ -244,7 +244,7 @@
 
 	* mml.el (mml-generate-mime-1,mml-compute-boundary-1): Update 'mml
 	handles on recursive mml-to-mime translation and check them for
-	boundary delimiter collisions.  Reported by: Greg Troxel.
+	boundary delimiter collisions.  Reported by Greg Troxel.
 
 2010-04-27  Katsumi Yamaoka  <yamaoka@jpl.org>
 
@@ -392,7 +392,7 @@
 	(nnimap-retrieve-groups, nnimap-verify-uidvalidity)
 	(nnimap-update-unseen): Significantly improved speed of Gnus startup
 	with many imap folders.  This is done by caching the group status from
-	the imap server persistently in a group parameter `imap-status'. (This
+	the imap server persistently in a group parameter `imap-status'.  (This
 	was cached before too if `nnimap-retrieve-groups-asynchronous' was set,
 	but not persistently, so every Gnus startup was still very slow.)
 
@@ -517,7 +517,7 @@
 
 	* nneething.el (mailcap): Require mailcap.
 
-	* nnheader.el: (declare-function): Add compatibility stub.
+	* nnheader.el (declare-function): Add compatibility stub.
 	(message-remove-header): Declare rather than autoload.
 	(nnheader-replace-header): Require message.
 
--- a/lisp/net/tramp.el	Tue Jul 20 01:19:04 2010 +0000
+++ b/lisp/net/tramp.el	Tue Jul 20 22:54:46 2010 +0000
@@ -1787,7 +1787,7 @@
     $stat[2],
     $stat[1] >> 16 & 0xffff,
     $stat[1] & 0xffff
-);' \"$1\" \"$2\" \"$3\" 2>/dev/null"
+);' \"$1\" \"$2\" 2>/dev/null"
   "Perl script to produce output suitable for use with `file-attributes'
 on the remote file system.
 Escape sequence %s is replaced with name of Perl binary.
@@ -1840,7 +1840,7 @@
         $stat[0] >> 16 & 0xffff,
         $stat[0] & 0xffff);
 }
-printf(\")\\n\");' \"$1\" \"$2\" \"$3\" 2>/dev/null"
+printf(\")\\n\");' \"$1\" \"$2\" 2>/dev/null"
   "Perl script implementing `directory-files-attributes' as Lisp `read'able
 output.
 Escape sequence %s is replaced with name of Perl binary.
@@ -5565,12 +5565,23 @@
 	    (if foreign
 		(condition-case err
 		    (apply foreign operation args)
+
+		  ;; Trace that somebody has interrupted the
+		  ;; operation.
+		  (quit
+		   (let (tramp-message-show-message)
+		     (tramp-message
+		      v 1 "Interrupt received in operation %s"
+		      (append (list operation) args)))
+		   ;; Propagate the quit signal.
+		   (signal (car err) (cdr err)))
+
+		  ;; When we are in completion mode, some failed
+		  ;; operations shall return at least a default value
+		  ;; in order to give the user a chance to correct the
+		  ;; file name in the minibuffer.
 		  (error
 		   (cond
-		    ;; When we are in completion mode, some failed
-		    ;; operations shall return at least a default
-		    ;; value in order to give the user a chance to
-		    ;; correct the file name in the minibuffer.
 		    ((and completion (zerop (length localname))
 			  (memq operation '(file-exists-p file-directory-p)))
 		     t)
@@ -5580,6 +5591,7 @@
 		     filename)
 		    ;; Propagate the error.
 		    (t (signal (car err) (cdr err))))))
+
 	      ;; Nothing to do for us.
 	      (tramp-run-real-handler operation args)))))
 
@@ -7033,6 +7045,12 @@
   ;; Disable unexpected output.
   (tramp-send-command vec "mesg n; biff n" t)
 
+  ;; IRIX64 bash expands "!" even when in single quotes.  This
+  ;; destroys our shell functions, we must disable it.  See
+  ;; <http://stackoverflow.com/questions/3291692/irix-bash-shell-expands-expression-in-single-quotes-yet-shouldnt>.
+  (when (string-match "^IRIX64" (tramp-get-connection-property vec "uname" ""))
+    (tramp-send-command vec "set +H" t))
+
   ;; Set the environment.
   (tramp-message vec 5 "Setting default environment")
 
@@ -7048,7 +7066,7 @@
       (setq env (cdr env)))
     (when unset
       (tramp-send-command
-       vec (format "unset %s" (mapconcat 'identity unset " "))))) t)
+       vec (format "unset %s" (mapconcat 'identity unset " ")) t))))
 
 ;; CCC: We should either implement a Perl version of base64 encoding
 ;; and decoding.  Then we just use that in the last item.  The other
@@ -7533,11 +7551,11 @@
 
 		;; Add arguments for asynchrononous processes.
 		(when (and process-name async-args)
-		  (setq login-args (append login-args async-args)))
+		  (setq login-args (append async-args login-args)))
 
 		;; Add gateway arguments if necessary.
 		(when (and gw gw-args)
-		  (setq login-args (append login-args gw-args)))
+		  (setq login-args (append gw-args login-args)))
 
 		;; Check for port number.  Until now, there's no need
 		;; for handling like method, user, host.
@@ -8858,7 +8876,6 @@
 ;;   by the files in that directory.  Add this here.
 ;; * Avoid screen blanking when hitting `g' in dired.  (Eli Tziperman)
 ;; * Make ffap.el grok Tramp filenames.  (Eli Tziperman)
-;; * Case-insensitive filename completion.  (Norbert Goevert.)
 ;; * Don't use globbing for directories with many files, as this is
 ;;   likely to produce long command lines, and some shells choke on
 ;;   long command lines.
--- a/lisp/org/ChangeLog	Tue Jul 20 01:19:04 2010 +0000
+++ b/lisp/org/ChangeLog	Tue Jul 20 22:54:46 2010 +0000
@@ -44,17 +44,16 @@
 
 2010-07-19  Matt Lundin  <mdl@imapmail.org>
 
-	* org-agenda.el (org-search-view): Fixed inclusion of agenda-archives
+	* org-agenda.el (org-search-view): Fix inclusion of agenda-archives
 	in org-agenda-text-search-extra-files.
 
 2010-07-19  David Maus  <dmaus@ictsoc.de>
 
-	* org-list.el (org-list-send-list): Locally bind variable
-	`txt'.
+	* org-list.el (org-list-send-list): Locally bind variable `txt'.
 
 2010-07-19  Eric Schulte  <schulte.eric@gmail.com>
 
-	* org.el (org-reload): now also reloading babel files
+	* org.el (org-reload): Now also reloading babel files.
 
 2010-07-19  Carsten Dominik  <carsten.dominik@gmail.com>
 
@@ -64,7 +63,8 @@
 
 2010-07-19  Carsten Dominik  <carsten.dominik@gmail.com>
 
-	* org-latex.el (org-export-latex-preprocess): Make a special case for \nbsp.
+	* org-latex.el (org-export-latex-preprocess): Make a special case
+	for \nbsp.
 	(org-latex-entities): Remove the entry for \nbsp.
 	(org-latex-entities-exceptions): Variable removed.
 
@@ -92,7 +92,7 @@
 
 2010-07-19  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-	* org-list.el (org-list-send-list): regexp defining the start of
+	* org-list.el (org-list-send-list): Regexp defining the start of
 	a radio list is now on par with the one used for radio tables.
 
 2010-07-19  Carsten Dominik  <carsten.dominik@gmail.com>
@@ -107,12 +107,12 @@
 
 2010-07-19  Eric Schulte  <schulte.eric@gmail.com>
 
-	* org-latex.el (org-export-latex-listings-langs): added (sqlite "SQL")
+	* org-latex.el (org-export-latex-listings-langs): Add (sqlite "SQL").
 
 2010-07-19  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org-latex.el (org-export-latex-first-lines): Do not mark
-	meta lines for removal. Do not remove BABEL config lines during export
+	meta lines for removal.  Do not remove BABEL config lines during export.
 
 2010-07-19  David Maus  <dmaus@ictsoc.de>
 
@@ -121,11 +121,11 @@
 
 2010-07-19  Eric Schulte  <schulte.eric@gmail.com>
 
-	* org.el: added autoload for org-babel-do-load-languages
+	* org.el: Add autoload for org-babel-do-load-languages.
 
 2010-07-19  Eric Schulte  <schulte.eric@gmail.com>
 
-	* org-src.el (org-src-lang-modes): added sqlite to sql-mode
+	* org-src.el (org-src-lang-modes): Add sqlite to sql-mode.
 
 2010-07-19  David Maus  <dmaus@ictsoc.de>
 
@@ -181,27 +181,27 @@
 
 2010-07-19  Eric Schulte  <schulte.eric@gmail.com>
 
-	* org.el (org-babel-load-languages): adding ob-mscgen
+	* org.el (org-babel-load-languages): Add ob-mscgen.
 
 2010-07-19  Eric Schulte  <schulte.eric@gmail.com>
 
-	* org-latex.el (org-export-latex-tables): format string now
-	matches options
+	* org-latex.el (org-export-latex-tables): Format string now
+	matches options.
 
 2010-07-19  Eric Schulte  <schulte.eric@gmail.com>
 
-	* org.el (org-babel-load-languages): this variable controls which
+	* org.el (org-babel-load-languages): This variable controls which
 	languages will be loaded by org-babel.  It is customizable through
 	the customize interface.
 
 2010-07-19  Eric Schulte  <schulte.eric@gmail.com>
 
-	* org-latex.el (org-export-latex-format-image): updated number of
-	arguments to allow for an optional short-name
+	* org-latex.el (org-export-latex-format-image): Update number of
+	arguments to allow for an optional short-name.
 
 2010-07-19  Carsten Dominik  <carsten.dominik@gmail.com>
 
-	* org-indent.el (org-indent-mode): Refuse to turn on prior to Emacs 23.2
+	* org-indent.el (org-indent-mode): Refuse to turn on prior to Emacs 23.2.
 
 2010-07-19  Carsten Dominik  <carsten.dominik@gmail.com>
 
@@ -222,7 +222,7 @@
 
 2010-07-19  Carsten Dominik  <carsten.dominik@gmail.com>
 
-	* org.el (org-default-notes-file): Update docstring
+	* org.el (org-default-notes-file): Update docstring.
 
 2010-07-19  Carsten Dominik  <carsten.dominik@gmail.com>
 
@@ -230,13 +230,13 @@
 
 2010-07-19  Eric Schulte  <schulte.eric@gmail.com>
 
-	* org-exp.el (org-export-attach-captions-and-attributes): adding
+	* org-exp.el (org-export-attach-captions-and-attributes): Add
 	a shortname attribute to caption strings under the symbol name
 	org-caption-shortn.
 
 2010-07-19  Carsten Dominik  <carsten.dominik@gmail.com>
 
-	* org.el (org-switchb): Renamed from `org-iswitchb'.  Improve
+	* org.el (org-switchb): Rename from `org-iswitchb'.  Improve
 	docstring.
 	(org-iswitchb): New alias.
 	(org-ido-switchb): Make alias point to `org-switchb'.
@@ -313,28 +313,28 @@
 
 2010-07-19  Eric Schulte  <schulte.eric@gmail.com>
 
-	* org-exp.el (org-export-handle-table-metalines): this function
+	* org-exp.el (org-export-handle-table-metalines): This function
 	removes table specific meta-lines, now that we aren't wiping
 	everything that looks remotely like a comment at the end of the
 	export process we have to be sure to catch all of the specific lines
-	in org-exp.el
+	in org-exp.el.
 
 2010-07-19  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-	* org-exp.el: (org-export-select-backend-specific-text) Properly
+	* org-exp.el (org-export-select-backend-specific-text): Properly
 	get rid of #+Backend and #+ATTR_Backend specifics to backends not
 	matching the one we're exporting to.
 
 2010-07-19  Eric Schulte  <schulte.eric@gmail.com>
 
-	* Makefile (lisp/org-install.el): replacing babel files in
-	construction of org-install.el
+	* Makefile (lisp/org-install.el): Replace babel files in
+	construction of org-install.el.
 
 2010-07-19  Eric Schulte  <schulte.eric@gmail.com>
 
-	* org-table.el (orgtbl-to-generic): added the :remove-newlines
+	* org-table.el (orgtbl-to-generic): Add the :remove-newlines
 	option which will strip newline characters from the text of table
-	cells and replace then with "\n"
+	cells and replace then with "\n".
 
 2010-07-19  Carsten Dominik  <carsten.dominik@gmail.com>
 
@@ -353,8 +353,8 @@
 
 2010-07-19  Carsten Dominik  <carsten.dominik@gmail.com>
 
-	* org-capture.el (org-capture-position-for-last-stored):
-	org-capture-bookmark-last-stored-position): New functions.
+	* org-capture.el (org-capture-position-for-last-stored)
+	(org-capture-bookmark-last-stored-position): New functions.
 	(org-capture-place-table-line): Better error catching.
 	(org-capture-place-item):
 	(org-capture-place-entry):
@@ -365,10 +365,10 @@
 
 2010-07-19  Eric Schulte  <schulte.eric@gmail.com>
 
-	* org-exp.el (org-export-mark-blockquote-verse-center): fixed
+	* org-exp.el (org-export-mark-blockquote-verse-center): Fix
 	small bug, now grabbing match data before overwritten by looking-at
 	this fixes a problem with remainders of #+end_quote lines appearing
-	in exported output
+	in exported output.
 
 2010-07-19  David Maus  <dmaus@ictsoc.de>
 
@@ -377,19 +377,19 @@
 
 2010-07-19  Eric Schulte  <schulte.eric@gmail.com>
 
-	* org-latex.el (org-export-latex-fixed-width): now checking
+	* org-latex.el (org-export-latex-fixed-width): Now check
 	org-example rather than org-protected on verbatim export, because by
-	default all ": " prefixed lines are marked protected
+	default all ": " prefixed lines are marked protected.
 
 2010-07-19  Eric Schulte  <schulte.eric@gmail.com>
 
-	* org-latex.el (org-export-latex-fixed-width): check for
-	protection before wrapping ": " lines as verbatim
+	* org-latex.el (org-export-latex-fixed-width): Check for
+	protection before wrapping ": " lines as verbatim.
 
 2010-07-19  Eric Schulte  <schulte.eric@gmail.com>
 
-	* org-exp.el (org-export-handle-comments): check for protection
-	before removing comments
+	* org-exp.el (org-export-handle-comments): Check for protection
+	before removing comments.
 
 2010-07-19  Carsten Dominik  <carsten.dominik@gmail.com>
 
@@ -461,7 +461,7 @@
 	* org-compat.el (org-get-x-clipboard): Function moved here from
 	remember.el.
 
-	* org-mks.el: New file
+	* org-mks.el: New file.
 
 	* org.el (org-set-regexps-and-options): Allow statistic cookies as
 	part of complex headlines.
@@ -476,44 +476,43 @@
 2010-07-19  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org-exp.el (org-export-format-source-code-or-example): Mark examples
-	by a property. o
+	by a property.
 
 	* org-html.el (org-export-html-close-lists-maybe): Check if raw
-	HTML stuff was actually made from an example
+	HTML stuff was actually made from an example.
 
 2010-07-19  Eric Schulte  <schulte.eric@gmail.com>
 
-	* Makefile (LISPF): let's not compile files that won't often be used.
+	* Makefile (LISPF): Let's not compile files that won't often be used.
 
 2010-07-19  Bastien Guerry  <bzg@altern.org>
 
-	* org-latex.el: items are no longer skipped when their first line
+	* org-latex.el: Items are no longer skipped when their first line
 	ends on a protected element.
 
-	* org-list.el: protected environments looking like lists are not
+	* org-list.el: Protected environments looking like lists are not
 	exported anymore.
 
 2010-07-19  Eric Schulte  <schulte.eric@gmail.com>
 
 	* org-exp-blocks.el (org-export-blocks-preprocess):
-	cleanup trailing newline after block
+	Cleanup trailing newline after block.
 
 2010-07-19  Bastien Guerry  <bzg@altern.org>
 
-	* org-exp.el: comment regexp now matches documentation. No more
+	* org-exp.el: Comment regexp now matches documentation.  No more
 	protection check when deleting comments before export.
 
 2010-07-19  Bastien Guerry  <bzg@altern.org>
 
 	* org-exp.el (org-export-preprocess-string):
-	now using `org-export-handle-include-files-recurse' to resolve
-	included files
+	Now using `org-export-handle-include-files-recurse' to resolve
+	included files.
 
 2010-07-19  Bastien Guerry  <bzg@altern.org>
 
 	* org-agenda.el (org-agenda-get-deadlines):
 	(org-agenda-get-scheduled):
-
 	* org.el (org-time-string-to-seconds):
 	For deadline and scheduled agenda display ignore the cyclic repeater
 	when calculating how many days late the task is.  If you have a weekly
@@ -529,7 +528,7 @@
 2010-07-19  Mikael Fornius  <mfo@abc.se>
 
 	* org.el (org-raise-scripts): Do not fontify sub/superscripts of text
-	with face `org-special-keyword'. Makes property keys as :LAST_REPEAT:
+	with face `org-special-keyword'.  Make property keys as :LAST_REPEAT:
 	display correctly.
 
 2010-07-19  Mikael Fornius  <mfo@abc.se>
@@ -538,20 +537,20 @@
 
 2010-07-19  Mikael Fornius  <mfo@abc.se>
 
-	* org.el (test): Removed unused test function.
+	* org.el (test): Remove unused test function.
 
 2010-07-19  Eric Schulte  <schulte.eric@gmail.com>
 
-	* org-exp-blocks.el (org-export-blocks-preprocess): fixed typo
+	* org-exp-blocks.el (org-export-blocks-preprocess): Fix typo.
 
 2010-07-19  Eric Schulte  <schulte.eric@gmail.com>
 
-	* org-exp-blocks.el (org-export-blocks-postblock-hook): adding
-	documentation to and turning into a defcustom
+	* org-exp-blocks.el (org-export-blocks-postblock-hook): Add
+	documentation to and turn into a defcustom.
 
 2010-07-19  Eric Schulte  <schulte.eric@gmail.com>
 
-	* org-exp.el (org-get-file-contents): by un-setting prefix1 to ""
+	* org-exp.el (org-get-file-contents): By un-setting prefix1 to ""
 	instead of to nil we avoid errors when :prefix1 is defined, but
 	prefix is not.
 
@@ -585,7 +584,7 @@
 
 	* org.el (org-emph-re): Document the match groups.
 
-2010-07-19  Bernt Hansen <bernt@norang.ca>
+2010-07-19  Bernt Hansen  <bernt@norang.ca>
 
 	* org-clock.el (org-clock-in): Set `org-clock-clocking-in' to
 	t before calling `org-clock-out', so that that function can
@@ -636,20 +635,20 @@
 
 2010-07-19  John Wiegley  <jwiegley@gmail.com>
 
-	* org-clock.el (org-clock-clock-in, org-clock-in): Added
+	* org-clock.el (org-clock-clock-in, org-clock-in): Add
 	parameter `start-time'.
-	(org-clock-resolve-clock): Added parameter `clock-out-time'.
+	(org-clock-resolve-clock): Add parameter `clock-out-time'.
 	If set, and resolve-to is a past time, then the clock out
 	event occurs at `clock-out-time' rather than at `resolve-to'.
 	In this case, `resolve-to' becomes the clock in time.
-	(org-clock-jump-to-current-clock): Created new global command
+	(org-clock-jump-to-current-clock): Create new global command
 	to reveal the current clock.
-	(org-clock-resolve): Added new commands g/G and j/J, and a
+	(org-clock-resolve): Add new commands g/G and j/J, and a
 	help window describing all commands and their meaning.
 	(org-clock-resolve-expert): New customization variable.
-	(org-find-open-clocks): Fixed a bug that caused discovered
+	(org-find-open-clocks): Fix a bug that caused discovered
 	clocks not to match up with the currently active clock.
-	(org-resolve-clocks): Changed the argument
+	(org-resolve-clocks): Change the argument
 	`also-non-dangling-p' to `only-dangling-p', since due to a bug
 	this was the default behavior all along.
 
@@ -700,7 +699,7 @@
 	* org-publish.el (org-publish-cache): Use one big hashmap for
 	each project defined in `org-publish-project-alist'.
 	(initialize-files-alist): Function removed.
-	(org-publish-validate-link):  Function removed.
+	(org-publish-validate-link): Function removed.
 	(org-publish-get-base-files): Add variable `sitemap-requested'
 	to avoid sorting where possible.
 	(org-publish-get-files): Function removed.
@@ -732,7 +731,7 @@
 2010-07-19  Jan Böker  <jan.boecker@jboecker.de>
 
 	* org.el (org-file-apps): Improve docstring to reflect
-	grouping matches
+	grouping matches.
 
 2010-07-19  Carsten Dominik  <carsten.dominik@gmail.com>
 
@@ -812,7 +811,7 @@
 2010-07-19  Dan Davison  <davison@stats.ox.ac.uk>
 
 	* org-src.el (org-edit-src-code): allow-write-back-p had
-	erroneously been omitted from let binding
+	erroneously been omitted from let binding.
 
 2010-07-19  Carsten Dominik  <carsten.dominik@gmail.com>
 
@@ -936,7 +935,7 @@
 	* org.el (org-set-autofill-regexps): XEmacs compatibility.
 
 	* org-latex.el (org-export-latex-set-initial-vars): Allow "-"
-	in latex class definitions
+	in latex class definitions.
 
 	* org.el (org-shiftup-hook, org-shiftdown-hook)
 	(org-shiftleft-hook, org-shiftright-hook): New hooks.
@@ -985,7 +984,7 @@
 	to the file.
 	(org-publish-index-generate-theindex.inc): Check if there is
 	actually a target and only then add it to the link.
-	(org-publish-projects): Fix a remaining issue with the last commit
+	(org-publish-projects): Fix a remaining issue with the last commit.
 
 	* org-html.el (org-export-as-html): Treat verse as open/close
 	paragraph.
@@ -996,7 +995,7 @@
 
 	* org-src.el (org-edit-src-code): Allow the org-src edit buffer to
 	be used in a read-only mode.
-	(org-edit-src-code): Different message in read-only mode
+	(org-edit-src-code): Different message in read-only mode.
 
 2010-07-19  Carsten Dominik  <carsten.dominik@gmail.com>
 
@@ -1146,7 +1145,7 @@
 
 2010-07-19  Carsten Dominik  <carsten.dominik@gmail.com>
 
-	* org-footnote.el (org-footnote-goto-previous-reference): Renamed
+	* org-footnote.el (org-footnote-goto-previous-reference): Rename
 	from `org-footnote-goto-next-reference'.
 
 	* org.el (org-auto-repeat-maybe): Only record LAST_REPEAT if
@@ -1189,17 +1188,17 @@
 
 2010-07-19  Jan Böcker  <jan.boecker@jboecker.de>
 
-	* org.el (org-file-apps-entry-match-against-dlink-p): new function.
-	(org-file-apps-ex): remove variable.
+	* org.el (org-file-apps-entry-match-against-dlink-p): New function.
+	(org-file-apps-ex): Remove variable.
 	(org-open-file): Integrate org-file-apps-ex functionality back
 	into org-file-apps, and decide whether to match a regexp against
 	the link or the filename using org-file-apps-entry-uses-grouping-p.
 
 2010-07-19  Jan Böcker  <jan.boecker@jboecker.de>
 
-	* org.el (org-file-apps-ex): new variable.
+	* org.el (org-file-apps-ex): New variable.
 	(org-open-file): Before considering org-file-apps, first match the
-	regexps from org-file-apps-ex against the whole link. See
+	regexps from org-file-apps-ex against the whole link.  See
 	docstring of org-file-apps-ex.
 
 2010-07-19  Carsten Dominik  <carsten.dominik@gmail.com>
@@ -1266,7 +1265,7 @@
 
 	* org-entities.el (org-entities-user): Fix typo.
 
-	* org.el (org-prepare-agenda-buffers): Uniquify TODO keywords
+	* org.el (org-prepare-agenda-buffers): Uniquify TODO keywords.
 
 	* org-entities.el (org-entities-user): Improve docstring.
 
@@ -1390,14 +1389,14 @@
 	(org-emphasis-alist): Change Customize group variable name
 	(org-emphasis-regexp-components): Change Customize group variable
 	name
-	(org-modules): Remove mention of org-R
-
-	* org-faces.el (org-faces): Change Customize group variable name
+	(org-modules): Remove mention of org-R.
+
+	* org-faces.el (org-faces): Change Customize group variable name.
 
 2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org-agenda.el (org-diary-last-run-time): New variable.
-	(org-diary): prepare agenda buffers only if last call was some
+	(org-diary): Prepare agenda buffers only if last call was some
 	time ago.
 
 	* org-html.el (org-export-html-preprocess): Replace \ref macros
@@ -1415,7 +1414,7 @@
 
 2010-04-10  Dan Davison  <davison@stats.ox.ac.uk>
 
-	* org.el (org-hidden-keywords): New customizable variable. This is
+	* org.el (org-hidden-keywords): New customizable variable.  This is
 	a list of symbols specifying which of the special keywords #+DATE,
 	#+AUTHOR, #+EMAIL and #+TITLE should be hidden by font lock.
 	(org-fontify-meta-lines-and-blocks): Changes to font-lock code
@@ -1423,7 +1422,8 @@
 
 	* org-faces.el (org-document-title): New face for #+TITLE lines
 	(org-document-info): New face for #+DATE, #+AUTHOR, #+EMAIL lines
-	(org-document-info-keyword): New face for #+DATE, #+AUTHOR, #+EMAIL keywords
+	(org-document-info-keyword): New face for #+DATE, #+AUTHOR, #+EMAIL
+	keywords.
 
 2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>
 
@@ -1446,7 +1446,7 @@
 	* org-exp.el (org-export-author-info, org-export-email-info): Fix
 	docstrings.
 
-	* org-beamer.el (org-beamer-select-environment): Renamed from
+	* org-beamer.el (org-beamer-select-environment): Rename from
 	`org-beamer-set-environment-tag'.  Improve docstring.
 
 	* org-freemind.el (org-freemind-write-mm-buffer): Fix another
@@ -1523,7 +1523,7 @@
 
 	* org-src.el (org-edit-src-exit): When returning from code edit
 	buffer, if code block is hidden, leave point at start of
-	#+begin_src line
+	#+begin_src line.
 
 2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>
 
@@ -1597,18 +1597,18 @@
 	(org-set-autofill-regexps): Store a backup of
 	`adaptive-fill-regexp'.
 	(org-adaptive-fill-function): Fix filling of comments and ordered
-	lists. If there is no other match, till try adaptive fill.
+	lists.  If there is no other match, till try adaptive fill.
 
 2010-04-10  John Wiegley  <jwiegley@gmail.com>
 
-	* org-agenda.el (org-agenda-include-deadlines): Added new
+	* org-agenda.el (org-agenda-include-deadlines): Add new
 	customization variable to determine whether unscheduled tasks
 	should appear in the agenda solely because of their deadline.
 	Default to true, which was the previous behavior (it just wasn't
 	configurable).
 	(org-agenda-mode-map, org-agenda-view-mode-dispatch): Bind ! in
 	the agenda to show/hide deadline tasks.
-	(org-agenda-menu): Added menu option for show/hide deadlines.
+	(org-agenda-menu): Add menu option for show/hide deadlines.
 	(org-agenda-list): Make the agenda list sensitive to the value of
 	`org-agenda-include-deadlines'.
 	(org-agenda-toggle-deadlines): New function to toggle the value of
@@ -1776,9 +1776,9 @@
 
 2010-04-10  Bastien Guerry  <bzg@altern.org>
 
-	* org-timer.el (org-timer-current-timer): Renamed from
+	* org-timer.el (org-timer-current-timer): Rename from
 	`org-timer-last-timer'.
-	(org-timer-timer1, org-timer-timer2, org-timer-timer3): Removed.
+	(org-timer-timer1, org-timer-timer2, org-timer-timer3): Remove.
 	(org-timer-cancel-timer, org-timer-show-remaining-time)
 	(org-timer-set-timer): Update to use only one timer.
 
@@ -1898,7 +1898,7 @@
 
 2010-04-10  Dan Davison  <davison@stats.ox.ac.uk>
 
-	* org-src.el (org-edit-src-exit): Widen before exiting edit buffers
+	* org-src.el (org-edit-src-exit): Widen before exiting edit buffers.
 
 2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>
 
@@ -1957,7 +1957,7 @@
 	* org-mac-message.el (org-mac-message-insert-flagged): Call
 	`org-insert-heading' with the INVISIBLE-OK argument.
 
-	* org.el (org-insert-heading):  New argument INVISIBLE-OK.
+	* org.el (org-insert-heading): New argument INVISIBLE-OK.
 
 	* org-agenda.el (org-agenda-view-mode-dispatch): Improve the
 	prompt message.
@@ -1985,8 +1985,8 @@
 2010-04-10  Mikael Fornius  <mfo@abc.se>
 
 	* org.el (org-assign-fast-keys): Prefer keys used in keyword name
-	when assigning. Begin using numerical characters when all in name
-	is used up. This is to spare alphanumeric characters for better
+	when assigning.  Begin using numerical characters when all in name
+	is used up.  This is to spare alphanumeric characters for better
 	match with other keywords.
 
 2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>
@@ -2038,7 +2038,7 @@
 	* org-agenda.el (org-agenda-diary-entry-in-org-file): Make sure
 	org-datetree.el is loaded.
 
-	* org-datetree.el: autoload `org-datetree-find-day-create'
+	* org-datetree.el: Autoload `org-datetree-find-day-create'.
 
 	* org-latex.el (org-export-latex-hyperref-format): New option.
 	(org-export-latex-links): Use `org-export-latex-hyperref-format'.
@@ -2370,12 +2370,12 @@
 	* org-colview-xemacs.el (org-columns-edit-value): Use
 	org-unrestricted property.
 
-	* org-colview.el (org-columns-edit-value):  Use
+	* org-colview.el (org-columns-edit-value): Use
 	org-unrestricted property.
 
 	* org.el (org-compute-property-at-point): Set org-unrestricted
 	text property if the list contains ":ETC".
-	(org-insert-property-drawer):  Use
+	(org-insert-property-drawer): Use
 	org-unrestricted property.
 
 	* org-exp.el
@@ -2884,16 +2884,15 @@
 
 2009-11-13  Dan Davison  <davison@stats.ox.ac.uk>
 
-	* org-exp.el (org-export-format-source-code-or-example): restrict
+	* org-exp.el (org-export-format-source-code-or-example): Restrict
 	scope of preserve-indentp to the let binding.
-	(org-src): require org-src, since org-src-preserve-indentation is used.
+	(org-src): Require org-src, since org-src-preserve-indentation is used.
 
 2009-11-13  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org-timer.el (org-timer-set-timer): Set variables
 	org-timer-timer[123] correctly.
 
-
 	* org-mobile.el (org-mobile-files-alist): Make it work when
 	`agenda-archives' is included in
 	`org-agenda-text-search-extra-files'.
@@ -2956,7 +2955,7 @@
 
 2009-11-13  James TD Smith  <ahktenzero@mohorovi.cc>
 
-	* org-colview-xemacs.el: Add in changes from org-colview.el
+	* org-colview-xemacs.el: Add in changes from org-colview.el.
 
 2009-11-13  Dan Davison  <davison@stats.ox.ac.uk>
 
@@ -3163,7 +3162,7 @@
 	called with either `org-scheduled-string' or
 	`org-deadline-string'.
 
-	* org-clock.el (org-clock-auto-clock-resolution): Renamed
+	* org-clock.el (org-clock-auto-clock-resolution): Rename from
 	`org-clock-disable-clock-resolution', since negatives don't sound
 	good in customization variables.
 	(org-clock-in): Don't use the auto-resolution logic if the user is
@@ -3205,14 +3204,14 @@
 	more general.
 	(org-habit-parse-todo): Parse the new ".+N/N" style repeater.
 
-	* org-agenda.el (org-agenda-get-deadlines): Removed all mention of
+	* org-agenda.el (org-agenda-get-deadlines): Remove all mention of
 	habits, since they don't use DEADLINE anymore.
 
 	* org.el (org-repeat-re, org-display-custom-time)
-	(org-timestamp-change): Extended to support the new ".+N/N"
+	(org-timestamp-change): Extend to support the new ".+N/N"
 	syntax, used for habits.
 
-	* org-clock.el (org-clock-resolve-clock): Fixed an incorrect
+	* org-clock.el (org-clock-resolve-clock): Fix an incorrect
 	variable reference.
 
 	* org-agenda.el (org-agenda-set-mode-name): Show Habit in the
@@ -3246,7 +3245,7 @@
 
 	* org.el (org-file-tags): Fix docstring.
 	(org-get-buffer-tags): Add the #+FILETAGS tags.
-	("ecb"): Maks ecb show context after jumping into an Org file.
+	("ecb"): Make ecb show context after jumping into an Org file.
 
 2009-11-13  John Wiegley  <johnw@newartisans.com>
 
@@ -3277,11 +3276,11 @@
 	(org-agenda-get-scheduled): Display consistency graphs when
 	outputting habits into the agenda.  The graphs are always relative
 	to the current time.
-	(org-format-agenda-item): Added new parameter `habitp', which
+	(org-format-agenda-item): Add new parameter `habitp', which
 	indicates whether we are formatting a habit or not.  Do not
 	display "extra" leading information if habitp is true.
 
-	* org.el (org-repeat-re): Improved regexp to include .+ and ++
+	* org.el (org-repeat-re): Improve regexp to include .+ and ++
 	leaders for repeat strings.
 	(org-get-repeat): Now takes a string parameter `tagline', so the
 	caller can obtain the SCHEDULED repeat, or the DEADLINE repeat.
@@ -3299,7 +3298,7 @@
 	* org.el (org-files-list): Don't attempt to return a file name for
 	Org buffers which have no associated file.
 
-	* org-agenda.el (org-agenda-do-action): Fixed a typo.
+	* org-agenda.el (org-agenda-do-action): Fix a typo.
 
 2009-11-13  Carsten Dominik  <carsten.dominik@gmail.com>
 
@@ -3321,7 +3320,7 @@
 
 	* org-clock.el (org-clock-resolve, org-resolve-clocks)
 	(org-emacs-idle-seconds): Use `org-float-time' instead of
-	`time-to-seconds'
+	`time-to-seconds'.
 
 2009-11-13  Carsten Dominik  <carsten.dominik@gmail.com>
 
@@ -3490,7 +3489,7 @@
 	* org-exp.el (org-export-select-backend-specific-text): Remove the
 	region markers.
 
-	* org-inlinetask.el (org-inlinetask-export-handler): fix bug for
+	* org-inlinetask.el (org-inlinetask-export-handler): Fix bug for
 	tasks without content.
 
 	* org-clock.el: Make sure the clock-in target position does not
@@ -3779,7 +3778,7 @@
 
 2009-10-01  Bastien Guerry  <bzg@altern.org>
 
-	* org.el (org-check-agenda-file): Use a more explicit message
+	* org.el (org-check-agenda-file): Use a more explicit message.
 
 2009-10-01  Carsten Dominik  <carsten.dominik@gmail.com>
 
@@ -4307,7 +4306,7 @@
 	* org-faces.el (org-agenda-clocking): New face.
 
 	* org-agenda.el (org-agenda-mark-clocking-task): New function.
-	(org-finalize-agenda): call `org-agenda-mark-clocking-task'.
+	(org-finalize-agenda): Call `org-agenda-mark-clocking-task'.
 
 	* org.el (org-modules): Add org-track.el.
 
@@ -5276,7 +5275,7 @@
 
 2009-08-06  Carsten Dominik  <carsten.dominik@gmail.com>
 
-	* org-icalendar.el (org-icalendar-include-todo): New allowedvalue
+	* org-icalendar.el (org-icalendar-include-todo): New allowed value
 	`unblocked'.
 	(org-print-icalendar-entries): Respect the new value of
 	`org-icalendar-include-todo'.
@@ -5707,7 +5706,7 @@
 	* org.el (org-emphasis-regexp-components): Allow braces in
 	emphasis pre and post match.
 
-	* org-footnote.el (org-footnote-normalize): When only dorting, do
+	* org-footnote.el (org-footnote-normalize): When only sorting, do
 	not insert inline notes at the end.
 
 	* org.el (org-require-autoloaded-modules): Add org-docbook.el.
@@ -6141,9 +6140,9 @@
 	(org-export-latex-fontify): Catch error when org-emph-alist has
 	entries that are not defined for LaTeX export.
 
-	* org-export-latex.el: renamed to org-latex.el.
-
-	* org-latex.el: renamed from org-export-latex.el.
+	* org-export-latex.el: Rename to org-latex.el.
+
+	* org-latex.el: Rename from org-export-latex.el.
 
 	* org.el (orgstruct++-mode): New function.
 	(turn-on-orgstruct++): Call `orgstruct++-mode'.
@@ -7226,7 +7225,7 @@
 
 	* org-list.el (org-list-two-spaces-after-bullet-regexp): New
 	option.
-	(org-fix-bullet-type): respect
+	(org-fix-bullet-type): Respect
 	`org-list-two-spaces-after-bullet-regexp'.
 
 	* org-clock.el (org-clock-load): Clean up the code.
@@ -7603,7 +7602,7 @@
 	* org-agenda.el (org-agenda-remove-marked-text): New function.
 	(org-agenda-mark-filtered-text)
 	(org-agenda-unmark-filtered-text): New functions.
-	(org-write-agenda): Remove fltered text.
+	(org-write-agenda): Remove filtered text.
 
 	* org.el (org-make-tags-matcher): Give access to TODO "property"
 	without speed penalty.
@@ -7700,7 +7699,7 @@
 
 	* org.el (org-insert-heading-respect-content): Force heading
 	creation.
-	(org-insert-heading): keep the folding state of the heading before
+	(org-insert-heading): Keep the folding state of the heading before
 	the inserted one.
 
 2008-10-26  Carsten Dominik  <dominik@science.uva.nl>
@@ -7983,7 +7982,7 @@
 	* org.el (org-add-log-setup): Skip over drawers (properties,
 	clocks etc) when adding notes.
 
-	* org-agenda.el (org-agenda-get-closed): show durations of clocked
+	* org-agenda.el (org-agenda-get-closed): Show durations of clocked
 	items as well as the start and end times.
 
 	* org-compat.el (org-get-x-clipboard-compat): Add a compat
@@ -8009,7 +8008,7 @@
 
 2008-10-12  Bastien Guerry  <bzg@altern.org>
 
-	* org-export-latex.el (org-export-latex-tables): protect exported
+	* org-export-latex.el (org-export-latex-tables): Protect exported
 	tables from further special chars conversion.
 	(org-export-latex-preprocess): Preserve LaTeX environments.
 	(org-list-parse-list): Parse descriptive lists.
--- a/lisp/url/ChangeLog	Tue Jul 20 01:19:04 2010 +0000
+++ b/lisp/url/ChangeLog	Tue Jul 20 22:54:46 2010 +0000
@@ -1,7 +1,7 @@
 2010-07-01  Mark A. Hershberger  <mah@everybody.org>
 
 	* url-http.el (url-http-create-request): Add a CRLF on the end so
-	that POSTs with content to https urls work. See
+	that POSTs with content to https urls work.  See
 	<https://bugs.launchpad.net/mediawiki-el/+bug/540759>
 
 2010-06-22  Mark A. Hershberger  <mah@everybody.org>
@@ -220,7 +220,7 @@
 2008-03-09  Magnus Henoch  <mange@freemail.hu>
 
 	* url-http.el (url-http-chunked-encoding-after-change-function):
-	Remove superfluous CRLF at end of file.  (bug #42)
+	Remove superfluous CRLF at end of file.  (Bug #42)
 
 2008-03-02  Andreas Schwab  <schwab@suse.de>
 
--- a/nt/ChangeLog	Tue Jul 20 01:19:04 2010 +0000
+++ b/nt/ChangeLog	Tue Jul 20 22:54:46 2010 +0000
@@ -1,3 +1,15 @@
+2010-07-20  Juanma Barranquero  <lekktu@gmail.com>
+
+	* addpm.c (add_registry, main):
+	* cmdproxy.c (get_env_size):
+	* ddeclient.c (main):
+	* runemacs.c (set_user_model_id):
+	Convert definitions to standard C.
+
+2010-07-20  Juanma Barranquero  <lekktu@gmail.com>
+
+	* gmake.defs (CHECKING_CFLAGS) [ENABLECHECKS]: Add -fno-crossjumping.
+
 2010-07-18  Juanma Barranquero  <lekktu@gmail.com>
 
 	* configure.bat: New option --enable-checking.
--- a/nt/addpm.c	Tue Jul 20 01:19:04 2010 +0000
+++ b/nt/addpm.c	Tue Jul 20 22:54:46 2010 +0000
@@ -83,8 +83,7 @@
 };
 
 BOOL
-add_registry (path)
-     char *path;
+add_registry (char *path)
 {
   HKEY hrootkey = NULL;
   int i;
@@ -175,9 +174,7 @@
 }
 
 int
-main (argc, argv)
-     int argc;
-     char *argv[];
+main (int argc, char *argv[])
 {
   char start_folder[MAX_PATH + 1];
   int shortcuts_created = 0;
@@ -315,10 +312,10 @@
 		  if (SUCCEEDED (IPersistFile_Save (lnk, unicode_path, TRUE)))
 		    shortcuts_created = 1;
 		  IPersistFile_Release (lnk);
-		  
+
 		}
 	    }
-	}      
+	}
     }
 
   if (com_available)
--- a/nt/cmdproxy.c	Tue Jul 20 01:19:04 2010 +0000
+++ b/nt/cmdproxy.c	Tue Jul 20 22:54:46 2010 +0000
@@ -407,7 +407,7 @@
 
 /* Return size of current environment block.  */
 int
-get_env_size ()
+get_env_size (void)
 {
   char * start = GetEnvironmentStrings ();
   char * tmp = start;
--- a/nt/ddeclient.c	Tue Jul 20 01:19:04 2010 +0000
+++ b/nt/ddeclient.c	Tue Jul 20 22:54:46 2010 +0000
@@ -35,9 +35,7 @@
 		              CF_TEXT, XTYP_EXECUTE, 30000, NULL)
 
 int
-main (argc, argv)
-     int argc;
-     char *argv[];
+main (int argc, char *argv[])
 {
   DWORD idDde = 0;
   HCONV HConversation;
--- a/nt/gmake.defs	Tue Jul 20 01:19:04 2010 +0000
+++ b/nt/gmake.defs	Tue Jul 20 22:54:46 2010 +0000
@@ -200,7 +200,7 @@
 endif
 
 ifdef ENABLECHECKS
-CHECKING_CFLAGS	= -DENABLE_CHECKING -DXASSERTS
+CHECKING_CFLAGS	= -DENABLE_CHECKING -DXASSERTS -fno-crossjumping
 else
 CHECKING_CFLAGS	=
 endif
--- a/nt/runemacs.c	Tue Jul 20 01:19:04 2010 +0000
+++ b/nt/runemacs.c	Tue Jul 20 22:54:46 2010 +0000
@@ -174,7 +174,8 @@
   return 1;
 }
 
-void set_user_model_id ()
+void
+set_user_model_id (void)
 {
   HMODULE shell;
   HRESULT (WINAPI * set_user_model) (wchar_t * id);
--- a/src/ChangeLog	Tue Jul 20 01:19:04 2010 +0000
+++ b/src/ChangeLog	Tue Jul 20 22:54:46 2010 +0000
@@ -1,3 +1,24 @@
+2010-07-20  Juanma Barranquero  <lekktu@gmail.com>
+
+	* alloc.c (emacs_blocked_free, emacs_blocked_malloc)
+	(emacs_blocked_realloc, uninterrupt_malloc):
+	* fringe.c (w32_reset_fringes):
+	* image.c (convert_mono_to_color_image, lookup_rgb_color)
+	(init_color_table, XPutPixel, jpeg_resync_to_restart_wrapper):
+	* sound.c (be2hs, do_play_sound):
+	* vm-limit.c (get_lim_data, ret_lim_data):
+	* w32term.c (x_free_frame_resources):
+	* xfaces.c (x_create_gc, x_free_gc):
+	Convert definitions to standard C.
+
+2010-07-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* eval.c (Feval, Ffuncall): Use the new names.
+
+	* lisp.h (struct Lisp_Subr): Rename `am' to aMANY and add aUNEVALLED.
+	(DEFUN): Add braces around the union initialisation and use ## to
+	specify the right union alternative and avoid a cast.
+
 2010-07-18  Juanma Barranquero  <lekktu@gmail.com>
 
 	* makefile.w32-in ($(BLD)/keyboard.$(O)): Update dependencies.
@@ -10,7 +31,7 @@
 
 	* gtkutil.c (xg_event_is_for_menubar): Also check that event window
 	is related to the menu bar (Bug#6499).
-	(xg_frame_resized): GTK_IS_MAPPED => gtk_widget_get_mapped, for Gtk 3.0
+	(xg_frame_resized): GTK_IS_MAPPED => gtk_widget_get_mapped, for Gtk 3.0.
 
 2010-07-16  Jan Djärv  <jan.h.d@swipnet.se>
 
@@ -115,7 +136,8 @@
 	* process.c (add_keyboard_wait_descriptor)
 	(delete_keyboard_wait_descriptor): Move to common section, do
 	nothing when subprocesses is not defined.
-	* term.c (Fsuspend_tty, Fresume_tty, init_tty): Remove subprocesses #ifdefs.
+	* term.c (Fsuspend_tty, Fresume_tty, init_tty):
+	Remove subprocesses #ifdefs.
 
 	Convert maybe_fatal to standard C.
 	* lisp.h (verror): Declare.
@@ -162,8 +184,7 @@
 
 2010-07-12  Andreas Schwab  <schwab@linux-m68k.org>
 
-	* dbusbind.c (xd_initialize): Don't compare boolean with a
-	constant.
+	* dbusbind.c (xd_initialize): Don't compare boolean with a constant.
 
 2010-07-12  Eli Zaretskii  <eliz@gnu.org>
 
@@ -454,7 +475,6 @@
 	* xsettings.c:
 	* xsmfns.c: Likewise.
 
-
 2010-07-08  Eli Zaretskii  <eliz@gnu.org>
 
 	* process.c (kbd_is_on_hold, hold_keyboard_input)
@@ -468,7 +488,8 @@
 
 2010-07-08  Dan Nicolaescu  <dann@ics.uci.edu>
 
-	* xdisp.c (store_mode_line_noprop_char): Remove K&R alternative declaration.
+	* xdisp.c (store_mode_line_noprop_char): Remove K&R alternative
+	declaration.
 
 	Clean up include guards.
 	* tparam.c: Remove include guards for config.h, string.h and code
@@ -691,8 +712,8 @@
 2010-07-07  Jan Djärv  <jan.h.d@swipnet.se>
 
 	* process.c (kbd_is_on_hold): New variable.
-	(hold_keyboard_input, unhold_keyboard_input, kbd_on_hold_p): New
-	functions.
+	(hold_keyboard_input, unhold_keyboard_input, kbd_on_hold_p):
+	New functions.
 	(wait_reading_process_output): If kbd_on_hold_p returns non-zero,
 	select on empty input mask.
 	(init_process): Initialize kbd_is_on_hold to 0.
@@ -716,8 +737,8 @@
 	* dosfns.c:
 	* w16select.c: Convert function definitions to ANSI C.
 
-	* msdos.h (ctrl_break_func, install_ctrl_break_check): Remove
-	unused prototypes.
+	* msdos.h (ctrl_break_func, install_ctrl_break_check):
+	Remove unused prototypes.
 
 2010-07-07  Juanma Barranquero  <lekktu@gmail.com>
 
@@ -1128,16 +1149,16 @@
 	* nsfns.m (compute_tip_xy): Do not convert coordinates from frame
 	parameters, they are already absolute.
 
-	* nsterm.m (x_set_window_size, initFrameFromEmacs): Renamed
-	FRAME_NS_TOOLBAR_HEIGHT to FRAME_TOOLBAR_HEIGHT.
-
-	* nsterm.h (FRAME_NS_TOOLBAR_HEIGHT): Rename to FRAME_TOOLBAR_HEIGH
-
-	* nsmenu.m (update_frame_tool_bar, free_frame_tool_bar): Update
-	FRAME_TOOLBAR_HEIGHT.
-
-	* nsmenu.m (free_frame_tool_bar, update_frame_tool_bar): Add
-	BLOCK/UNBLOCK_INPUT so asserts don't trigger.
+	* nsterm.m (x_set_window_size, initFrameFromEmacs):
+	Rename FRAME_NS_TOOLBAR_HEIGHT to FRAME_TOOLBAR_HEIGHT.
+
+	* nsterm.h (FRAME_NS_TOOLBAR_HEIGHT): Rename to FRAME_TOOLBAR_HEIGHT.
+
+	* nsmenu.m (update_frame_tool_bar, free_frame_tool_bar):
+	Update FRAME_TOOLBAR_HEIGHT.
+
+	* nsmenu.m (free_frame_tool_bar, update_frame_tool_bar):
+	Add BLOCK/UNBLOCK_INPUT so asserts don't trigger.
 
 2010-06-30  Chong Yidong  <cyd@stupidchicken.com>
 
@@ -1326,7 +1347,7 @@
 	* xfns.c (x_default_font_parameter): Try to open font from system
 	before using it (bug#6478).  Rename got_from_gconf to got_from_system.
 
-2010-06-22  Keith Packard <keithp@keithp.com> (tiny change)
+2010-06-22  Keith Packard  <keithp@keithp.com>  (tiny change)
 
 	* font.c (font_parse_fcname): Allow . for sizes like 7.5 (bug#6437).
 
@@ -1498,8 +1519,8 @@
 
 2010-06-03  Andreas Schwab  <schwab@linux-m68k.org>
 
-	* process.c (conv_lisp_to_sockaddr): Fix conversion of IPv4
-	address.  (Bug#6346)
+	* process.c (conv_lisp_to_sockaddr): Fix conversion of IPv4 address.
+	(Bug#6346)
 
 2010-06-03  Juanma Barranquero  <lekktu@gmail.com>
 
--- a/src/alloc.c	Tue Jul 20 01:19:04 2010 +0000
+++ b/src/alloc.c	Tue Jul 20 22:54:46 2010 +0000
@@ -1161,9 +1161,7 @@
 /* This function is used as the hook for free to call.  */
 
 static void
-emacs_blocked_free (ptr, ptr2)
-     void *ptr;
-     const void *ptr2;
+emacs_blocked_free (void *ptr, const void *ptr2)
 {
   BLOCK_INPUT_ALLOC;
 
@@ -1211,9 +1209,7 @@
 /* This function is the malloc hook that Emacs uses.  */
 
 static void *
-emacs_blocked_malloc (size, ptr)
-     size_t size;
-     const void *ptr;
+emacs_blocked_malloc (size_t size, const void *ptr)
 {
   void *value;
 
@@ -1260,10 +1256,7 @@
 /* This function is the realloc hook that Emacs uses.  */
 
 static void *
-emacs_blocked_realloc (ptr, size, ptr2)
-     void *ptr;
-     size_t size;
-     const void *ptr2;
+emacs_blocked_realloc (void *ptr, size_t size, const void *ptr2)
 {
   void *value;
 
@@ -1337,7 +1330,7 @@
 /* Called from main to set up malloc to use our hooks.  */
 
 void
-uninterrupt_malloc ()
+uninterrupt_malloc (void)
 {
 #ifdef HAVE_GTK_AND_PTHREAD
 #ifdef DOUG_LEA_MALLOC
--- a/src/eval.c	Tue Jul 20 01:19:04 2010 +0000
+++ b/src/eval.c	Tue Jul 20 22:54:46 2010 +0000
@@ -2299,7 +2299,7 @@
       if (XSUBR (fun)->max_args == UNEVALLED)
 	{
 	  backtrace.evalargs = 0;
-	  val = (XSUBR (fun)->function.a1) (args_left);
+	  val = (XSUBR (fun)->function.aUNEVALLED) (args_left);
 	  goto done;
 	}
 
@@ -2325,7 +2325,7 @@
 	  backtrace.args = vals;
 	  backtrace.nargs = XINT (numargs);
 
-	  val = (XSUBR (fun)->function.am) (XINT (numargs), vals);
+	  val = (XSUBR (fun)->function.aMANY) (XINT (numargs), vals);
 	  UNGCPRO;
 	  goto done;
 	}
@@ -2968,7 +2968,7 @@
 
       if (XSUBR (fun)->max_args == MANY)
 	{
-	  val = (XSUBR (fun)->function.am) (numargs, args + 1);
+	  val = (XSUBR (fun)->function.aMANY) (numargs, args + 1);
 	  goto done;
 	}
 
--- a/src/fringe.c	Tue Jul 20 01:19:04 2010 +0000
+++ b/src/fringe.c	Tue Jul 20 22:54:46 2010 +0000
@@ -1836,7 +1836,7 @@
 }
 
 void
-w32_reset_fringes ()
+w32_reset_fringes (void)
 {
   /* Destroy row bitmaps.  */
   int bt;
--- a/src/image.c	Tue Jul 20 01:19:04 2010 +0000
+++ b/src/image.c	Tue Jul 20 22:54:46 2010 +0000
@@ -2560,10 +2560,8 @@
 }
 
 static void
-convert_mono_to_color_image (f, img, foreground, background)
-     struct frame *f;
-     struct image *img;
-     COLORREF foreground, background;
+convert_mono_to_color_image (struct frame *f, struct image *img,
+			     COLORREF foreground, COLORREF background)
 {
   HDC hdc, old_img_dc, new_img_dc;
   HGDIOBJ old_prev, new_prev;
@@ -4357,9 +4355,7 @@
 #else /* COLOR_TABLE_SUPPORT */
 
 static unsigned long
-lookup_rgb_color (f, r, g, b)
-     struct frame *f;
-     int r, g, b;
+lookup_rgb_color (struct frame *f, int r, int g, int b)
 {
   unsigned long pixel;
 
@@ -4374,7 +4370,7 @@
 }
 
 static void
-init_color_table ()
+init_color_table (void)
 {
 }
 #endif /* COLOR_TABLE_SUPPORT */
@@ -4492,10 +4488,7 @@
    stored in ximg->data.  */
 
 static void
-XPutPixel (ximg, x, y, color)
-     XImagePtr  ximg;
-     int x, y;
-     COLORREF color;
+XPutPixel (XImagePtr ximg, int x, int y, COLORREF color)
 {
   int width = ximg->info.bmiHeader.biWidth;
   int height = ximg->info.bmiHeader.biHeight;
@@ -6071,9 +6064,7 @@
 /* Wrapper since we can't directly assign the function pointer
    to another function pointer that was declared more completely easily.  */
 static boolean
-jpeg_resync_to_restart_wrapper (cinfo, desired)
-     j_decompress_ptr cinfo;
-     int desired;
+jpeg_resync_to_restart_wrapper (j_decompress_ptr cinfo, int desired)
 {
   return fn_jpeg_resync_to_restart (cinfo, desired);
 }
--- a/src/lisp.h	Tue Jul 20 01:19:04 2010 +0000
+++ b/src/lisp.h	Tue Jul 20 22:54:46 2010 +0000
@@ -971,7 +971,8 @@
       Lisp_Object (*a6) (Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object);
       Lisp_Object (*a7) (Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object);
       Lisp_Object (*a8) (Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object);
-      Lisp_Object (*am) (int, Lisp_Object *);
+      Lisp_Object (*aUNEVALLED) (Lisp_Object args);
+      Lisp_Object (*aMANY) (int, Lisp_Object *);
     } function;
     short min_args, max_args;
     const char *symbol_name;
@@ -1775,7 +1776,8 @@
   Lisp_Object fnname DEFUN_ARGS_ ## maxargs ;				\
   DECL_ALIGN (struct Lisp_Subr, sname) =				\
     { PVEC_SUBR | (sizeof (struct Lisp_Subr) / sizeof (EMACS_INT)),	\
-      (Lisp_Object(*)(void)) fnname, minargs, maxargs, lname, intspec, 0}; \
+      { .a ## maxargs = fnname },				\
+      minargs, maxargs, lname, intspec, 0};				\
   Lisp_Object fnname
 
 /* Note that the weird token-substitution semantics of ANSI C makes
--- a/src/sound.c	Tue Jul 20 01:19:04 2010 +0000
+++ b/src/sound.c	Tue Jul 20 22:54:46 2010 +0000
@@ -522,8 +522,7 @@
    to host byte-order.  */
 
 static u_int16_t
-be2hs (value)
-     u_int16_t value;
+be2hs (u_int16_t value)
 {
 #ifndef WORDS_BIG_ENDIAN
   unsigned char *p = (unsigned char *) &value;
@@ -1209,7 +1208,8 @@
 }
 
 static void
-snd_error_quiet (const char *file, int line, const char *function, int err, const char *fmt)
+snd_error_quiet (const char *file, int line, const char *function, int err,
+		 const char *fmt)
 {
 }
 
@@ -1266,9 +1266,7 @@
   }
 
 static int
-do_play_sound (psz_file, ui_volume)
-     const char *psz_file;
-     unsigned long ui_volume;
+do_play_sound (const char *psz_file, unsigned long ui_volume)
 {
   int i_result = 0;
   MCIERROR mci_error = 0;
--- a/src/vm-limit.c	Tue Jul 20 01:19:04 2010 +0000
+++ b/src/vm-limit.c	Tue Jul 20 22:54:46 2010 +0000
@@ -69,7 +69,7 @@
 #ifdef USG
 
 static void
-get_lim_data ()
+get_lim_data (void)
 {
   extern long ulimit ();
 
@@ -93,7 +93,7 @@
 #ifdef WINDOWSNT
 
 static void
-get_lim_data ()
+get_lim_data (void)
 {
   extern unsigned long reserved_heap_size;
   lim_data = reserved_heap_size;
@@ -104,7 +104,7 @@
 
 #ifdef MSDOS
 void
-get_lim_data ()
+get_lim_data (void)
 {
   _go32_dpmi_meminfo info;
   unsigned long lim1, lim2;
@@ -135,14 +135,14 @@
 }
 
 unsigned long
-ret_lim_data ()
+ret_lim_data (void)
 {
   get_lim_data ();
   return lim_data;
 }
 #else /* not MSDOS */
 static void
-get_lim_data ()
+get_lim_data (void)
 {
   lim_data = vlimit (LIM_DATA, -1);
 }
@@ -151,7 +151,7 @@
 #else /* BSD4_2 */
 
 static void
-get_lim_data ()
+get_lim_data (void)
 {
   struct rlimit XXrlimit;
 
--- a/src/w32term.c	Tue Jul 20 01:19:04 2010 +0000
+++ b/src/w32term.c	Tue Jul 20 22:54:46 2010 +0000
@@ -5694,8 +5694,7 @@
 /* Free X resources of frame F.  */
 
 void
-x_free_frame_resources (f)
-     struct frame *f;
+x_free_frame_resources (struct frame *f)
 {
   struct w32_display_info *dpyinfo = FRAME_W32_DISPLAY_INFO (f);
 
--- a/src/xfaces.c	Tue Jul 20 01:19:04 2010 +0000
+++ b/src/xfaces.c	Tue Jul 20 22:54:46 2010 +0000
@@ -726,10 +726,7 @@
 /* W32 emulation of GCs */
 
 static INLINE GC
-x_create_gc (f, mask, xgcv)
-     struct frame *f;
-     unsigned long mask;
-     XGCValues *xgcv;
+x_create_gc (struct frame *f, unsigned long mask, XGCValues *xgcv)
 {
   GC gc;
   BLOCK_INPUT;
@@ -743,9 +740,7 @@
 /* Free GC which was used on frame F.  */
 
 static INLINE void
-x_free_gc (f, gc)
-     struct frame *f;
-     GC gc;
+x_free_gc (struct frame *f, GC gc)
 {
   IF_DEBUG (xassert (--ngcs >= 0));
   xfree (gc);