upstream

159 files changed, 2473 insertions, 1362 deletions

diff --git a/ChangeLog b/ChangeLog
index 437c6dba2f1..22f9955e98b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-09-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Merge from gnulib, porting to Tru64.
+        * lib/lstat.c, lib/stat.c, m4/include_next.m4, m4/nocrash.m4:
+        * m4/signal_h.m4, m4/time_h.m4, m4/unistd_h.m4:
+        Merge from gnulib.  This fixes a compilation error on Tru64 UNIX
+        aka OSF/1 5.1 DTK cc.  There is also some mingw stuff here that
+        doesn't affect Emacs.
+
 2011-09-06  Paul Eggert  <eggert@cs.ucla.edu>
 
         * configure.in (isnan): Remove now-unnecessary check.
@@ -231,7 +240,7 @@
 
         * m4/lstat.m4: Merge from gnulib (Bug#8878).
 
-2011-06-16  Miles Bader <miles@gnu.org>
+2011-06-16  Miles Bader  <miles@gnu.org>
 
         * configure.in: Try to determine CRT_DIR automatically when
         using gcc.
diff --git a/autogen/configure b/autogen/configure
index 31a0c29aa56..6ae1560c238 100755
--- a/autogen/configure
+++ b/autogen/configure
@@ -17091,13 +17091,24 @@ _ACEOF
                  aix*) gl_absname_cpp="$ac_cpp -C" ;;
                  *)    gl_absname_cpp="$ac_cpp" ;;
                esac
+
+               case "$host_os" in
+                 mingw*)
+                                                                                                                                     gl_dirsep_regex='[/\\]'
+                   ;;
+                 *)
+                   gl_dirsep_regex='/'
+                   ;;
+               esac
+
+               gl_absolute_header_sed='\#'"${gl_dirsep_regex}"'getopt.h#{
+                   s#.*"\(.*'"${gl_dirsep_regex}"'getopt.h\)".*#\1#
+                   s#^/[^/]#//&#
+                   p
+                   q
+                 }'
                                                             gl_cv_next_getopt_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                  sed -n '\#/getopt.h#{
-                    s#.*"\(.*/getopt.h\)".*#\1#
-                    s#^/[^/]#//&#
-                    p
-                    q
-                  }'`'"'
+                      sed -n "$gl_absolute_header_sed"`'"'
           else
                gl_cv_next_getopt_h='<'getopt.h'>'
              fi
@@ -17418,6 +17429,34 @@ nocrash_init (void)
     }
   }
 }
+#elif (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+/* Avoid a crash on native Windows.  */
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <winerror.h>
+static LONG WINAPI
+exception_filter (EXCEPTION_POINTERS *ExceptionInfo)
+{
+  switch (ExceptionInfo->ExceptionRecord->ExceptionCode)
+    {
+    case EXCEPTION_ACCESS_VIOLATION:
+    case EXCEPTION_IN_PAGE_ERROR:
+    case EXCEPTION_STACK_OVERFLOW:
+    case EXCEPTION_GUARD_PAGE:
+    case EXCEPTION_PRIV_INSTRUCTION:
+    case EXCEPTION_ILLEGAL_INSTRUCTION:
+    case EXCEPTION_DATATYPE_MISALIGNMENT:
+    case EXCEPTION_ARRAY_BOUNDS_EXCEEDED:
+    case EXCEPTION_NONCONTINUABLE_EXCEPTION:
+      exit (1);
+    }
+  return EXCEPTION_CONTINUE_SEARCH;
+}
+static void
+nocrash_init (void)
+{
+  SetUnhandledExceptionFilter ((LPTOP_LEVEL_EXCEPTION_FILTER) exception_filter);
+}
 #else
 /* Avoid a crash on POSIX systems.  */
 #include <signal.h>
@@ -17791,13 +17830,24 @@ _ACEOF
                  aix*) gl_absname_cpp="$ac_cpp -C" ;;
                  *)    gl_absname_cpp="$ac_cpp" ;;
                esac
+
+               case "$host_os" in
+                 mingw*)
+                                                                                                                                     gl_dirsep_regex='[/\\]'
+                   ;;
+                 *)
+                   gl_dirsep_regex='/'
+                   ;;
+               esac
+
+               gl_absolute_header_sed='\#'"${gl_dirsep_regex}"'stdint.h#{
+                   s#.*"\(.*'"${gl_dirsep_regex}"'stdint.h\)".*#\1#
+                   s#^/[^/]#//&#
+                   p
+                   q
+                 }'
                                                             gl_cv_next_stdint_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                  sed -n '\#/stdint.h#{
-                    s#.*"\(.*/stdint.h\)".*#\1#
-                    s#^/[^/]#//&#
-                    p
-                    q
-                  }'`'"'
+                      sed -n "$gl_absolute_header_sed"`'"'
           else
                gl_cv_next_stdint_h='<'stdint.h'>'
              fi
@@ -18487,13 +18537,24 @@ _ACEOF
                  aix*) gl_absname_cpp="$ac_cpp -C" ;;
                  *)    gl_absname_cpp="$ac_cpp" ;;
                esac
+
+               case "$host_os" in
+                 mingw*)
+                                                                                                                                     gl_dirsep_regex='[/\\]'
+                   ;;
+                 *)
+                   gl_dirsep_regex='/'
+                   ;;
+               esac
+
+               gl_absolute_header_sed='\#'"${gl_dirsep_regex}"'inttypes.h#{
+                   s#.*"\(.*'"${gl_dirsep_regex}"'inttypes.h\)".*#\1#
+                   s#^/[^/]#//&#
+                   p
+                   q
+                 }'
                                                             gl_cv_next_inttypes_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                  sed -n '\#/inttypes.h#{
-                    s#.*"\(.*/inttypes.h\)".*#\1#
-                    s#^/[^/]#//&#
-                    p
-                    q
-                  }'`'"'
+                      sed -n "$gl_absolute_header_sed"`'"'
           else
                gl_cv_next_inttypes_h='<'inttypes.h'>'
              fi
@@ -19189,13 +19250,24 @@ _ACEOF
                  aix*) gl_absname_cpp="$ac_cpp -C" ;;
                  *)    gl_absname_cpp="$ac_cpp" ;;
                esac
+
+               case "$host_os" in
+                 mingw*)
+                                                                                                                                     gl_dirsep_regex='[/\\]'
+                   ;;
+                 *)
+                   gl_dirsep_regex='/'
+                   ;;
+               esac
+
+               gl_absolute_header_sed='\#'"${gl_dirsep_regex}"'time.h#{
+                   s#.*"\(.*'"${gl_dirsep_regex}"'time.h\)".*#\1#
+                   s#^/[^/]#//&#
+                   p
+                   q
+                 }'
                                                             gl_cv_next_time_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                  sed -n '\#/time.h#{
-                    s#.*"\(.*/time.h\)".*#\1#
-                    s#^/[^/]#//&#
-                    p
-                    q
-                  }'`'"'
+                      sed -n "$gl_absolute_header_sed"`'"'
 
 
 fi
@@ -19218,6 +19290,8 @@ $as_echo "$gl_cv_next_time_h" >&6; }
 
 
 
+
+
 ac_fn_c_check_decl "$LINENO" "localtime_r" "ac_cv_have_decl_localtime_r" "$ac_includes_default"
 if test "x$ac_cv_have_decl_localtime_r" = x""yes; then :
   ac_have_decl=1
@@ -20728,13 +20802,24 @@ _ACEOF
                  aix*) gl_absname_cpp="$ac_cpp -C" ;;
                  *)    gl_absname_cpp="$ac_cpp" ;;
                esac
+
+               case "$host_os" in
+                 mingw*)
+                                                                                                                                     gl_dirsep_regex='[/\\]'
+                   ;;
+                 *)
+                   gl_dirsep_regex='/'
+                   ;;
+               esac
+
+               gl_absolute_header_sed='\#'"${gl_dirsep_regex}"'signal.h#{
+                   s#.*"\(.*'"${gl_dirsep_regex}"'signal.h\)".*#\1#
+                   s#^/[^/]#//&#
+                   p
+                   q
+                 }'
                                                             gl_cv_next_signal_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                  sed -n '\#/signal.h#{
-                    s#.*"\(.*/signal.h\)".*#\1#
-                    s#^/[^/]#//&#
-                    p
-                    q
-                  }'`'"'
+                      sed -n "$gl_absolute_header_sed"`'"'
 
 
 fi
@@ -20772,6 +20857,8 @@ fi
 
 
 
+
+
   ac_fn_c_check_type "$LINENO" "sighandler_t" "ac_cv_type_sighandler_t" "
 #include <signal.h>
 
@@ -20960,13 +21047,24 @@ _ACEOF
                  aix*) gl_absname_cpp="$ac_cpp -C" ;;
                  *)    gl_absname_cpp="$ac_cpp" ;;
                esac
+
+               case "$host_os" in
+                 mingw*)
+                                                                                                                                     gl_dirsep_regex='[/\\]'
+                   ;;
+                 *)
+                   gl_dirsep_regex='/'
+                   ;;
+               esac
+
+               gl_absolute_header_sed='\#'"${gl_dirsep_regex}"'stdarg.h#{
+                   s#.*"\(.*'"${gl_dirsep_regex}"'stdarg.h\)".*#\1#
+                   s#^/[^/]#//&#
+                   p
+                   q
+                 }'
                                                             gl_cv_next_stdarg_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                  sed -n '\#/stdarg.h#{
-                    s#.*"\(.*/stdarg.h\)".*#\1#
-                    s#^/[^/]#//&#
-                    p
-                    q
-                  }'`'"'
+                      sed -n "$gl_absolute_header_sed"`'"'
 
 
 fi
@@ -21149,13 +21247,24 @@ _ACEOF
                  aix*) gl_absname_cpp="$ac_cpp -C" ;;
                  *)    gl_absname_cpp="$ac_cpp" ;;
                esac
+
+               case "$host_os" in
+                 mingw*)
+                                                                                                                                     gl_dirsep_regex='[/\\]'
+                   ;;
+                 *)
+                   gl_dirsep_regex='/'
+                   ;;
+               esac
+
+               gl_absolute_header_sed='\#'"${gl_dirsep_regex}"'stddef.h#{
+                   s#.*"\(.*'"${gl_dirsep_regex}"'stddef.h\)".*#\1#
+                   s#^/[^/]#//&#
+                   p
+                   q
+                 }'
                                                             gl_cv_next_stddef_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                  sed -n '\#/stddef.h#{
-                    s#.*"\(.*/stddef.h\)".*#\1#
-                    s#^/[^/]#//&#
-                    p
-                    q
-                  }'`'"'
+                      sed -n "$gl_absolute_header_sed"`'"'
 
 
 fi
@@ -21208,13 +21317,24 @@ _ACEOF
                  aix*) gl_absname_cpp="$ac_cpp -C" ;;
                  *)    gl_absname_cpp="$ac_cpp" ;;
                esac
+
+               case "$host_os" in
+                 mingw*)
+                                                                                                                                     gl_dirsep_regex='[/\\]'
+                   ;;
+                 *)
+                   gl_dirsep_regex='/'
+                   ;;
+               esac
+
+               gl_absolute_header_sed='\#'"${gl_dirsep_regex}"'stdio.h#{
+                   s#.*"\(.*'"${gl_dirsep_regex}"'stdio.h\)".*#\1#
+                   s#^/[^/]#//&#
+                   p
+                   q
+                 }'
                                                             gl_cv_next_stdio_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                  sed -n '\#/stdio.h#{
-                    s#.*"\(.*/stdio.h\)".*#\1#
-                    s#^/[^/]#//&#
-                    p
-                    q
-                  }'`'"'
+                      sed -n "$gl_absolute_header_sed"`'"'
 
 
 fi
@@ -21289,13 +21409,24 @@ _ACEOF
                  aix*) gl_absname_cpp="$ac_cpp -C" ;;
                  *)    gl_absname_cpp="$ac_cpp" ;;
                esac
+
+               case "$host_os" in
+                 mingw*)
+                                                                                                                                     gl_dirsep_regex='[/\\]'
+                   ;;
+                 *)
+                   gl_dirsep_regex='/'
+                   ;;
+               esac
+
+               gl_absolute_header_sed='\#'"${gl_dirsep_regex}"'stdlib.h#{
+                   s#.*"\(.*'"${gl_dirsep_regex}"'stdlib.h\)".*#\1#
+                   s#^/[^/]#//&#
+                   p
+                   q
+                 }'
                                                             gl_cv_next_stdlib_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                  sed -n '\#/stdlib.h#{
-                    s#.*"\(.*/stdlib.h\)".*#\1#
-                    s#^/[^/]#//&#
-                    p
-                    q
-                  }'`'"'
+                      sed -n "$gl_absolute_header_sed"`'"'
 
 
 fi
@@ -21538,13 +21669,24 @@ _ACEOF
                  aix*) gl_absname_cpp="$ac_cpp -C" ;;
                  *)    gl_absname_cpp="$ac_cpp" ;;
                esac
+
+               case "$host_os" in
+                 mingw*)
+                                                                                                                                     gl_dirsep_regex='[/\\]'
+                   ;;
+                 *)
+                   gl_dirsep_regex='/'
+                   ;;
+               esac
+
+               gl_absolute_header_sed='\#'"${gl_dirsep_regex}"'sys/stat.h#{
+                   s#.*"\(.*'"${gl_dirsep_regex}"'sys/stat.h\)".*#\1#
+                   s#^/[^/]#//&#
+                   p
+                   q
+                 }'
                                                             gl_cv_next_sys_stat_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                  sed -n '\#/sys/stat.h#{
-                    s#.*"\(.*/sys/stat.h\)".*#\1#
-                    s#^/[^/]#//&#
-                    p
-                    q
-                  }'`'"'
+                      sed -n "$gl_absolute_header_sed"`'"'
           else
                gl_cv_next_sys_stat_h='<'sys/stat.h'>'
              fi
@@ -21705,13 +21847,24 @@ _ACEOF
                  aix*) gl_absname_cpp="$ac_cpp -C" ;;
                  *)    gl_absname_cpp="$ac_cpp" ;;
                esac
+
+               case "$host_os" in
+                 mingw*)
+                                                                                                                                     gl_dirsep_regex='[/\\]'
+                   ;;
+                 *)
+                   gl_dirsep_regex='/'
+                   ;;
+               esac
+
+               gl_absolute_header_sed='\#'"${gl_dirsep_regex}"'unistd.h#{
+                   s#.*"\(.*'"${gl_dirsep_regex}"'unistd.h\)".*#\1#
+                   s#^/[^/]#//&#
+                   p
+                   q
+                 }'
                                                             gl_cv_next_unistd_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-                  sed -n '\#/unistd.h#{
-                    s#.*"\(.*/unistd.h\)".*#\1#
-                    s#^/[^/]#//&#
-                    p
-                    q
-                  }'`'"'
+                      sed -n "$gl_absolute_header_sed"`'"'
           else
                gl_cv_next_unistd_h='<'unistd.h'>'
              fi
@@ -21744,6 +21897,8 @@ $as_echo "$gl_cv_next_unistd_h" >&6; }
 
 
 
+
+
   gl_gnulib_enabled_dosname=false
   gl_gnulib_enabled_be453cec5eecf5731a274f2de7f2db36=false
   gl_gnulib_enabled_stat=false
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 56958417300..5fba9eda3b0 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,12 @@
+2011-09-12  Eric Hanchrow  <eric.hanchrow@gmail.com>
+
+        * frames.texi (Frame Commands): Note that delete-other-frames only
+        deletes frames on current terminal.
+
+2011-09-10  Eli Zaretskii  <eliz@gnu.org>
+
+        * sending.texi (Mail Misc): Document mail-add-attachment.
+
 2011-09-04  Eli Zaretskii  <eliz@gnu.org>
 
         * basic.texi (Inserting Text): Add index entries.  (Bug#9433)
diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi
index 328deaec357..8ca598c3348 100644
--- a/doc/emacs/frames.texi
+++ b/doc/emacs/frames.texi
@@ -448,17 +448,23 @@ terminal.
 @item C-x 5 1
 @kindex C-x 5 1
 @findex delete-other-frames
-Delete all frames except the selected one.
+Delete all frames on the current terminal, except the selected one.
 @end table
 
-  The @kbd{C-x 5 0} (@code{delete-frame}) command will never delete
-the last frame, to prevent you from losing the ability to interact
+  The @kbd{C-x 5 0} (@code{delete-frame}) command never deletes the
+last frame.  This prevents you from losing the ability to interact
 with the Emacs process.  Note that when Emacs is run as a daemon
 (@pxref{Emacs Server}), there is always a ``virtual frame'' that
 remains after all the ordinary, interactive frames are deleted.  In
 this case, @kbd{C-x 5 0} can delete the last interactive frame; you
 can use @command{emacsclient} to reconnect to the Emacs session.
 
+  The @kbd{C-x 5 1} (@code{delete-other-frames}) command only deletes
+frames on the current terminal.  For example, if you call it from an X
+frame, it deletes the other frames on that X display; if the Emacs
+process has frames open on other X displays or text terminals, those
+are not deleted.
+
 @vindex focus-follows-mouse
   On X, you may have to tell Emacs how the window manager handles
 focus-switching between windows, in order for @kbd{C-x 5 o}
diff --git a/doc/emacs/sending.texi b/doc/emacs/sending.texi
index 02857459cc1..50ec852d740 100644
--- a/doc/emacs/sending.texi
+++ b/doc/emacs/sending.texi
@@ -556,8 +556,8 @@ package, which provides more flexible citation
 @cindex Multipurpose Internet Mail Extensions
   You can @dfn{attach} a file to an outgoing message by typing
 @kbd{C-c C-a} (@code{mml-attach-file}) in the mail buffer.  Attaching
-is done using the MIME (Multipurpose Internet Mail Extensions)
-standard.
+is done using the Multipurpose Internet Mail Extensions
+(@acronym{MIME}) standard.
 
   The @code{mml-attach-file} command prompts for the name of the file,
 and for the attachment's @dfn{content type}, @dfn{description}, and
@@ -570,6 +570,13 @@ recipient will see a link to the attachment within the message body,
 or @samp{attachment}, which means the link will be separate from the
 body.
 
+@findex mail-add-attachment
+  The @code{mml-attach-file} command is specific to Message mode; in
+Mail mode use @kbd{mail-add-attachment} instead.  It will prompt only
+for the name of the file, and will determine the content type and the
+disposition automatically.  If you want to include some description of
+the attached file, type that in the message body.
+
   The actual contents of the attached file are not inserted into the
 mail buffer.  Instead, some placeholder text is inserted into the mail
 buffer, like this:
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 3f52d684683..4873680d0a1 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-11  Juanma Barranquero  <lekktu@gmail.com>
+
+        * processes.texi (Network Servers): Clarify what the process
+        buffer is used for (bug#9233).
+
 2011-08-30  Dani Moncayo  <dmoncayo@gmail.com>  (tiny change)
 
         * lists.texi (Building Lists): Fix typo.
diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi
index 5d5b11497f7..d4f8ee9708b 100644
--- a/doc/lispref/processes.texi
+++ b/doc/lispref/processes.texi
@@ -1981,9 +1981,9 @@ not get a separate process buffer; otherwise, Emacs creates a new
 buffer for the purpose.  The buffer name is the server's buffer name
 or process name, concatenated with the client identification string.
 
-The server's process buffer value is never used directly by Emacs, but
-it is passed to the log function, which can log connections by
-inserting text there.
+The server's process buffer value is never used directly, but the log
+function can retrieve it and use it to log connections by inserting
+text there.
 
 @item
 The communication type and the process filter and sentinel are
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 8260df911a8..9826523227c 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,14 @@
+2011-09-11  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus.texi (Listing Groups): Explain `gnus-group-list-limit'.
+        (Finding the News): Doc clarification.
+        (Terminology): Mention naming.
+
+2011-09-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus.texi: Remove mentions of `recent', which are now obsolete.
+        (Interactive): Document `quiet'.
+
 2011-08-15  Suvayu Ali  <fatkasuvayu+linux@gmail.com>  (tiny change)
 
         * org.texi (Images in LaTeX export): rewrite.
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 439ff7fbc55..59c39893c13 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -1011,7 +1011,7 @@ The @code{gnus-select-method} variable says where Gnus should look for
 news.  This variable should be a list where the first element says
 @dfn{how} and the second element says @dfn{where}.  This method is your
 native method.  All groups not fetched with this method are
-foreign groups.
+secondary or foreign groups.
 
 For instance, if the @samp{news.somewhere.edu} @acronym{NNTP} server is where
 you want to get your daily dosage of news from, you'd say:
@@ -2983,7 +2983,7 @@ The available operators are @code{not}, @code{and} and @code{or}.
 Predicates include @code{tick}, @code{unsend}, @code{undownload},
 @code{unread}, @code{dormant}, @code{expire}, @code{reply},
 @code{killed}, @code{bookmark}, @code{score}, @code{save},
-@code{cache}, @code{forward}, @code{unseen} and @code{recent}.
+@code{cache}, @code{forward}, and @code{unseen}.
 
 @end table
 
@@ -3335,8 +3335,12 @@ List all groups with ticked articles (@code{gnus-group-list-ticked}).
 @item A /
 @kindex A / (Group)
 @findex gnus-group-list-limit
-List groups limited within the current selection
-(@code{gnus-group-list-limit}).
+Further limit groups within the current selection
+(@code{gnus-group-list-limit}).  If you've first limited to groups
+with dormant articles with @kbd{A ?}, you can then further limit with
+@kbd{A / c}, which will then limit to groups with cached articles,
+giving you the groups that have both dormant articles and cached
+articles.
 
 @item A f
 @kindex A f (Group)
@@ -6165,18 +6169,9 @@ religiously) are marked with an @samp{S} in the second column
 (@code{gnus-saved-mark}).
 
 @item
-@vindex gnus-recent-mark
-Articles that according to the server haven't been shown to the user
-before are marked with a @samp{N} in the second column
-(@code{gnus-recent-mark}).  Note that not all servers support this
-mark, in which case it simply never appears.  Compare with
-@code{gnus-unseen-mark}.
-
-@item
 @vindex gnus-unseen-mark
 Articles that haven't been seen before in Gnus by the user are marked
 with a @samp{.} in the second column (@code{gnus-unseen-mark}).
-Compare with @code{gnus-recent-mark}.
 
 @item
 @vindex gnus-downloaded-mark
@@ -22265,8 +22260,9 @@ is @code{t} by default.
 
 @item gnus-interactive-exit
 @vindex gnus-interactive-exit
-Require confirmation before exiting Gnus.  This variable is @code{t} by
-default.
+If non-@code{nil}, require a confirmation when exiting Gnus.  If
+@code{quiet}, update any active summary buffers automatically without
+querying.  The default value is @code{t}.
 @end table
 
 
@@ -27993,10 +27989,6 @@ non-@code{nil}, the summary buffer is shown and updated as it's being
 built.
 
 @item
-The new @code{recent} mark @samp{.} indicates newly arrived messages (as
-opposed to old but unread messages).
-
-@item
 Gnus supports RFC 2369 mailing list headers, and adds a number of
 related commands in mailing list groups.  @xref{Mailing List}.
 
@@ -28584,18 +28576,21 @@ confusing.
 @item native
 @cindex native
 Gnus will always use one method (and back end) as the @dfn{native}, or
-default, way of getting news.
+default, way of getting news.  Groups from the native select method
+have names like @samp{gnu.emacs.gnus}.
 
 @item foreign
 @cindex foreign
-You can also have any number of foreign groups active at the same time.
-These are groups that use non-native non-secondary back ends for getting
-news.
+You can also have any number of foreign groups active at the same
+time.  These are groups that use non-native non-secondary back ends
+for getting news.  Foreign groups have names like
+@samp{nntp+news.gmane.org:gmane.emacs.gnus.devel}.
 
 @item secondary
 @cindex secondary
-Secondary back ends are somewhere half-way between being native and being
-foreign, but they mostly act like they are native.
+Secondary back ends are somewhere half-way between being native and
+being foreign, but they mostly act like they are native, but they, too
+have names like @samp{nntp+news.gmane.org:gmane.emacs.gnus.devel}.
 
 @item article
 @cindex article
@@ -29572,9 +29567,9 @@ propagate the mark information to the server.
 marks (preserving all marks not mentioned).  @var{mark} is a list of
 marks; where each mark is a symbol.  Currently used marks are
 @code{read}, @code{tick}, @code{reply}, @code{expire}, @code{killed},
-@code{dormant}, @code{save}, @code{download}, @code{unsend},
-@code{forward} and @code{recent}, but your back end should, if
-possible, not limit itself to these.
+@code{dormant}, @code{save}, @code{download}, @code{unsend}, and
+@code{forward}, but your back end should, if possible, not limit
+itself to these.
 
 Given contradictory actions, the last action in the list should be the
 effective one.  That is, if your action contains a request to add the
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 0749862f676..52129803583 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,12 @@
+2011-09-13  William Stevenson  <yhvh2000@gmail.com>
+
+        * themes/adwaita-theme.el: New file.
+
+2011-09-13  Scott Frazer  <frazer.scott@gmail.com>
+
+        * themes/whiteboard-theme.el:
+        * themes/deeper-blue-theme.el: New files.
+
 2011-09-05  Juri Linkov  <juri@jurta.org>
 
         * grep.txt: Add `eval' to the Local Variables section that
diff --git a/etc/NEWS b/etc/NEWS
index dbeca0b521b..9f5595a6341 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -156,6 +156,15 @@ If you had that set, then then you need to put
 
 in your ~/.authinfo file instead.
 
+*** sendmail changes
++++
+You can now add MIME attachments to outgoing messages with the new
+command `mail-add-attachment'.
+
+---
+The command `mail-attach-file' was renamed to `mail-insert-file'; the
+old name is now an obsolete alias to the new name.
+
 ** Emacs server and client changes
 +++
 *** New option `server-port' specifies the port on which the Emacs
@@ -484,7 +493,7 @@ between applications.
 To inhibit this, change `x-select-enable-clipboard-manager' to nil.
 
 ** New command `rectangle-number-lines', bound to `C-x r N', numbers
-the lines in the current rectangle.  With an prefix argument, this
+the lines in the current rectangle.  With a prefix argument, this
 prompts for a number to count from and for a format string.
 
 ** The command shell prompts for the shell path name, when the default
diff --git a/etc/themes/adwaita-theme.el b/etc/themes/adwaita-theme.el
new file mode 100644
index 00000000000..9e991847d5c
--- /dev/null
+++ b/etc/themes/adwaita-theme.el
@@ -0,0 +1,106 @@
+;;; adwaita-theme.el --- Tango-based custom theme for faces
+
+;; Copyright (C) 2010-2011 Free Software Foundation, Inc.
+
+;; Author: William Stevenson <yhvh2000@gmail.com>
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Code:
+
+(deftheme adwaita
+  "Face colors similar to the default theme of Gnome 3 (Adwaita).
+The colors are chosen to match Adwaita window decorations and the
+default look of the Gnome 3 desktop.")
+
+(let ((class '((class color) (min-colors 89))))
+  (custom-theme-set-faces
+   'adwaita
+   `(cursor ((,class (:background "#00BBFF"))))
+   `(border-color ((,class (:background "#EDEDED"))))
+   `(default ((,class (:background "#EDEDED" :foreground "#2E3436"))))
+   `(fringe ((,class (:background "#E6E6E6"))))
+   `(mode-line ((,class (:box (:line-width -1 :style released-button)
+                         :background "white" :foreground "#2E3436"))))
+   `(mode-line-inactive ((,class (:foreground "#C6C6C6" :background ,"white"))))
+   `(header-line ((,class (:foreground "#CCCCCC" :background "black"))))
+
+   `(minibuffer-prompt ((,class (:foreground "#0084C8" :bold t))))
+   `(region ((,class (:foreground unspecified :background "#C2D5E9"))))
+   `(dired-header ((,class (:bold t :foreground "#0084C8"))))
+   `(widget-button ((,class (:bold t :foreground "#0084C8"))))
+
+   `(success ((,class (:bold t :foreground "#4E9A06"))))
+   `(warning ((,class (:foreground "#CE5C00"))))
+   `(error ((,class (:foreground "#B50000"))))
+
+   `(font-lock-builtin-face ((,class (:foreground "#A020F0"))))
+   `(font-lock-constant-face ((,class (:foreground "#F5666D"))))
+   `(font-lock-comment-face ((,class (:foreground "#204A87"))))
+   `(font-lock-function-name-face ((,class (:foreground "#00578E" :bold t))))
+   `(font-lock-keyword-face ((,class (:bold t :foreground "#A52A2A"))))
+   `(font-lock-string-face ((,class (:foreground "#4E9A06"))))
+   `(font-lock-type-face ((,class (:foreground "#2F8B58" :bold t))))
+   `(font-lock-variable-name-face ((,class (:foreground "#0084C8" :bold t))))
+   `(font-lock-warning-face ((,class (:foreground "#F5666D" :bold t))))
+
+   `(link ((,class (:underline t :foreground "#0066CC"))))
+   `(link-visited ((,class (:underline t :foreground "#6799CC"))))
+   `(highlight ((,class (:foreground "white" :background "#4A90D9"))))
+   `(isearch ((,class (:foreground "white" :background "#77A4DD"))))
+
+   `(erc-action-face ((,class (:foreground "#F5666D"))))
+   `(erc-button ((,class (:foreground "#A8799C"))))
+   `(erc-current-nick-face ((,class (:bold t :foreground "#FF7092"))))
+   `(erc-error-face ((,class (:foreground "#F5666D" :bold t))))
+   `(erc-input-face ((,class (:foreground "black"))))
+   `(erc-keyword-face ((,class (:foreground "#F5666D"))))
+   `(erc-my-nick-face ((,class (:bold t :foreground "#FF8CA7"))))
+   `(erc-nick-default-face ((,class (:bold t :foreground "#0084C8"))))
+   `(erc-notice-face ((,class (:foreground "#0084C8"))))
+   `(erc-prompt-face ((,class (:foreground "black"))))
+   `(erc-timestamp-face ((,class (:foreground ,"#4CB64A"))))
+
+   `(magit-log-sha1 ((,class (:foreground "#FF7092"))))
+   `(magit-log-head-label-local ((,class (:foreground "#4F78B5"))))
+   `(magit-log-head-label-remote ((,class (:foreground ,"#4CB64A"))))
+   `(magit-branch ((,class (:bold t :foreground "#0084C8"))))
+   `(magit-section-title ((,class (:bold t :foreground "#00578E"))))
+   `(magit-item-highlight ((,class (:background "#FEFFBF"))))
+   `(magit-diff-add ((,class (:bold t :foreground "#4CB64A"))))
+   `(magit-diff-del ((,class (:bold nil :foreground "#F5666D"))))
+
+   `(gnus-group-mail-1-empty ((,class (:foreground "#00578E"))))
+   `(gnus-group-mail-1 ((,class (:bold t :foreground "#4F78B5"))))
+   `(gnus-group-mail-3-empty ((,class (:foreground "#00578E"))))
+   `(gnus-group-mail-3 ((,class (:bold t :foreground "#9CBB43"))))
+   `(gnus-group-news-3-empty ((,class (:foreground "#00578E"))))
+   `(gnus-group-news-3 ((,class (:bold t :foreground "#9CBB43"))))
+   `(gnus-header-name ((,class (:bold t :foreground "#0084C8"))))
+   `(gnus-header-subject ((,class (:bold t :foreground "#FF7092"))))
+   `(gnus-header-content ((,class (:foreground "#FF7092"))))
+   `(gnus-button ((,class (:bold t :foreground "#00578E"))))
+   `(gnus-cite-1 ((,class (:foreground "#00578E"))))
+   `(gnus-cite-2 ((,class (:foreground "#0084C8"))))
+
+   `(diff-added ((,class (:bold t :foreground "#4E9A06"))))
+   `(diff-removed ((,class (:bold t :foreground "#F5666D"))))))
+
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
+
+;;; adwaita-theme.el  ends here
diff --git a/etc/themes/deeper-blue-theme.el b/etc/themes/deeper-blue-theme.el
new file mode 100644
index 00000000000..5c93e84d078
--- /dev/null
+++ b/etc/themes/deeper-blue-theme.el
@@ -0,0 +1,116 @@
+;;; deeper-blue-theme.el --- Custom theme for faces
+
+;; Copyright (C) 2011 Free Software Foundation, Inc.
+
+;; Author: Scott Frazer <frazer.scott@gmail.com>
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Code:
+
+(deftheme deeper-blue
+  "Face colors using a deep blue backgound.")
+
+(let ((class '((class color) (min-colors 89))))
+  (custom-theme-set-faces
+   'deeper-blue
+   `(Info-title-1-face ((,class (:family "helv" :weight bold :height 1.728))))
+   `(Info-title-2-face ((,class (:family "helv" :weight bold :height 1.44))))
+   `(Info-title-3-face ((,class (:family "helv" :weight bold :height 1.2))))
+   `(Info-title-4-face ((,class (:family "helv" :weight bold))))
+   `(compilation-column-number ((,class (:foreground "LightGreen"))))
+   `(compilation-error ((,class (:foreground "Red1"))))
+   `(compilation-info ((,class (:weight normal :foreground "LightSkyBlue"))))
+   `(compilation-line-number ((,class (:foreground "LightGreen"))))
+   `(cperl-array-face ((,class (:foreground "yellow2"))))
+   `(cperl-hash-face ((,class (:foreground "coral1"))))
+   `(cursor ((,class (:background "green" :foreground "black"))))
+   `(default ((,class (:background "#181a26" :foreground "gray80"))))
+   `(diff-added ((,class (nil))))
+   `(diff-changed ((,class (nil))))
+   `(diff-context ((,class (:foreground "seashell4"))))
+   `(diff-file-header ((,class (:background "grey60"))))
+   `(diff-function ((,class (:inherit diff-header))))
+   `(diff-header ((,class (:background "grey45"))))
+   `(diff-hunk-header ((,class (:inherit diff-header))))
+   `(diff-index ((,class (:inherit diff-file-header))))
+   `(diff-indicator-added ((,class (:foreground "white" :background "darkolivegreen"))))
+   `(diff-indicator-changed ((,class (:foreground "white" :background "dodgerblue4"))))
+   `(diff-indicator-removed ((,class (:foreground "white" :background "indianred4"))))
+   `(diff-refine-change ((,class (:background "skyblue4"))))
+   `(diff-removed ((,class (nil))))
+   `(dired-marked ((,class (:background "dodgerblue3" :foreground "white"))))
+   `(ediff-current-diff-A ((,class (:background "green4" :foreground "white"))))
+   `(ediff-current-diff-B ((,class (:background "darkorange3" :foreground "white"))))
+   `(ediff-even-diff-B ((,class (:background "Grey50" :foreground "White"))))
+   `(ediff-fine-diff-A ((,class (:background "skyblue4" :foreground "white"))))
+   `(ediff-fine-diff-B ((,class (:background "cyan4" :foreground "white"))))
+   `(ediff-odd-diff-A ((,class (:background "Grey50" :foreground "White"))))
+   `(error ((,class (:foreground "red"))))
+   `(flymake-errline ((,class (:background nil :underline "red"))))
+   `(flymake-warnline ((,class (:background nil :underline "magenta3"))))
+   `(font-lock-builtin-face ((,class (:foreground "LightCoral"))))
+   `(font-lock-comment-delimiter-face ((,class (:foreground "gray50"))))
+   `(font-lock-comment-face ((,class (:foreground "gray50"))))
+   `(font-lock-constant-face ((,class (:foreground "DarkOliveGreen3"))))
+   `(font-lock-doc-face ((,class (:foreground "moccasin"))))
+   `(font-lock-doc-string-face ((,class (:foreground "moccasin"))))
+   `(font-lock-function-name-face ((,class (:foreground "goldenrod"))))
+   `(font-lock-keyword-face ((,class (:foreground "DeepSkyBlue1"))))
+   `(font-lock-preprocessor-face ((,class (:foreground "gold"))))
+   `(font-lock-reference-face ((,class (:foreground "LightCoral"))))
+   `(font-lock-regexp-grouping-backslash ((,class (:weight bold))))
+   `(font-lock-regexp-grouping-construct ((,class (:weight bold))))
+   `(font-lock-string-face ((,class (:foreground "burlywood"))))
+   `(font-lock-type-face ((,class (:foreground "CadetBlue1"))))
+   `(font-lock-variable-name-face ((,class (:foreground "SeaGreen2"))))
+   `(fringe ((,class (:background "black"))))
+   `(highlight ((,class (:background "DodgerBlue4"))))
+   `(ido-first-match ((,class (:weight normal :foreground "orange"))))
+   `(ido-only-match ((,class (:foreground "green"))))
+   `(ido-subdir ((,class (:foreground nil :inherit font-lock-keyword-face))))
+   `(info-header-node ((,class (:foreground "DeepSkyBlue1"))))
+   `(info-header-xref ((,class (:foreground "SeaGreen2"))))
+   `(info-menu-header ((,class (:family "helv" :weight bold))))
+   `(info-node ((,class (:foreground "DeepSkyBlue1"))))
+   `(info-xref ((,class (:foreground "SeaGreen2"))))
+   `(isearch ((,class (:background "coral2" :foreground "white"))))
+   `(isearch-lazy-highlight-face ((,class (:background "coral4" :foreground "white"))))
+   `(lazy-highlight ((,class (:background "cadetblue" :foreground "white"))))
+   `(match ((,class (:background "DeepPink4"))))
+   `(minibuffer-prompt ((,class (:foreground "CadetBlue1"))))
+   `(mode-line ((,class (:background "gray75" :foreground "black" :box (:line-width 1 :style released-button)))))
+   `(mode-line-buffer-id ((,class (:weight bold :background nil :foreground "blue4"))))
+   `(mode-line-inactive ((,class (:background "gray40" :foreground "black" :box (:line-width 1 :color "gray40" :style nil)))))
+   `(outline-1 ((,class (:foreground "SkyBlue1"))))
+   `(outline-2 ((,class (:foreground "CadetBlue1"))))
+   `(outline-3 ((,class (:foreground "LightSteelBlue1"))))
+   `(outline-4 ((,class (:foreground "turquoise2"))))
+   `(outline-5 ((,class (:foreground "aquamarine1"))))
+   `(primary-selection ((,class (:background "blue3"))))
+   `(region ((,class (:background "#103050"))))
+   `(show-paren-match-face ((,class (:background "dodgerblue1" :foreground "white"))))
+   `(show-paren-mismatch-face ((,class (:background "red1" :foreground "white"))))
+   `(success ((,class (:foreground "SeaGreen2"))))
+   `(warning ((,class (:foreground "Yellow"))))))
+
+(provide-theme 'deeper-blue)
+
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
+
+;;; deeper-blue-theme.el ends here
diff --git a/etc/themes/whiteboard-theme.el b/etc/themes/whiteboard-theme.el
new file mode 100644
index 00000000000..e0fa7ff7ff7
--- /dev/null
+++ b/etc/themes/whiteboard-theme.el
@@ -0,0 +1,97 @@
+;;; whiteboard-theme.el --- Custom theme for faces
+
+;; Copyright (C) 2011 Free Software Foundation, Inc.
+
+;; Author: Scott Frazer <frazer.scott@gmail.com>
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Code:
+
+(deftheme whiteboard
+  "Face colors similar to markers on a whiteboard.")
+
+(let ((class '((class color) (min-colors 89))))
+  (custom-theme-set-faces
+   'whiteboard
+   `(Info-title-1-face ((,class (:family "helv" :weight bold :height 1.728))))
+   `(Info-title-2-face ((,class (:family "helv" :weight bold :height 1.44))))
+   `(Info-title-3-face ((,class (:family "helv" :weight bold :height 1.2))))
+   `(Info-title-4-face ((,class (:family "helv" :weight bold))))
+   `(compilation-column-number ((,class (:foreground "DarkGreen"))))
+   `(compilation-error ((,class (:foreground "Red1"))))
+   `(compilation-info ((,class (:weight normal :foreground "DeepSkyBlue4"))))
+   `(compilation-line-number ((,class (:foreground "DarkGreen"))))
+   `(cperl-array-face ((,class (:foreground "SlateBlue3"))))
+   `(cperl-hash-face ((,class (:foreground "turquoise3"))))
+   `(cperl-nonoverridable-face ((,class (:foreground "orchid3"))))
+   `(cursor ((,class (:background "Green4" :foreground "gainsboro"))))
+   `(default ((,class (:background "whitesmoke" :foreground "black"))))
+   `(dired-marked ((,class (:background "dodgerblue3" :foreground "white"))))
+   `(flymake-errline ((,class (:background nil :underline "red"))))
+   `(flymake-warnline ((,class (:background nil :underline "magenta3"))))
+   `(font-lock-builtin-face ((,class (:foreground "DarkOrange3"))))
+   `(font-lock-comment-delimiter-face ((,class (:foreground "gray50"))))
+   `(font-lock-comment-face ((,class (:foreground "gray50"))))
+   `(font-lock-constant-face ((,class (:foreground "DarkOliveGreen4"))))
+   `(font-lock-doc-face ((,class (:foreground "peru"))))
+   `(font-lock-doc-string-face ((,class (:foreground "peru"))))
+   `(font-lock-function-name-face ((,class (:foreground "goldenrod3"))))
+   `(font-lock-keyword-face ((,class (:foreground "DodgerBlue2"))))
+   `(font-lock-preprocessor-face ((,class (:foreground "gold3"))))
+   `(font-lock-reference-face ((,class (:foreground "salmon"))))
+   `(font-lock-regexp-grouping-backslash ((,class (:weight bold))))
+   `(font-lock-regexp-grouping-construct ((,class (:weight bold))))
+   `(font-lock-string-face ((,class (:foreground "burlywood4"))))
+   `(font-lock-type-face ((,class (:foreground "DeepSkyBlue4"))))
+   `(font-lock-variable-name-face ((,class (:foreground "SeaGreen4"))))
+   `(font-lock-warning-face ((,class (:foreground "red"))))
+   `(fringe ((,class (:background "gainsboro"))))
+   `(highlight ((,class (:background "SkyBlue1"))))
+   `(ido-first-match ((,class (:weight normal :foreground "DarkOrange3"))))
+   `(ido-only-match ((,class (:foreground "SeaGreen4"))))
+   `(ido-subdir ((,class (:foreground nil :inherit font-lock-keyword-face))))
+   `(info-header-node ((,class (:foreground "DeepSkyBlue1"))))
+   `(info-header-xref ((,class (:foreground "SeaGreen2"))))
+   `(info-menu-header ((,class (:family "helv" :weight bold))))
+   `(info-node ((,class (:foreground "DeepSkyBlue1"))))
+   `(info-xref ((,class (:foreground "SeaGreen4"))))
+   `(isearch ((,class (:background "coral2" :foreground "white"))))
+   `(isearch-lazy-highlight-face ((,class (:background "coral4" :foreground "white"))))
+   `(lazy-highlight ((,class (:background "cadetblue" :foreground "white"))))
+   `(match ((,class (:background "LightPink1"))))
+   `(minibuffer-prompt ((,class (:foreground "DodgerBlue4"))))
+   `(mode-line ((,class (:background "gray75" :foreground "black" :box (:line-width 1 :style released-button)))))
+   `(mode-line-buffer-id ((,class (:weight bold :background nil :foreground "blue4"))))
+   `(mode-line-inactive ((,class (:background "gray40" :foreground "black" :box (:line-width 1 :color "gray40" :style nil)))))
+   `(outline-1 ((,class (:foreground "Blue3"))))
+   `(outline-2 ((,class (:foreground "DodgerBlue"))))
+   `(outline-3 ((,class (:foreground "SteelBlue"))))
+   `(outline-4 ((,class (:foreground "RoyalBlue"))))
+   `(outline-5 ((,class (:foreground "DeepSkyBlue"))))
+   `(primary-selection ((,class (:background "blue3"))))
+   `(region ((,class (:background "SkyBlue1"))))
+   `(show-paren-match-face ((,class (:background "dodgerblue1" :foreground "white"))))
+   `(show-paren-mismatch-face ((,class (:background "red1" :foreground "white"))))
+   `(warning ((,class (:foreground "Yellow4"))))))
+
+(provide-theme 'whiteboard)
+
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
+
+;;; whiteboard-theme.el ends here
diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c
index a997e56cc9f..7395f2c8fdd 100644
--- a/lib-src/ebrowse.c
+++ b/lib-src/ebrowse.c
@@ -45,16 +45,16 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* The character used as a separator in path lists (like $PATH).  */
 
-#if defined(__MSDOS__)
+#if defined (__MSDOS__)
 #define PATH_LIST_SEPARATOR ';'
-#define FILENAME_EQ(X,Y)    (strcasecmp(X,Y) == 0)
+#define FILENAME_EQ(X,Y)    (strcasecmp (X,Y) == 0)
 #else
-#if defined(WINDOWSNT)
+#if defined (WINDOWSNT)
 #define PATH_LIST_SEPARATOR ';'
-#define FILENAME_EQ(X,Y)    (stricmp(X,Y) == 0)
+#define FILENAME_EQ(X,Y)    (stricmp (X,Y) == 0)
 #else
 #define PATH_LIST_SEPARATOR ':'
-#define FILENAME_EQ(X,Y)    (streq(X,Y))
+#define FILENAME_EQ(X,Y)    (streq (X,Y))
 #endif
 #endif
 /* The default output file name.  */
@@ -2511,7 +2511,7 @@ member (struct sym *cls, int vis)
 
           /* A function or class may follow.  */
         case TEMPLATE:
-          MATCH();
+          MATCH ();
           SET_FLAG (flags, F_TEMPLATE);
           /* Skip over template argument list */
           SKIP_MATCHING_IF ('<');
@@ -2930,7 +2930,7 @@ parse_qualified_ident_or_type (char **last_id)
     }
 
   while (enter--)
-    leave_namespace();
+    leave_namespace ();
 
   return cls;
 }
diff --git a/lib-src/etags.c b/lib-src/etags.c
index ac5ebee9b07..cdcc6461a64 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -103,7 +103,7 @@ char pot_etags_version[] = "@(#) pot revision number is 17.38.1.4";
 #   define PTR void *
 # endif
 #else  /* no config.h */
-# if defined(__STDC__) && (__STDC__ || defined(__SUNPRO_C))
+# if defined (__STDC__) && (__STDC__ || defined (__SUNPRO_C))
 #   define PTR void *           /* for generic pointers */
 # else /* not standard C */
 #   define const                /* remove const for old compilers' sake */
@@ -202,25 +202,25 @@ If you want regular expression support, you should delete this notice and
 # define CTAGS FALSE
 #endif
 
-#define streq(s,t)      (assert((s)!=NULL || (t)!=NULL), !strcmp (s, t))
-#define strcaseeq(s,t)  (assert((s)!=NULL && (t)!=NULL), !etags_strcasecmp (s, t))
-#define strneq(s,t,n)   (assert((s)!=NULL || (t)!=NULL), !strncmp (s, t, n))
-#define strncaseeq(s,t,n) (assert((s)!=NULL && (t)!=NULL), !etags_strncasecmp (s, t, n))
+#define streq(s,t)      (assert ((s)!=NULL || (t)!=NULL), !strcmp (s, t))
+#define strcaseeq(s,t)  (assert ((s)!=NULL && (t)!=NULL), !etags_strcasecmp (s, t))
+#define strneq(s,t,n)   (assert ((s)!=NULL || (t)!=NULL), !strncmp (s, t, n))
+#define strncaseeq(s,t,n) (assert ((s)!=NULL && (t)!=NULL), !etags_strncasecmp (s, t, n))
 
 #define CHARS 256               /* 2^sizeof(char) */
 #define CHAR(x)         ((unsigned int)(x) & (CHARS - 1))
-#define iswhite(c)      (_wht[CHAR(c)]) /* c is white (see white) */
-#define notinname(c)    (_nin[CHAR(c)]) /* c is not in a name (see nonam) */
-#define begtoken(c)     (_btk[CHAR(c)]) /* c can start token (see begtk) */
-#define intoken(c)      (_itk[CHAR(c)]) /* c can be in token (see midtk) */
-#define endtoken(c)     (_etk[CHAR(c)]) /* c ends tokens (see endtk) */
+#define iswhite(c)      (_wht[CHAR (c)]) /* c is white (see white) */
+#define notinname(c)    (_nin[CHAR (c)]) /* c is not in a name (see nonam) */
+#define begtoken(c)     (_btk[CHAR (c)]) /* c can start token (see begtk) */
+#define intoken(c)      (_itk[CHAR (c)]) /* c can be in token (see midtk) */
+#define endtoken(c)     (_etk[CHAR (c)]) /* c ends tokens (see endtk) */
 
-#define ISALNUM(c)      isalnum (CHAR(c))
-#define ISALPHA(c)      isalpha (CHAR(c))
-#define ISDIGIT(c)      isdigit (CHAR(c))
-#define ISLOWER(c)      islower (CHAR(c))
+#define ISALNUM(c)      isalnum (CHAR (c))
+#define ISALPHA(c)      isalpha (CHAR (c))
+#define ISDIGIT(c)      isdigit (CHAR (c))
+#define ISLOWER(c)      islower (CHAR (c))
 
-#define lowcase(c)      tolower (CHAR(c))
+#define lowcase(c)      tolower (CHAR (c))
 
 
 /*
@@ -1725,16 +1725,16 @@ init (void)
   register int i;
 
   for (i = 0; i < CHARS; i++)
-    iswhite(i) = notinname(i) = begtoken(i) = intoken(i) = endtoken(i) = FALSE;
+    iswhite (i) = notinname (i) = begtoken (i) = intoken (i) = endtoken (i) = FALSE;
   for (sp = white; *sp != '\0'; sp++) iswhite (*sp) = TRUE;
   for (sp = nonam; *sp != '\0'; sp++) notinname (*sp) = TRUE;
-  notinname('\0') = notinname('\n');
+  notinname ('\0') = notinname ('\n');
   for (sp = begtk; *sp != '\0'; sp++) begtoken (*sp) = TRUE;
-  begtoken('\0') = begtoken('\n');
+  begtoken ('\0') = begtoken ('\n');
   for (sp = midtk; *sp != '\0'; sp++) intoken (*sp) = TRUE;
-  intoken('\0') = intoken('\n');
+  intoken ('\0') = intoken ('\n');
   for (sp = endtk; *sp != '\0'; sp++) endtoken (*sp) = TRUE;
-  endtoken('\0') = endtoken('\n');
+  endtoken ('\0') = endtoken ('\n');
 }
 
 /*
@@ -3959,16 +3959,16 @@ Yacc_entries (FILE *inf)
       )
 
 #define LOOKING_AT(cp, kw)  /* kw is the keyword, a literal string */   \
-  ((assert("" kw), TRUE)   /* syntax error if not a literal string */   \
-   && strneq ((cp), kw, sizeof(kw)-1)           /* cp points at kw */   \
-   && notinname ((cp)[sizeof(kw)-1])            /* end of kw */         \
-   && ((cp) = skip_spaces((cp)+sizeof(kw)-1)))  /* skip spaces */
+  ((assert ("" kw), TRUE)   /* syntax error if not a literal string */  \
+   && strneq ((cp), kw, sizeof (kw)-1)          /* cp points at kw */   \
+   && notinname ((cp)[sizeof (kw)-1])           /* end of kw */         \
+   && ((cp) = skip_spaces ((cp)+sizeof (kw)-1))) /* skip spaces */
 
 /* Similar to LOOKING_AT but does not use notinname, does not skip */
 #define LOOKING_AT_NOCASE(cp, kw) /* the keyword is a literal string */ \
-  ((assert("" kw), TRUE)     /* syntax error if not a literal string */ \
-   && strncaseeq ((cp), kw, sizeof(kw)-1)       /* cp points at kw */   \
-   && ((cp) += sizeof(kw)-1))                   /* skip spaces */
+  ((assert ("" kw), TRUE) /* syntax error if not a literal string */    \
+   && strncaseeq ((cp), kw, sizeof (kw)-1)      /* cp points at kw */   \
+   && ((cp) += sizeof (kw)-1))                  /* skip spaces */
 
 /*
  * Read a file, but do no processing.  This is used to do regexp
@@ -4141,7 +4141,7 @@ Ada_getit (FILE *inf, const char *name_qualifier)
           readline (&lb, inf);
           dbp = lb.buffer;
         }
-      switch (lowcase(*dbp))
+      switch (lowcase (*dbp))
         {
         case 'b':
           if (nocase_tail ("body"))
@@ -4245,7 +4245,7 @@ Ada_funcs (FILE *inf)
             }
 
           /* We are at the beginning of a token. */
-          switch (lowcase(*dbp))
+          switch (lowcase (*dbp))
             {
             case 'f':
               if (!packages_only && nocase_tail ("function"))
@@ -4371,7 +4371,7 @@ Perl_functions (FILE *inf)
               *cp = '\0';
               name = concat (package, "::", sp);
               *cp = savechar;
-              make_tag (name, strlen(name), TRUE,
+              make_tag (name, strlen (name), TRUE,
                         lb.buffer, cp - lb.buffer + 1, lineno, linecharno);
               free (name);
             }
@@ -4466,9 +4466,9 @@ PHP_functions (FILE *inf)
         }
       else if (LOOKING_AT (cp, "function"))
         {
-          if(*cp == '&')
+          if (*cp == '&')
             cp = skip_spaces (cp+1);
-          if(*cp != '\0')
+          if (*cp != '\0')
             {
               name = cp;
               while (!notinname (*cp))
@@ -4509,7 +4509,7 @@ PHP_functions (FILE *inf)
                && *cp == '$')
         {
           name = cp;
-          while (!notinname(*cp))
+          while (!notinname (*cp))
             cp++;
           make_tag (name, cp - name, FALSE,
                     lb.buffer, cp - lb.buffer + 1, lineno, linecharno);
@@ -4890,13 +4890,13 @@ Forth_words (FILE *inf)
 
   LOOP_ON_INPUT_LINES (inf, lb, bp)
     while ((bp = skip_spaces (bp))[0] != '\0')
-      if (bp[0] == '\\' && iswhite(bp[1]))
+      if (bp[0] == '\\' && iswhite (bp[1]))
         break;                  /* read next line */
-      else if (bp[0] == '(' && iswhite(bp[1]))
+      else if (bp[0] == '(' && iswhite (bp[1]))
         do                      /* skip to ) or eol */
           bp++;
         while (*bp != ')' && *bp != '\0');
-      else if ((bp[0] == ':' && iswhite(bp[1]) && bp++)
+      else if ((bp[0] == ':' && iswhite (bp[1]) && bp++)
                || LOOKING_AT_NOCASE (bp, "constant")
                || LOOKING_AT_NOCASE (bp, "code")
                || LOOKING_AT_NOCASE (bp, "create")
@@ -5285,7 +5285,7 @@ Prolog_functions (FILE *inf)
           /* Predicate or rule.  Store the function name so that we
              only generate a tag for the first clause.  */
           if (last == NULL)
-            last = xnew(len + 1, char);
+            last = xnew (len + 1, char);
           else if (len + 1 > allocated)
             xrnew (last, len + 1, char);
           allocated = len + 1;
@@ -5309,7 +5309,7 @@ prolog_skip_comment (linebuffer *plb, FILE *inf)
           return;
       readline (plb, inf);
     }
-  while (!feof(inf));
+  while (!feof (inf));
 }
 
 /*
@@ -5368,11 +5368,11 @@ prolog_atom (char *s, size_t pos)
 
   origpos = pos;
 
-  if (ISLOWER(s[pos]) || (s[pos] == '_'))
+  if (ISLOWER (s[pos]) || (s[pos] == '_'))
     {
       /* The atom is unquoted. */
       pos++;
-      while (ISALNUM(s[pos]) || (s[pos] == '_'))
+      while (ISALNUM (s[pos]) || (s[pos] == '_'))
         {
           pos++;
         }
@@ -5715,7 +5715,7 @@ add_regex (char *regexp_pattern, language *lang)
     single_line = FALSE;        /* dot does not match newline */
 
 
-  if (strlen(regexp_pattern) < 3)
+  if (strlen (regexp_pattern) < 3)
     {
       error ("null regexp", (char *)NULL);
       return;
@@ -6626,7 +6626,7 @@ filename_is_absolute (char *fn)
 {
   return (fn[0] == '/'
 #ifdef DOS_NT
-          || (ISALPHA(fn[0]) && fn[1] == ':' && fn[2] == '/')
+          || (ISALPHA (fn[0]) && fn[1] == ':' && fn[2] == '/')
 #endif
           );
 }
@@ -6641,7 +6641,7 @@ canonicalize_filename (register char *fn)
 
 #ifdef DOS_NT
   /* Canonicalize drive letter case.  */
-# define ISUPPER(c)     isupper (CHAR(c))
+# define ISUPPER(c)     isupper (CHAR (c))
   if (fn[0] != '\0' && fn[1] == ':' && ISUPPER (fn[0]))
     fn[0] = lowcase (fn[0]);
 
diff --git a/lib-src/hexl.c b/lib-src/hexl.c
index 89ea7d9f60c..f03663ef5be 100644
--- a/lib-src/hexl.c
+++ b/lib-src/hexl.c
@@ -48,7 +48,7 @@ int base = DEFAULT_BASE, un_flag = FALSE, iso_flag = FALSE, endian = 1;
 int group_by = DEFAULT_GROUPING;
 char *progname;
 
-void usage(void) NO_RETURN;
+void usage (void) NO_RETURN;
 
 int
 main (int argc, char **argv)
diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index 097bf23c202..b6ea51f6341 100644
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -183,8 +183,8 @@ main (int argc, char **argv)
 # define ARGSTR "p"
 #endif /* MAIL_USE_POP */
 
-  uid_t real_gid = getgid();
-  uid_t priv_gid = getegid();
+  uid_t real_gid = getgid ();
+  uid_t priv_gid = getegid ();
 
 #ifdef WINDOWSNT
   /* Ensure all file i/o is in binary mode. */
diff --git a/lib-src/pop.c b/lib-src/pop.c
index a94e06fbd87..ae1000742cc 100644
--- a/lib-src/pop.c
+++ b/lib-src/pop.c
@@ -34,15 +34,15 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "ntlib.h"
 #include <winsock.h>
 #undef SOCKET_ERROR
-#define RECV(s,buf,len,flags) recv(s,buf,len,flags)
-#define SEND(s,buf,len,flags) send(s,buf,len,flags)
-#define CLOSESOCKET(s) closesocket(s)
+#define RECV(s,buf,len,flags) recv (s,buf,len,flags)
+#define SEND(s,buf,len,flags) send (s,buf,len,flags)
+#define CLOSESOCKET(s) closesocket (s)
 #else
 #include <netinet/in.h>
 #include <sys/socket.h>
-#define RECV(s,buf,len,flags) read(s,buf,len)
-#define SEND(s,buf,len,flags) write(s,buf,len)
-#define CLOSESOCKET(s) close(s)
+#define RECV(s,buf,len,flags) read (s,buf,len)
+#define SEND(s,buf,len,flags) write (s,buf,len)
+#define CLOSESOCKET(s) close (s)
 #endif
 #include <pop.h>
 
@@ -101,7 +101,7 @@ extern char *krb_realmofhost (/* char * */);
 #endif /* KERBEROS */
 
 #ifndef WINDOWSNT
-#if !defined(HAVE_H_ERRNO) || !defined(HAVE_CONFIG_H)
+#if !defined (HAVE_H_ERRNO) || !defined (HAVE_CONFIG_H)
 extern int h_errno;
 #endif
 #endif
@@ -1067,7 +1067,7 @@ socket_connection (char *host, int flags)
     }
 
 #ifdef HAVE_GETADDRINFO
-  memset (&hints, 0, sizeof(hints));
+  memset (&hints, 0, sizeof (hints));
   hints.ai_socktype = SOCK_STREAM;
   hints.ai_flags = AI_CANONNAME;
   hints.ai_family = AF_INET;
@@ -1159,7 +1159,7 @@ socket_connection (char *host, int flags)
             krb5_free_context (kcontext);
           strcpy (pop_error, KRB_ERROR);
           strncat (pop_error, error_message (rem),
-                   ERROR_MAX - sizeof(KRB_ERROR));
+                   ERROR_MAX - sizeof (KRB_ERROR));
           CLOSESOCKET (sock);
           return (-1);
         }
@@ -1212,7 +1212,7 @@ socket_connection (char *host, int flags)
                        ERROR_MAX - strlen (pop_error) - 1);
             }
 #elif defined HAVE_KRB5_ERROR_E_TEXT
-          if (err_ret && err_ret->e_text && strlen(*err_ret->e_text))
+          if (err_ret && err_ret->e_text && strlen (*err_ret->e_text))
             {
               strncat (pop_error, " [server says '",
                        ERROR_MAX - strlen (pop_error) - 1);
diff --git a/lib/lstat.c b/lib/lstat.c
index 29fc6d25f90..d786288f2b7 100644
--- a/lib/lstat.c
+++ b/lib/lstat.c
@@ -42,7 +42,10 @@ orig_lstat (const char *filename, struct stat *buf)
 }
 
 /* Specification.  */
-# include <sys/stat.h>
+/* Write "sys/stat.h" here, not <sys/stat.h>, otherwise OSF/1 5.1 DTK cc
+   eliminates this include because of the preliminary #include <sys/stat.h>
+   above.  */
+# include "sys/stat.h"
 
 # include <string.h>
 # include <errno.h>
diff --git a/lib/stat.c b/lib/stat.c
index 6c354d1d357..1002f161bfa 100644
--- a/lib/stat.c
+++ b/lib/stat.c
@@ -34,7 +34,10 @@ orig_stat (const char *filename, struct stat *buf)
 }
 
 /* Specification.  */
-#include <sys/stat.h>
+/* Write "sys/stat.h" here, not <sys/stat.h>, otherwise OSF/1 5.1 DTK cc
+   eliminates this include because of the preliminary #include <sys/stat.h>
+   above.  */
+#include "sys/stat.h"
 
 #include <errno.h>
 #include <limits.h>
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6d64950d64b..53ef2a1bbcd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,273 @@
+2011-09-13  Glenn Morris  <rgm@gnu.org>
+
+        * emacs-lisp/debug.el (debugger-make-xrefs):
+        Preserve point.  (Bug#9462)
+
+2011-09-13  Chong Yidong  <cyd@stupidchicken.com>
+
+        * window.el (window-deletable-p): Use next-frame.
+
+2011-09-13  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (window-auto-delete): Remove.
+        (window-deletable-p): Remove argument FORCE.  Don't deal with
+        dedicatedness and previous buffers.
+        (switch-to-prev-buffer): Don't delete window.
+        (delete-windows-on): Delete a window's frame if and only if the
+        window is dedicated.
+        (replace-buffer-in-windows): Delete buffer's window or frame if
+        and only if window is dedicated.
+        (quit-window): Handle quit-restore as before last change.
+        (bury-buffer): Delete window only if window-deletable-p returns t.
+
+2011-09-13  Chong Yidong  <cyd@stupidchicken.com>
+
+        * window.el (window-deletable-p): Never delete the last frame on a
+        given terminal.
+
+2011-09-13  Glenn Morris  <rgm@gnu.org>
+
+        * help.el (describe-key-briefly): Copy previous standard-output change.
+
+2011-09-13  PJ Weisberg  <pj@irregularexpressions.net>  (tiny change)
+
+        * help.el (where-is): Respect non-standard standard-output.  (Bug#9030)
+
+2011-09-13  Glenn Morris  <rgm@gnu.org>
+
+        * emacs-lisp/lisp-mode.el (lisp-indent-function):
+        * progmodes/scheme.el (scheme-indent-function): Doc fixes.
+
+2011-09-12  Chong Yidong  <cyd@stupidchicken.com>
+
+        * dired-aux.el (dired-mark-read-string): Don't return default
+        value on empty input (Bug#9361).
+        (dired-do-chxxx): Treat empty input for "touch" as no -t option.
+        Omit initial minibuffer contents.
+        (dired-do-chmod): Signal an error on empty input.
+        (dired-mark-read-string): Don't return default on empty input.
+
+        * files.el (file-modes-symbolic-to-number): Doc fix.
+
+2011-09-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * international/mule-cmds.el (ucs-completions): Remove.
+        (read-char-by-name): Use complete-with-action instead; add metadata.
+
+2011-09-11  Chong Yidong  <cyd@stupidchicken.com>
+
+        * window.el (display-buffer--action-function-custom-type)
+        (display-buffer--action-custom-type): New vars.
+        (display-buffer-alist, display-buffer-default-action)
+        (display-buffer-overriding-action): Add defcustom types.
+
+        * frame.el (delete-other-frames): Doc fix (Bug#276).
+
+2011-09-11  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * play/doctor.el (make-doctor-variables): Define `doctor-sent'.
+
+2011-09-11  Chong Yidong  <cyd@stupidchicken.com>
+
+        Change modes that used same-window-* vars to use switch-to-buffer.
+
+        * progmodes/gdb-mi.el (gdb-restore-windows, gdb-setup-windows):
+        Use switch-to-buffer.
+
+        * cus-edit.el (customize-group, custom-buffer-create)
+        (customize-browse, custom-buffer-create-other-window):
+        Use switch-to-buffer or switch-to-buffer-other-window.
+
+        * info.el (info, Info-find-node, Info-revert-find-node, Info-next)
+        (Info-prev, Info-up, Info-speedbar-goto-node)
+        (info-display-manual): Use switch-to-buffer.
+        (Info-speedbar-goto-node): Use switch-to-buffer-other-frame.
+
+        * mail/sendmail.el (mail): Use switch-to-buffer.
+        (mail-recover): Use switch-to-buffer-other-window.
+
+        * cmuscheme.el (run-scheme, switch-to-scheme):
+        * ielm.el (ielm):
+        * shell.el (shell):
+        * net/rlogin.el (rlogin):
+        * net/telnet.el (telnet, rsh):
+        * progmodes/inf-lisp.el (inferior-lisp): Use switch-to-buffer.
+
+2011-09-11  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * dired.el (dired-sort-toggle-or-edit): Revert last changes.
+
+2011-09-11  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * dired.el (dired-sort-toggle-or-edit): -o doesn't exist on *BSD,
+        so don't mention it (bug#9301).
+        (dired-sort-toggle-or-edit): Clarify string further.
+
+        * faces.el (face-spec-set-match-display): Make `(type graphic)'
+        match `x', `w32' and `ns', like the manual says (bug#9029).
+
+        * subr.el (eval-after-load): Doc string clarification (bug#9125).
+        (process-kill-buffer-query-function): Mention the buffer name in
+        the query.
+
+        * image-mode.el (image-next-line): The line parameter is mandatory
+        (bug#9258).
+
+        * dired.el (dired-sort-toggle-or-edit): Mention -o and -g, too,
+        which can be useful (bug#9301).
+
+        * textmodes/flyspell.el: Remove obsolete comment (bug#9368).
+
+        * subr.el (match-string): Mention that the current buffer should
+        be the same as the search was done in (bug#9282).
+
+        * facemenu.el: Disable the remove-* commands if the mark isn't
+        active (bug#9162).
+
+2011-09-10  Chong Yidong  <cyd@stupidchicken.com>
+
+        * buff-menu.el (Buffer-menu-switch-other-window): Use second arg
+        of display-buffer.
+        (Buffer-menu-2-window): Use switch-to-buffer-other-window.
+
+        * replace.el (occur-mode-goto-occurrence)
+        (occur-mode-display-occurrence) Use second arg of pop-to-buffer
+        and display-buffer.
+
+        * mail/reporter.el (reporter-submit-bug-report): Use second arg of
+        display-buffer.
+
+        * mail/sendmail.el (sendmail-user-agent-compose): Don't bind the
+        special-display and same-window variables.
+        (mail-other-window): Use switch-to-buffer-other-window.
+        (mail-other-frame): USe switch-to-buffer-other-frame.
+
+        * progmodes/gdb-mi.el (gdb-frame-gdb-buffer):
+        Use display-buffer-other-frame.
+        (gdb-display-gdb-buffer): Use pop-to-buffer.
+
+        * progmodes/gud.el (gud-goto-info): Use info-other-window.
+
+        * progmodes/python.el: Don't set same-window-buffer-names.
+
+        * textmodes/bibtex.el (bibtex-search-entry): Use switch-to-buffer.
+
+        * window.el (display-buffer-alist): Add *Python*.
+
+2011-09-10  Chong Yidong  <cyd@stupidchicken.com>
+
+        * window.el (display-buffer-alist): Add entry for buffers
+        previously handled same-window-*.
+        (display-buffer-alist, display-buffer-default-action)
+        (display-buffer-overriding-action): Mark as risky.
+        (display-buffer-alist): Document action function changes.
+        (display-buffer--same-window-action)
+        (display-buffer--other-frame-action): New variables.
+        (switch-to-buffer, display-buffer-other-frame): Use them.
+        (display-buffer): Rename reuse-frame entry to reusable-frames.
+        (display-buffer-reuse-selected-window): Function deleted.
+        (display-buffer-reuse-window): Handle reusable-frames alist entry.
+        If it's omitted, check pop-up-frames/display-buffer-reuse-frames.
+        (display-buffer-special): New function.
+        (display-buffer--maybe-pop-up-frame-or-window): Rename from
+        display-buffer-reuse-or-pop-window.  Split off special-display
+        part into display-buffer-special.
+        (display-buffer-use-some-window): Don't perform any special
+        pop-up-frames handling.
+        (pop-to-buffer): Use window-normalize-buffer-to-switch-to.
+        (display-buffer--maybe-same-window): Rename from
+        display-buffer-maybe-same-window.
+
+        * info.el: Don't set same-window-regexps.
+        (info-setup): New function.
+        (info-other-window, info): Call it.
+
+        * cus-edit.el: Don't set same-window-regexps.
+        (customize-group): New argument.
+        (customize-group-other-window): Use it.
+        (customize-face, customize-face-other-window): Likewise.
+        (custom-buffer-create-other-window): Use pop-to-buffer directly.
+
+        * net/rlogin.el:
+        * net/telnet.el:
+        * progmodes/gud.el: Don't set same-window-regexps.
+
+        * cmuscheme.el:
+        * ielm.el:
+        * shell.el:
+        * mail/sendmail.el:
+        * progmodes/inf-lisp.el: Don't set same-window-buffer-names.
+
+2011-09-10  Juri Linkov  <juri@jurta.org>
+
+        * isearch.el (isearch-edit-string): Remove obsolete mention of
+        `C-w' (`isearch-yank-word-or-char') from docstring.
+        (isearch-query-replace): Fix typo in docstring (bug#9466).
+
+2011-09-10  Juri Linkov  <juri@jurta.org>
+
+        * paren.el (show-paren-function): Don't show escaped parens.
+        Let-bind `unescaped' to `t' when paren is not escaped.  (Bug#9461)
+
+2011-09-10  Eli Zaretskii  <eliz@gnu.org>
+
+        * mail/sendmail.el (mml-to-mime, mml-attach-file)
+        (mm-default-file-encoding): Remove autoload forms, they are
+        replaced with autoload cookies in mml.el and mm-encode.el.
+        (mail-add-attachment): New command.
+        (mail-mode-map): Add a menu-bar item for mail-add-attachment.
+        (mail-mode): Mention mail-insert-file and mail-add-attachment in
+        the doc string.
+        (mml-to-mime, mml-attach-file, mm-default-file-encoding): Declare.
+
+2011-09-10  Reuben Thomas  <rrt@sc3d.org>
+
+        * simple.el (count-words-region): Use buffer if there's no region.
+
+2011-09-09  Juri Linkov  <juri@jurta.org>
+
+        * wdired.el (wdired-change-to-wdired-mode): Set buffer-local
+        `isearch-filter-predicate' to `wdired-isearch-filter-read-only'.
+        (wdired-isearch-filter-read-only): New function.  (Bug#6362)
+
+2011-09-09  Alan Mackenzie  <acm@muc.de>
+
+        * progmodes/cc-mode.el (awk-mode): Prevent `define-derived-mode'
+        spuriously generating `awk-mode-syntax-table'.  (Bug #9448).
+
+2011-09-09  Eli Zaretskii  <eliz@gnu.org>
+
+        Fix for Savannah bug#9392.
+        * simple.el (mail-encode-mml): New defvar.
+
+        * mail/rmail.el (mail-encode-mml): Add a defvar.
+        (rmail-enable-mime-composing): Default to t.
+        (rmail-forward): Use MIME method of forwarding only if both
+        rmail-enable-mime-composing and rmail-enable-mime are non-nil.
+        Set mail-encode-mml non-nil if the MIME method was used.
+
+        * mail/sendmail.el (mml-to-mime): Add autoload form.
+        (mail-encode-mml): Add a defvar.
+        (mail-mode): Make mail-encode-mml buffer-local and initialize it
+        to nil.
+        (mail-send): If mail-encode-mml is non-nil, run the outgoing
+        message through mml-to-mime, and reset mail-encode-mml to nil.
+
+2011-09-09  Glenn Morris  <rgm@gnu.org>
+
+        * woman.el (woman-if-body): When processing an .el block,
+        do not delete the next .el block as well.  (Bug#9447)
+        (woman-special-characters): Add oq, cq, and hy characters.
+
+2011-09-08  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (window-deletable-p): Make sure window is live before
+        invoking window-prev-buffers.
+
+2011-09-08  Leo Liu  <sdl.web@gmail.com>
+
+        * net/rcirc.el (rcirc-cmd-invite): New rcirc command.  (Bug#9453)
+
 2011-09-08  Juri Linkov  <juri@jurta.org>
 
         * progmodes/compile.el (compilation-environment): Make it
@@ -8,11 +278,11 @@
         * window.el (frame-auto-delete): Rename to window-auto-delete.
         Make it control auto-deletion of windows and/or frames.
         (window-deletable-p): New argument FORCE.  Rewrite conditions
-        for deleting window/frame. (Bug#9419)
+        for deleting window/frame.  (Bug#9419)
         (switch-to-prev-buffer, replace-buffer-in-windows, quit-window):
         Rewrite handling of case when window/frame can be deleted.
         (delete-windows-on): Call window-deletable-p with new FORCE
-        argument t. (Bug#9456)
+        argument t.  (Bug#9456)
 
 2011-09-07  Chong Yidong  <cyd@stupidchicken.com>
 
@@ -103,7 +373,7 @@
 
 2011-09-03  Chong Yidong  <cyd@stupidchicken.com>
 
-        * mail/sendmail.el (sendmail-query-once-function): Deleted.
+        * mail/sendmail.el (sendmail-query-once-function): Delete.
         (sendmail-query-once): Save directly to send-mail-function.
         Update message-send-mail-function too.
 
@@ -115,7 +385,7 @@
         start python interpreter from menu-bar (as reported by Geert
         Kloosterman).
         (inferior-python-mode-map): Fix typo.
-        (python-shell-map): Removed.
+        (python-shell-map): Remove.
 
 2011-09-03  Deniz Dogan  <deniz@dogan.se>
 
@@ -132,8 +402,8 @@
         * window.el (window-deletable-p): Don't return a non-nil value
         when there's a buffer that was shown in the window before.
         (Bug#9419)
-        (display-buffer-pop-up-frame, display-buffer-pop-up-window): Set
-        window's previous buffers to nil.
+        (display-buffer-pop-up-frame, display-buffer-pop-up-window):
+        Set window's previous buffers to nil.
 
 2011-09-03  Eli Zaretskii  <eliz@gnu.org>
 
@@ -147,7 +417,7 @@
 
 2011-09-02  Chong Yidong  <cyd@stupidchicken.com>
 
-        * window.el (pop-to-buffer-1, pop-to-buffer-same-window): Deleted.
+        * window.el (pop-to-buffer-1, pop-to-buffer-same-window): Delete.
         (pop-to-buffer): Change interactive spec.  Pass second argument
         directly to display-buffer.
         (display-buffer): Fix interactive spec.  Use functionp to
@@ -174,7 +444,7 @@
         (display-buffer-reuse-or-pop-window)
         (display-buffer-use-some-window): New functions.
         (display-buffer-default-action): Use them.
-        (display-buffer-default): Deleted.
+        (display-buffer-default): Delete.
         (pop-to-buffer-1): Fix choice of actions.
 
 2011-09-02  Stefan Monnier  <monnier@iro.umontreal.ca>
@@ -304,7 +574,7 @@
 2011-08-28  Christoph Scholtes  <cschol2112@googlemail.com>
 
         * help-mode.el (help-mode-map): Add special-mode-map to parent.
-        (help-mode): Derive help-mode from special-mode. Don't invoke
+        (help-mode): Derive help-mode from special-mode.  Don't invoke
         view-mode from help-mode.
         (help-xref-override-view-map): Remove.
         (help-make-xrefs): Remove minor-mode-overriding-map-alist since
@@ -577,14 +847,14 @@
 
         Resolve invalid use of a regexp in regexp-opt.
 
-        * cc-fonts.el (c-complex-decl-matchers): Add in special detection
-        for a java annotation.
+        * progmodes/cc-fonts.el (c-complex-decl-matchers): Add in special
+        detection for a java annotation.
 
-        * cc-engine.el (c-forward-decl-or-cast-1): Add in special
+        * progmodes/cc-engine.el (c-forward-decl-or-cast-1): Add in special
         detection for a java annotation.
 
-        * cc-langs.el (c-prefix-spec-kwds-re): Remove the special handling
-        for java.
+        * progmodes/cc-langs.el (c-prefix-spec-kwds-re): Remove the special
+        handling for java.
         (c-modifier-kwds): Remove the regexp "@[A-za-z0-9]+".
 
 2011-08-20  Chong Yidong  <cyd@stupidchicken.com>
@@ -620,7 +890,7 @@
 2011-08-19  Glenn Morris  <rgm@gnu.org>
 
         * files.el (hack-local-variables-prop-line, hack-local-variables):
-        Downcase "Mode:". (Bug#9331)
+        Downcase "Mode:".  (Bug#9331)
 
 2011-08-18  Chong Yidong  <cyd@stupidchicken.com>
 
@@ -676,7 +946,7 @@
         (epa-mail-expand-recipients-2, epa-mail-expand-recipients):
         Remove.
 
-2011-08-16  Feng Li <fengli@gmail.com> (tiny change)
+2011-08-16  Feng Li  <fengli@gmail.com>  (tiny change)
 
         * calc/calc-ext.el (math-defintegral-2): Remove nested backquote.
 
@@ -962,7 +1232,7 @@
         * progmodes/cc-mode.el: Remove two autoload forms which loaded
         cc-langs.
 
-        * /progmodes/cc-langs.el (c-make-init-lang-vars-fun): Don't emit
+        * progmodes/cc-langs.el (c-make-init-lang-vars-fun): Don't emit
         "(require 'cc-langs)".  Quote a form so it will evaluate at
         (cc-mode's) compilation time.
 
@@ -3626,7 +3896,7 @@
 
 2011-05-31  Helmut Eller  <eller.helmut@gmail.com>
 
-        * debug.el (debug): Restore the previous content of the
+        * emacs-lisp/debug.el (debug): Restore the previous content of the
         *Backtrace* buffer when we exit with C-M-c.
 
 2011-05-31  Stefan Monnier  <monnier@iro.umontreal.ca>
@@ -4275,7 +4545,8 @@
 2011-05-13  Didier Verna  <didier@xemacs.org>
 
         Common Lisp indentation improvements on defmethod and lambda-lists.
-        * cl-indent.el: Advertise the changes and remove obsolete TODO entries.
+        * emacs-lisp/cl-indent.el: Advertise the changes and remove obsolete
+        TODO entries.
         (lisp-lambda-list-keyword-parameter-indentation)
         (lisp-lambda-list-keyword-parameter-alignment)
         (lisp-lambda-list-keyword-alignment): New customizable user options.
@@ -4325,7 +4596,7 @@
 
 2011-05-12  Eli Zaretskii  <eliz@gnu.org>
 
-        * smerge-mode.el (smerge-resolve): Use null-device rather than a
+        * vc/smerge-mode.el (smerge-resolve): Use null-device rather than a
         literal "/dev/null".
 
 2011-05-12  Stefan Monnier  <monnier@iro.umontreal.ca>
@@ -5769,7 +6040,7 @@
 
 2011-04-08  Juanma Barranquero  <lekktu@gmail.com>
 
-        * vc-annotate.el (vc-annotate-show-log-revision-at-line):
+        * vc/vc-annotate.el (vc-annotate-show-log-revision-at-line):
         Fix typo in docstring.
 
 2011-04-08  Eli Zaretskii  <eliz@gnu.org>
@@ -6441,7 +6712,7 @@
 
 2011-03-19  Eli Zaretskii  <eliz@gnu.org>
 
-        * emerge.el (emerge-metachars): Separate value for ms-dos and
+        * vc/emerge.el (emerge-metachars): Separate value for ms-dos and
         windows-nt systems.
         (emerge-protect-metachars): Quote correctly for ms-dos and
         windows-nt systems.
diff --git a/lisp/buff-menu.el b/lisp/buff-menu.el
index 2be74cf5efb..d757453c051 100644
--- a/lisp/buff-menu.el
+++ b/lisp/buff-menu.el
@@ -586,22 +586,16 @@ in the selected frame."
   "Make the other window select this line's buffer.
 The current window remains selected."
   (interactive)
-  (let ((pop-up-windows t)
-        same-window-buffer-names
-        same-window-regexps)
-    (display-buffer (Buffer-menu-buffer t))))
+  (display-buffer (Buffer-menu-buffer t) t))
 
 (defun Buffer-menu-2-window ()
   "Select this line's buffer, with previous buffer in second window."
   (interactive)
   (let ((buff (Buffer-menu-buffer t))
-        (menu (current-buffer))
-        (pop-up-windows t)
-        same-window-buffer-names
-        same-window-regexps)
+        (menu (current-buffer)))
     (delete-other-windows)
     (switch-to-buffer (other-buffer))
-    (pop-to-buffer buff)
+    (switch-to-buffer-other-window buff)
     (bury-buffer menu)))
 
 (defun Buffer-menu-toggle-read-only ()
diff --git a/lisp/cmuscheme.el b/lisp/cmuscheme.el
index f4d15689885..6eb2aa76135 100644
--- a/lisp/cmuscheme.el
+++ b/lisp/cmuscheme.el
@@ -246,8 +246,7 @@ is run).
         (inferior-scheme-mode)))
   (setq scheme-program-name cmd)
   (setq scheme-buffer "*scheme*")
-  (pop-to-buffer "*scheme*"))
-;;;###autoload (add-hook 'same-window-buffer-names (purecopy "*scheme*"))
+  (switch-to-buffer "*scheme*"))
 
 (defun scheme-start-file (prog)
   "Return the name of the start file corresponding to PROG.
@@ -372,7 +371,7 @@ With argument, position cursor at end of buffer."
   (interactive "P")
   (if (or (and scheme-buffer (get-buffer scheme-buffer))
           (scheme-interactively-start-process))
-      (pop-to-buffer scheme-buffer)
+      (switch-to-buffer scheme-buffer)
     (error "No current process buffer.  See variable `scheme-buffer'"))
   (when eob-p
     (push-mark)
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 3e41a304f43..620ecdba40c 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -699,8 +699,6 @@ If `last', order groups after non-groups."
                  (const :tag "none" nil))
   :group 'custom-menu)
 
-;;;###autoload (add-hook 'same-window-regexps (purecopy "\\`\\*Customiz.*\\*\\'"))
-
 (defun custom-sort-items (items sort-alphabetically order-groups)
   "Return a sorted copy of ITEMS.
 ITEMS should be a `custom-group' property.
@@ -1103,8 +1101,9 @@ then prompt for the MODE to customize."
                      t)))
 
 ;;;###autoload
-(defun customize-group (&optional group)
-  "Customize GROUP, which must be a customization group."
+(defun customize-group (&optional group other-window)
+  "Customize GROUP, which must be a customization group.
+If OTHER-WINDOW is non-nil, display in another window."
   (interactive (list (customize-read-group)))
   (when (stringp group)
     (if (string-equal "" group)
@@ -1113,21 +1112,20 @@ then prompt for the MODE to customize."
   (let ((name (format "*Customize Group: %s*"
                       (custom-unlispify-tag-name group))))
     (if (get-buffer name)
-        (pop-to-buffer name)
-      (custom-buffer-create
-       (list (list group 'custom-group))
-       name
-       (concat " for group "
-               (custom-unlispify-tag-name group))))))
+        (switch-to-buffer name other-window)
+      (funcall (if other-window
+                   'custom-buffer-create-other-window
+                 'custom-buffer-create)
+               (list (list group 'custom-group))
+               name
+               (concat " for group "
+                       (custom-unlispify-tag-name group))))))
 
 ;;;###autoload
 (defun customize-group-other-window (&optional group)
   "Customize GROUP, which must be a customization group, in another window."
   (interactive (list (customize-read-group)))
-  (let ((pop-up-windows t)
-        (same-window-buffer-names nil)
-        (same-window-regexps nil))
-    (customize-group group)))
+  (customize-group group t))
 
 ;;;###autoload
 (defalias 'customize-variable 'customize-option)
@@ -1308,11 +1306,13 @@ Emacs that is associated with version VERSION of PACKAGE."
              (< minor1 minor2)))))
 
 ;;;###autoload
-(defun customize-face (&optional face)
+(defun customize-face (&optional face other-window)
   "Customize FACE, which should be a face name or nil.
 If FACE is nil, customize all faces.  If FACE is actually a
 face-alias, customize the face it is aliased to.
 
+If OTHER-WINDOW is non-nil, display in another window.
+
 Interactively, when point is on text which has a face specified,
 suggest to customize that face, if it's customizable."
   (interactive (list (read-face-name "Customize face" "all faces" t)))
@@ -1320,21 +1320,24 @@ suggest to customize that face, if it's customizable."
       (setq face (face-list)))
   (if (and (listp face) (null (cdr face)))
       (setq face (car face)))
-  (if (listp face)
-      (custom-buffer-create
-       (custom-sort-items
-        (mapcar (lambda (s) (list s 'custom-face)) face)
-        t nil)
-       "*Customize Faces*")
-    ;; If FACE is actually an alias, customize the face it is aliased to.
-    (if (get face 'face-alias)
-        (setq face (get face 'face-alias)))
-    (unless (facep face)
-      (error "Invalid face %S" face))
-    (custom-buffer-create
-     (list (list face 'custom-face))
-     (format "*Customize Face: %s*"
-             (custom-unlispify-tag-name face)))))
+  (let ((display-fun (if other-window
+                         'custom-buffer-create-other-window
+                       'custom-buffer-create)))
+    (if (listp face)
+        (funcall display-fun
+                 (custom-sort-items
+                  (mapcar (lambda (s) (list s 'custom-face)) face)
+                  t nil)
+                 "*Customize Faces*")
+      ;; If FACE is actually an alias, customize the face it is aliased to.
+      (if (get face 'face-alias)
+          (setq face (get face 'face-alias)))
+      (unless (facep face)
+        (error "Invalid face %S" face))
+      (funcall display-fun
+               (list (list face 'custom-face))
+               (format "*Customize Face: %s*"
+                       (custom-unlispify-tag-name face))))))
 
 ;;;###autoload
 (defun customize-face-other-window (&optional face)
@@ -1344,10 +1347,7 @@ If FACE is actually a face-alias, customize the face it is aliased to.
 Interactively, when point is on text which has a face specified,
 suggest to customize that face, if it's customizable."
   (interactive (list (read-face-name "Customize face" "all faces" t)))
-  (let ((pop-up-windows t)
-        (same-window-buffer-names nil)
-        (same-window-regexps nil))
-    (customize-face face)))
+  (customize-face face t))
 
 (defalias 'customize-customized 'customize-unsaved)
 
@@ -1533,7 +1533,7 @@ Optional NAME is the name of the buffer.
 OPTIONS should be an alist of the form ((SYMBOL WIDGET)...), where
 SYMBOL is a customization option, and WIDGET is a widget for editing
 that option."
-  (pop-to-buffer (custom-get-fresh-buffer (or name "*Customization*")))
+  (switch-to-buffer (custom-get-fresh-buffer (or name "*Customization*")))
   (custom-buffer-create-internal options description))
 
 ;;;###autoload
@@ -1545,11 +1545,8 @@ OPTIONS should be an alist of the form ((SYMBOL WIDGET)...), where
 SYMBOL is a customization option, and WIDGET is a widget for editing
 that option."
   (unless name (setq name "*Customization*"))
-  (let ((pop-up-windows t)
-        (same-window-buffer-names nil)
-        (same-window-regexps nil))
-    (pop-to-buffer (custom-get-fresh-buffer name))
-    (custom-buffer-create-internal options description)))
+  (switch-to-buffer-other-window (custom-get-fresh-buffer name))
+  (custom-buffer-create-internal options description))
 
 (defcustom custom-reset-button-menu nil
   "If non-nil, only show a single reset button in customize buffers.
@@ -1724,7 +1721,7 @@ Otherwise use brackets."
   (unless group
     (setq group 'emacs))
   (let ((name "*Customize Browser*"))
-    (pop-to-buffer (custom-get-fresh-buffer name)))
+    (switch-to-buffer (custom-get-fresh-buffer name)))
   (Custom-mode)
   (widget-insert (format "\
 %s buttons; type RET or click mouse-1
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index ec157fc4939..2f2d28e596c 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -236,18 +236,16 @@ List has a form of (file-name full-file-name (attribute-list))."
   ;; OP-SYMBOL is the type of operation (for use in `dired-mark-pop-up').
   ;; ARG describes which files to use, as in `dired-get-marked-files'.
   (let* ((files (dired-get-marked-files t arg))
-         (initial
-          (if (eq op-symbol 'touch)
-              (format-time-string "%Y%m%d%H%M.%S")))
-         (default
-           (if (eq op-symbol 'touch)
-               (and (stringp (car files))
-                    (format-time-string "%Y%m%d%H%M.%S"
-                                        (nth 5 (file-attributes (car files)))))))
-         (new-attribute
-          (dired-mark-read-string
-           (concat "Change " attribute-name " of %s to: ")
-           initial op-symbol arg files default))
+         (default (and (eq op-symbol 'touch)
+                       (stringp (car files))
+                       (format-time-string "%Y%m%d%H%M.%S"
+                                           (nth 5 (file-attributes (car files))))))
+         (prompt (concat "Change " attribute-name " of %s to"
+                         (if (eq op-symbol 'touch)
+                             " (default now): "
+                           ": ")))
+         (new-attribute (dired-mark-read-string prompt nil op-symbol
+                                                arg files default))
          (operation (concat program " " new-attribute))
          failures)
     (setq failures
@@ -255,9 +253,10 @@ List has a form of (file-name full-file-name (attribute-list))."
                              (function dired-check-process)
                              (append
                               (list operation program)
-                              (if (eq op-symbol 'touch)
-                                  '("-t") nil)
-                              (list new-attribute)
+                              (unless (string-equal new-attribute "")
+                                (if (eq op-symbol 'touch)
+                                    (list "-t" new-attribute)
+                                  (list new-attribute)))
                               (if (string-match "gnu" system-configuration)
                                   '("--") nil))
                              files))
@@ -285,10 +284,19 @@ Symbolic modes like `g+w' are allowed."
                          (match-string 2 modestr)
                          (match-string 3 modestr)))))
          (modes (dired-mark-read-string
-                 "Change mode of %s to: " nil
+                 "Change mode of %s to: "
+                 ;; Insert initial input if there's only one file.
+                 (unless (cadr files) default)
                  'chmod arg files default))
-         (num-modes (if (string-match "^[0-7]+" modes)
-                        (string-to-number modes 8))))
+         num-modes)
+
+    (cond ((equal modes "")
+           ;; We used to treat empty input as DEFAULT, but that is not
+           ;; such a good idea (Bug#9361).
+           (error "No file mode specified"))
+          ((string-match "^[0-7]+" modes)
+           (setq num-modes (string-to-number modes 8))))
+
     (dolist (file files)
       (set-file-modes
        file
@@ -379,22 +387,24 @@ Uses the shell command coming from variables `lpr-command' and
                    'print arg file-list)))
     (dired-run-shell-command (dired-shell-stuff-it command file-list nil))))
 
-;; Read arguments for a marked-files command that wants a string
-;; that is not a file name,
-;; perhaps popping up the list of marked files.
-;; ARG is the prefix arg and indicates whether the files came from
-;; marks (ARG=nil) or a repeat factor (integerp ARG).
-;; If the current file was used, the list has but one element and ARG
-;; does not matter. (It is non-nil, non-integer in that case, namely '(4)).
-
-(defun dired-mark-read-string (prompt initial op-symbol arg files &optional default)
-  ;; PROMPT for a string, with INITIAL input and DEFAULT value.
-  ;; Other args are used to give user feedback and pop-up:
-  ;; OP-SYMBOL of command, prefix ARG, marked FILES.
-  (dired-mark-pop-up
-   nil op-symbol files
-   (function read-string)
-   (format prompt (dired-mark-prompt arg files)) initial nil default))
+(defun dired-mark-read-string (prompt initial op-symbol arg files
+                               &optional standard-value)
+  "Read args for a Dired marked-files command, prompting with PROMPT.
+Return the user input (a string).
+
+INITIAL, if non-nil, is the initial minibuffer input.
+OP-SYMBOL is an operation symbol (see `dired-no-confirm').
+ARG is normally the prefix argument for the calling command.
+FILES should be a list of file names.
+
+STANDARD-VALUE, if non-nil, should be a \"standard\" value or
+list of such values, available via history commands.  Note that
+if the user enters empty input, this function returns the empty
+string, not STANDARD-VALUE."
+  (dired-mark-pop-up nil op-symbol files
+                     'read-from-minibuffer
+                     (format prompt (dired-mark-prompt arg files))
+                     initial nil nil nil standard-value))
 
 ;;; Cleaning a directory: flagging some backups for deletion.
 
diff --git a/lisp/dired.el b/lisp/dired.el
index ecb626a275e..3428f5bef8b 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -3663,7 +3663,7 @@ Ask means pop up a menu for the user to select one of copy, move or link."
 ;;;;;;  dired-run-shell-command dired-do-shell-command dired-do-async-shell-command
 ;;;;;;  dired-clean-directory dired-do-print dired-do-touch dired-do-chown
 ;;;;;;  dired-do-chgrp dired-do-chmod dired-compare-directories dired-backup-diff
-;;;;;;  dired-diff) "dired-aux" "dired-aux.el" "bbb53a5b6bf56c413fe0f898559bef8d")
+;;;;;;  dired-diff) "dired-aux" "dired-aux.el" "bbc9babe193843cad535d73492326c48")
 ;;; Generated autoloads from dired-aux.el
 
 (autoload 'dired-diff "dired-aux" "\
diff --git a/lisp/emacs-lisp/cl-indent.el b/lisp/emacs-lisp/cl-indent.el
index 40434636e62..287bb531538 100644
--- a/lisp/emacs-lisp/cl-indent.el
+++ b/lisp/emacs-lisp/cl-indent.el
@@ -167,6 +167,7 @@ is set to `defun'.")
            (+ loop-indentation lisp-loop-forms-indentation)))))
 
 
+;; Cf (info "(elisp)Specification List")
 ;;;###autoload
 (defun common-lisp-indent-function (indent-point state)
   "Function to indent the arguments of a Lisp function call.
diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el
index 8276030ccf8..16258a5a3a1 100644
--- a/lisp/emacs-lisp/debug.el
+++ b/lisp/emacs-lisp/debug.el
@@ -342,71 +342,72 @@ That buffer should be current already."
   "Attach cross-references to function names in the `*Backtrace*' buffer."
   (interactive "b")
   (with-current-buffer (or buffer (current-buffer))
-    (setq buffer (current-buffer))
-    (let ((inhibit-read-only t)
-          (old-end (point-min)) (new-end (point-min)))
-      ;; If we saved an old backtrace, find the common part
-      ;; between the new and the old.
-      ;; Compare line by line, starting from the end,
-      ;; because that's the part that is likely to be unchanged.
-      (if debugger-previous-backtrace
-          (let (old-start new-start (all-match t))
-            (goto-char (point-max))
-            (with-temp-buffer
-              (insert debugger-previous-backtrace)
-              (while (and all-match (not (bobp)))
-                (setq old-end (point))
-                (forward-line -1)
-                (setq old-start (point))
-                (with-current-buffer buffer
-                  (setq new-end (point))
+    (save-excursion
+      (setq buffer (current-buffer))
+      (let ((inhibit-read-only t)
+            (old-end (point-min)) (new-end (point-min)))
+        ;; If we saved an old backtrace, find the common part
+        ;; between the new and the old.
+        ;; Compare line by line, starting from the end,
+        ;; because that's the part that is likely to be unchanged.
+        (if debugger-previous-backtrace
+            (let (old-start new-start (all-match t))
+              (goto-char (point-max))
+              (with-temp-buffer
+                (insert debugger-previous-backtrace)
+                (while (and all-match (not (bobp)))
+                  (setq old-end (point))
                   (forward-line -1)
-                  (setq new-start (point)))
-                (if (not (zerop
-                          (let ((case-fold-search nil))
-                            (compare-buffer-substrings
-                             (current-buffer) old-start old-end
-                             buffer new-start new-end))))
-                    (setq all-match nil))))
-            ;; Now new-end is the position of the start of the
-            ;; unchanged part in the current buffer, and old-end is
-            ;; the position of that same text in the saved old
-            ;; backtrace.  But we must subtract (point-min) since strings are
-            ;; indexed in origin 0.
-
-            ;; Replace the unchanged part of the backtrace
-            ;; with the text from debugger-previous-backtrace,
-            ;; since that already has the proper xrefs.
-            ;; With this optimization, we only need to scan
-            ;; the changed part of the backtrace.
-            (delete-region new-end (point-max))
-            (goto-char (point-max))
-            (insert (substring debugger-previous-backtrace
-                               (- old-end (point-min))))
-            ;; Make the unchanged part of the backtrace inaccessible
-            ;; so it won't be scanned.
-            (narrow-to-region (point-min) new-end)))
-
-      ;; Scan the new part of the backtrace, inserting xrefs.
-      (goto-char (point-min))
-      (while (progn
-               (goto-char (+ (point) 2))
-               (skip-syntax-forward "^w_")
-               (not (eobp)))
-        (let* ((beg (point))
-               (end (progn (skip-syntax-forward "w_") (point)))
-               (sym (intern-soft (buffer-substring-no-properties
-                                  beg end)))
-               (file (and sym (symbol-file sym 'defun))))
-          (when file
-            (goto-char beg)
-            ;; help-xref-button needs to operate on something matched
-            ;; by a regexp, so set that up for it.
-            (re-search-forward "\\(\\sw\\|\\s_\\)+")
-            (help-xref-button 0 'help-function-def sym file)))
-        (forward-line 1))
-      (widen))
-    (setq debugger-previous-backtrace (buffer-string))))
+                  (setq old-start (point))
+                  (with-current-buffer buffer
+                    (setq new-end (point))
+                    (forward-line -1)
+                    (setq new-start (point)))
+                  (if (not (zerop
+                            (let ((case-fold-search nil))
+                              (compare-buffer-substrings
+                               (current-buffer) old-start old-end
+                               buffer new-start new-end))))
+                      (setq all-match nil))))
+              ;; Now new-end is the position of the start of the
+              ;; unchanged part in the current buffer, and old-end is
+              ;; the position of that same text in the saved old
+              ;; backtrace.  But we must subtract (point-min) since strings are
+              ;; indexed in origin 0.
+
+              ;; Replace the unchanged part of the backtrace
+              ;; with the text from debugger-previous-backtrace,
+              ;; since that already has the proper xrefs.
+              ;; With this optimization, we only need to scan
+              ;; the changed part of the backtrace.
+              (delete-region new-end (point-max))
+              (goto-char (point-max))
+              (insert (substring debugger-previous-backtrace
+                                 (- old-end (point-min))))
+              ;; Make the unchanged part of the backtrace inaccessible
+              ;; so it won't be scanned.
+              (narrow-to-region (point-min) new-end)))
+
+        ;; Scan the new part of the backtrace, inserting xrefs.
+        (goto-char (point-min))
+        (while (progn
+                 (goto-char (+ (point) 2))
+                 (skip-syntax-forward "^w_")
+                 (not (eobp)))
+          (let* ((beg (point))
+                 (end (progn (skip-syntax-forward "w_") (point)))
+                 (sym (intern-soft (buffer-substring-no-properties
+                                    beg end)))
+                 (file (and sym (symbol-file sym 'defun))))
+            (when file
+              (goto-char beg)
+              ;; help-xref-button needs to operate on something matched
+              ;; by a regexp, so set that up for it.
+              (re-search-forward "\\(\\sw\\|\\s_\\)+")
+              (help-xref-button 0 'help-function-def sym file)))
+          (forward-line 1))
+        (widen))
+      (setq debugger-previous-backtrace (buffer-string)))))
 
 (defun debugger-step-through ()
   "Proceed, stepping through subexpressions of this expression.
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index c8620aaa439..f2bea30ea39 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -1102,25 +1102,31 @@ is the buffer position of the start of the containing expression."
 
 (defun lisp-indent-function (indent-point state)
   "This function is the normal value of the variable `lisp-indent-function'.
-It is used when indenting a line within a function call, to see if the
-called function says anything special about how to indent the line.
+The function `calculate-lisp-indent' calls this to determine
+if the arguments of a Lisp function call should be indented specially.
 
 INDENT-POINT is the position where the user typed TAB, or equivalent.
 Point is located at the point to indent under (for default indentation);
 STATE is the `parse-partial-sexp' state for that position.
 
-If the current line is in a call to a Lisp function
-which has a non-nil property `lisp-indent-function',
-that specifies how to do the indentation.  The property value can be
-* `defun', meaning indent `defun'-style;
+If the current line is in a call to a Lisp function that has a non-nil
+property `lisp-indent-function' (or the deprecated `lisp-indent-hook'),
+it specifies how to indent.  The property value can be:
+
+* `defun', meaning indent `defun'-style
+  \(this is also the case if there is no property and the function
+  has a name that begins with \"def\", and three or more arguments);
+
 * an integer N, meaning indent the first N arguments specially
-  like ordinary function arguments and then indent any further
+  (like ordinary function arguments), and then indent any further
   arguments like a body;
-* a function to call just as this function was called.
-  If that function returns nil, that means it doesn't specify
-  the indentation.
 
-This function also returns nil meaning don't specify the indentation."
+* a function to call that returns the indentation (or nil).
+  `lisp-indent-function' calls this function with the same two arguments
+  that it itself received.
+
+This function returns either the indentation to use, or nil if the
+Lisp function does not specify a special indentation."
   (let ((normal-indent (current-column)))
     (goto-char (1+ (elt state 1)))
     (parse-partial-sexp (point) calculate-lisp-indent-last-sexp 0 t)
diff --git a/lisp/facemenu.el b/lisp/facemenu.el
index 1b42aa9ea73..a18b892efe8 100644
--- a/lisp/facemenu.el
+++ b/lisp/facemenu.el
@@ -241,10 +241,12 @@ it will remove any faces not explicitly in the list."
   (define-key map [df] (cons (purecopy "Display Faces") 'list-faces-display))
   (define-key map [dp] (cons (purecopy "Describe Properties")
                              'describe-text-properties))
-  (define-key map [ra] (cons (purecopy "Remove Text Properties")
-                             'facemenu-remove-all))
-  (define-key map [rm] (cons (purecopy "Remove Face Properties")
-                             'facemenu-remove-face-props))
+  (define-key map [ra] (list 'menu-item (purecopy "Remove Text Properties")
+                             'facemenu-remove-all
+                             :enable 'mark-active))
+  (define-key map [rm] (list 'menu-item (purecopy "Remove Face Properties")
+                             'facemenu-remove-face-props
+                             :enable 'mark-active))
   (define-key map [s1] (list (purecopy "--"))))
 (let ((map facemenu-menu))
   (define-key map [in] (cons (purecopy "Indentation")
diff --git a/lisp/faces.el b/lisp/faces.el
index 3c4a3330c81..fbe0f30ae6e 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1445,6 +1445,8 @@ If FRAME is nil, the current FRAME is used."
             options (cdr conjunct)
             match (cond ((eq req 'type)
                          (or (memq (window-system frame) options)
+                             (and (memq 'graphic options)
+                                  (memq (window-system frame) '(x w32 ns)))
                              ;; FIXME: This should be revisited to use
                              ;; display-graphic-p, provided that the
                              ;; color selection depends on the number
diff --git a/lisp/files.el b/lisp/files.el
index a0f55517546..5ca9af6783d 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -6301,7 +6301,7 @@ as in \"og+rX-w\"."
   "Convert symbolic file modes to numeric file modes.
 MODES is the string to convert, it should match
 \"[ugoa]*([+-=][rwxXstugo]*)+,...\".
-See (info \"(coreutils)File permissions\") for more information on this
+See Info node `(coreutils)File permissions' for more information on this
 notation.
 FROM (or 0 if nil) gives the mode bits on which to base permissions if
 MODES request to add, remove, or set permissions based on existing ones,
diff --git a/lisp/frame.el b/lisp/frame.el
index 8fea4f05147..ab9b085f1d9 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1457,7 +1457,7 @@ the opposite frame edge from the edge indicated in the input spec."
 
 
 (defun delete-other-frames (&optional frame)
-  "Delete all frames except FRAME.
+  "Delete all frames on the current terminal, except FRAME.
 If FRAME uses another frame's minibuffer, the minibuffer frame is
 left untouched.  FRAME nil or omitted means use the selected frame."
   (interactive)
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 2e0cc11279a..a89dc713dd8 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,100 @@
+2011-09-12  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus.el (gnus-interactive-exit): Update defcustom spec.
+
+2011-09-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * gnus.el (gnus-nntp-server): Move to gnus-int.el to silence bytecomp.
+        * gnus-int.el (gnus-nntp-server): Move from gnus.el.
+
+2011-09-12  Andrew Cohen  <cohen@andy.bu.edu>
+
+        * gnus-group.el (gnus-group-list-limit-map, gnus-group-list-flush-map)
+        (gnus-group-list-plus-map): Allow limiting, flushing and plusing ticked
+        articles.
+
+2011-09-11  Chong Yidong  <cyd@stupidchicken.com>
+
+        * message.el (message-pop-to-buffer): Default to switch-to-buffer.
+        (message-mail-other-window, message-mail-other-frame)
+        (message-news-other-window, message-news-other-frame):
+        Use switch-to-buffer-other-frame and switch-to-buffer-other-window
+        instead of setting buffer display varibles.
+
+2011-09-11  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus-group.el (gnus-group-list-limit): Explain what the command does.
+
+        * gnus-sum.el (gnus-fetch-headers): Bump message level.
+
+2011-09-11  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus-dup.el (gnus-dup-suppress-articles): Move "Suppressing
+        duplicates" to a higher level.
+
+        * gnus-util.el (gnus-verbose): Lower default to 6 to get rid of the
+        most egregious messages.
+
+2011-09-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus-msg.el (gnus-summary-mail-forward): Minuscule doc fix.
+
+2011-09-10  Tetsuo Tsukamoto  <tt.tetsuo.tsukamoto@gmail.com>  (tiny change)
+
+        * nnrss.el (nnrss-retrieve-groups): Decode the charset before looking
+        up the file (bug#9351).
+
+2011-09-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * nnimap.el: Redo the charset handling.  Let Gnus encode the names, as
+        it does with all other backends, but decode the names immediately after
+        getting them.
+
+        * gnus-group.el (gnus-group-name-charset): Always return `utf-7' when
+        decoding nnimap groups.
+
+        * gnus.el (gnus-variable-list): Don't save `gnus-format-specs' in the
+        newsrc file.  It doesn't seem like an important optimisation any more.
+
+2011-09-10  Dave Abrahams  <dave@boostpro.com>  (tiny change)
+
+        * nnimap.el (nnimap-transform-headers): Fix regexp to be less prone to
+        overflows.
+
+2011-09-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus.el (gnus-article-mark-lists): Remove `recent'.
+        (gnus-interactive-exit): Extend to `quiet'.
+
+        * gnus-sum.el (gnus-offer-save-summaries): Use it.
+
+        * gnus-art.el (gnus-treat-hide-citation-maybe): Add more doc to the
+        string.
+
+        * plstore.el (plstore--get-buffer): Silence compiler warnings by
+        renaming function arguments from `this'.
+
+        * gnus-sum.el (gnus-newsgroup-recent): Remove.
+
+        * gnus-spec.el (gnus-lrm-string-p): `bidi-string-mark-left-to-right'
+        has been renamed.
+        (gnus-lrm-string-p): Include RLM and PDF, too.
+
+        * gnus-int.el (gnus-open-server): Make the "denied" message clearer
+        (bug#9225).
+
+2011-09-10  Eli Zaretskii  <eliz@gnu.org>
+
+        Add autoload cookies for functions used by sendmail.el.
+        * mm-encode.el (mm-default-file-encoding): Add autoload cookie.
+
+        * mml.el (mml-to-mime, mml-attach-file): Add autoload cookies.
+
+2011-09-09  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus-art.el (article-date-ut): Work properly even when there are
+        things like Date header in the body; work for forwarded parts.
+
 2011-09-05  Andrew Cohen  <cohen@andy.bu.edu>
 
         * gnus-sum.el (gnus-summary-exit): Ensure we kill the proper
@@ -107,8 +204,8 @@
         * nnmairix.el (nnmairix-request-set-mark)
         (nnmairix-goto-original-article): Remove adding of article to registry,
         since `gnus-registry-add-group' isn't available anymore.
-        (nnmairix-determine-original-group-from-registry): Use
-        `gnus-registry-get-id-key' since `gnus-registry-fetch-groups' isn't
+        (nnmairix-determine-original-group-from-registry):
+        Use `gnus-registry-get-id-key' since `gnus-registry-fetch-groups' isn't
         available anymore.
 
 2011-08-12  Simon Josefsson  <simon@josefsson.org>
@@ -219,7 +316,7 @@
 
 2011-08-02  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
-        * starttls.el (starttls-available-p): Renamed from
+        * starttls.el (starttls-available-p): Rename from
         `starttls-any-program-available' and changed return convention.
 
 2011-07-31  Lars Ingebrigtsen  <larsi@gnus.org>
@@ -275,8 +372,8 @@
 
         * nnir.el (gnus-group-make-nnir-group): Allow optional search query
         argument.
-        (gnus-group-make-nnir-group, nnir-request-group, nnir-run-query): Use
-        `nnir-address' to handle server info rather than passing an arg.
+        (gnus-group-make-nnir-group, nnir-request-group, nnir-run-query):
+        Use `nnir-address' to handle server info rather than passing an arg.
 
         * nnimap.el (nnimap-make-thread-query): New utility function to format
         an imap thread search query.
@@ -329,7 +426,7 @@
 
 2011-07-15  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
-        * gnus.el (debbugs-gnu): Renamed from debbugs-emacs.
+        * gnus.el (debbugs-gnu): Rename from debbugs-emacs.
 
         * message.el (message-reply): Work around mysterious bug where
         `message-mode' seems to overwrite the locally bound `subject' variable.
@@ -358,9 +455,9 @@
 
         * gnus-msg.el (gnus-bug): Don't insert user variables.  It usually
         isn't very interesting any more, and it leaks potentially secret data.
-        (gnus-debug): Removed.
+        (gnus-debug): Remove.
 
-        * gnus-art.el (gnus-ignored-headers): Removed obsolete and non-working
+        * gnus-art.el (gnus-ignored-headers): Remove obsolete and non-working
         use of :custom-show.
 
 2011-07-07  Daiki Ueno  <ueno@unixuser.org>
@@ -547,8 +644,8 @@
         * gnus-group.el (gnus-read-ephemeral-emacs-bug-group): Take an optional
         quit window configuration.
 
-        * auth-source.el (epg-context-set-passphrase-callback): Remove
-        duplicate autoload.
+        * auth-source.el (epg-context-set-passphrase-callback):
+        Remove duplicate autoload.
 
 2011-06-30  Andrew Cohen  <cohen@andy.bu.edu>
 
@@ -665,7 +762,7 @@
         * spam.el (spam-stat): Require in a normal fashion without binding
         `spam-stat-install-hooks' to avoid compilation warnings.
 
-        * spam-stat.el (spam-stat-install-hooks): Removed.
+        * spam-stat.el (spam-stat-install-hooks): Remove.
         (spam-stat-install-hooks): Don't run automatically.
 
 2011-06-26  Timo Juhani Lindfors  <timo.lindfors@iki.fi>  (tiny change)
diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el
index 26222119b98..669f9675536 100644
--- a/lisp/gnus/gnus-agent.el
+++ b/lisp/gnus/gnus-agent.el
@@ -1933,7 +1933,7 @@ article numbers will be returned."
       (with-current-buffer nntp-server-buffer
         (if articles
             (progn
-              (gnus-message 7 "Fetching headers for %s..."
+              (gnus-message 8 "Fetching headers for %s..."
                             (gnus-agent-decoded-group-name group))
 
               ;; Fetch them.
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 9d962fc6d99..8149e555276 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -1237,9 +1237,12 @@ predicate.  See Info node `(gnus)Customizing Articles'."
   :type gnus-article-treat-custom)
 
 (defcustom gnus-treat-hide-citation-maybe nil
-  "Hide cited text.
+  "Hide cited text according to certain conditions.
 Valid values are nil, t, `head', `first', `last', an integer or a
-predicate.  See Info node `(gnus)Customizing Articles'."
+predicate.  See Info node `(gnus)Customizing Articles'.
+
+See `gnus-cite-hide-percentage' and `gnus-cite-hide-absolute' for
+how to control what it hides."
   :group 'gnus-article-treat
   :link '(custom-manual "(gnus)Customizing Articles")
   :type gnus-article-treat-custom)
@@ -3429,32 +3432,43 @@ possible values."
          (visible-date (mail-fetch-field "Date"))
          pos date bface eface)
     (save-excursion
-      (save-restriction
-        (goto-char (point-min))
-        (when (re-search-forward "^Date:" nil t)
-          (setq bface (get-text-property (point-at-bol) 'face)
-                eface (get-text-property (1- (point-at-eol)) 'face)))
-        (goto-char (point-min))
-        ;; Delete any old Date headers.
-        (if date-position
-            (progn
-              (goto-char date-position)
-              (setq date (get-text-property (point) 'original-date))
-              (delete-region (point)
-                             (progn
-                               (gnus-article-forward-header)
-                               (point)))
+      (goto-char (point-min))
+      (when (re-search-forward "^Date:" nil t)
+        (setq bface (get-text-property (point-at-bol) 'face)
+              eface (get-text-property (1- (point-at-eol)) 'face)))
+      ;; Delete any old Date headers.
+      (if date-position
+          (progn
+            (goto-char date-position)
+            (setq date (get-text-property (point) 'original-date))
+            (delete-region (point)
+                           (progn
+                             (gnus-article-forward-header)
+                             (point)))
+            (article-transform-date date type bface eface))
+        (save-restriction
+          (widen)
+          (goto-char (point-min))
+          (while (or (get-text-property (setq pos (point)) 'original-date)
+                     (and (setq pos (next-single-property-change
+                                     (point) 'original-date))
+                          (goto-char pos)))
+            (narrow-to-region pos (if (search-forward "\n\n" nil t)
+                                      (1+ (match-beginning 0))
+                                    (point-max)))
+            (goto-char (point-min))
+            (while (re-search-forward "^Date:" nil t)
+              (setq date (get-text-property (match-beginning 0) 'original-date))
+              (delete-region (point-at-bol) (progn
+                                              (gnus-article-forward-header)
+                                              (point))))
+            (when (and (not date)
+                       visible-date)
+              (setq date visible-date))
+            (when date
               (article-transform-date date type bface eface))
-          (while (re-search-forward "^Date:" nil t)
-            (setq date (get-text-property (match-beginning 0) 'original-date))
-            (delete-region (point-at-bol) (progn
-                                            (gnus-article-forward-header)
-                                            (point))))
-          (when (and (not date)
-                     visible-date)
-            (setq date visible-date))
-          (when date
-            (article-transform-date date type bface eface)))))))
+            (goto-char (point-max))
+            (widen)))))))
 
 (defun article-transform-date (date type bface eface)
   (dolist (this-type (cond
diff --git a/lisp/gnus/gnus-dup.el b/lisp/gnus/gnus-dup.el
index eaecc07d767..8db1905ef8b 100644
--- a/lisp/gnus/gnus-dup.el
+++ b/lisp/gnus/gnus-dup.el
@@ -131,7 +131,7 @@ seen in the same session."
   "Mark duplicate articles as read."
   (unless gnus-dup-list
     (gnus-dup-open))
-  (gnus-message 6 "Suppressing duplicates...")
+  (gnus-message 8 "Suppressing duplicates...")
   (let ((auto (and gnus-newsgroup-auto-expire
                    (memq gnus-duplicate-mark gnus-auto-expirable-marks)))
         number)
@@ -145,7 +145,7 @@ seen in the same session."
             (push (cons number gnus-duplicate-mark) gnus-newsgroup-reads)
           (push number gnus-newsgroup-expirable)
           (push (cons number gnus-expirable-mark) gnus-newsgroup-reads)))))
-  (gnus-message 6 "Suppressing duplicates...done"))
+  (gnus-message 8 "Suppressing duplicates...done"))
 
 (defun gnus-dup-unsuppress-article (article)
   "Stop suppression of ARTICLE."
diff --git a/lisp/gnus/gnus-ems.el b/lisp/gnus/gnus-ems.el
index aed471c38f4..5acc9d117e4 100644
--- a/lisp/gnus/gnus-ems.el
+++ b/lisp/gnus/gnus-ems.el
@@ -210,8 +210,8 @@
                 end nil))))))
 
 (defmacro gnus-string-mark-left-to-right (string)
-  (if (fboundp 'string-mark-left-to-right)
-      `(string-mark-left-to-right ,string)
+  (if (fboundp 'bidi-string-mark-left-to-right)
+      `(bidi-string-mark-left-to-right ,string)
     string))
 
 (eval-and-compile
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 5cc01759a04..720881acd98 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -710,7 +710,8 @@ simple manner.")
   "M"  gnus-group-list-limit
   "l"  gnus-group-list-limit
   "c"  gnus-group-list-limit
-  "?"  gnus-group-list-limit)
+  "?"  gnus-group-list-limit
+  "!"  gnus-group-list-limit)
 
 (gnus-define-keys (gnus-group-list-flush-map "f" gnus-group-list-map)
   "k"  gnus-group-list-flush
@@ -722,7 +723,8 @@ simple manner.")
   "M"  gnus-group-list-flush
   "l"  gnus-group-list-flush
   "c"  gnus-group-list-flush
-  "?"  gnus-group-list-flush)
+  "?"  gnus-group-list-flush
+  "!"  gnus-group-list-flush)
 
 (gnus-define-keys (gnus-group-list-plus-map "p" gnus-group-list-map)
   "k"  gnus-group-list-plus
@@ -734,7 +736,8 @@ simple manner.")
   "M"  gnus-group-list-plus
   "l"  gnus-group-list-plus
   "c"  gnus-group-list-plus
-  "?"  gnus-group-list-plus)
+  "?"  gnus-group-list-plus
+  "!"  gnus-group-list-plus)
 
 (gnus-define-keys (gnus-group-score-map "W" gnus-group-mode-map)
   "f" gnus-score-flush-cache
@@ -1201,7 +1204,7 @@ The following commands are available:
   (if (eq (car method) 'nnimap)
       ;; IMAP groups should not be encoded, since they do the encoding
       ;; in utf7 in the protocol.
-      nil
+      'utf-8
     (let ((item (or (assoc method gnus-group-name-charset-method-alist)
                     (and (consp method)
                          (assoc (list (car method) (cadr method))
@@ -4069,7 +4072,7 @@ If DONT-SCAN is non-nil, scan non-activated groups as well."
             (gnus-group-update-group group nil t))
         (if (eq (gnus-server-status (gnus-find-method-for-group group))
                 'denied)
-            (gnus-error 3 "Server denied access")
+            (gnus-error 3 "Server previously determined to be down; not retrying")
           (gnus-error 3 "%s error: %s" group (gnus-status-message group)))))
     (when beg
       (goto-char beg))
@@ -4636,7 +4639,12 @@ This command may read the active file."
     (gnus-group-list-plus args)))
 
 (defun gnus-group-list-limit (&optional args)
-  "List groups limited within the current selection."
+  "List groups limited within the current selection.
+If you've limited the groups, you can further limit the selection
+with this command.  If you've first limited to groups with
+dormant articles with `A ?', you can then further limit with
+`A / c', which will then limit to groups with cached articles, giving
+you the groups that have both dormant articles and cached articles."
   (interactive "P")
   (let ((gnus-group-list-option 'limit))
     (gnus-group-list-plus args)))
diff --git a/lisp/gnus/gnus-int.el b/lisp/gnus/gnus-int.el
index b9b191cd09c..2e102634727 100644
--- a/lisp/gnus/gnus-int.el
+++ b/lisp/gnus/gnus-int.el
@@ -63,6 +63,13 @@ server denied."
                  (const :tag "Deny server" denied)
                  (const :tag "Unplug Agent" offline)))
 
+(defcustom gnus-nntp-server nil
+  "The name of the host running the NNTP server."
+  :group 'gnus-server
+  :type '(choice (const :tag "disable" nil)
+                 string))
+(make-obsolete-variable 'gnus-nntp-server 'gnus-select-method "24.1")
+
 (defvar gnus-internal-registry-spool-current-method nil
   "The current method, for the registry.")
 
@@ -255,7 +262,8 @@ If it is down, start it up (again)."
     ;; If this method was previously denied, we just return nil.
     (if (eq (nth 1 elem) 'denied)
         (progn
-          (gnus-message 1 "Denied server %s" server)
+          (gnus-message
+           1 "Server %s previously determined to be down; not retrying" server)
           nil)
       ;; Open the server.
       (let* ((open-server-function
diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index d60c7165abd..e6a06a0500d 100644
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -1225,7 +1225,7 @@ if ARG is 3, decode message and forward as an rfc822 MIME section;
 if ARG is 4, forward message directly inline;
 otherwise, use flipped `message-forward-as-mime'.
 If POST, post instead of mail.
-For the `inline' alternatives, also see the variable
+For the \"inline\" alternatives, also see the variable
 `message-forward-ignored-headers'."
   (interactive "P")
   (if (cdr (gnus-summary-work-articles nil))
diff --git a/lisp/gnus/gnus-spec.el b/lisp/gnus/gnus-spec.el
index 31cb9864ff2..2345c4fc141 100644
--- a/lisp/gnus/gnus-spec.el
+++ b/lisp/gnus/gnus-spec.el
@@ -91,8 +91,10 @@ text properties. This is only needed on XEmacs, as Emacs does this anyway."
                   (header gnus-tmp-from))
 
 (defmacro gnus-lrm-string-p (string)
-  (if (fboundp 'string-mark-left-to-rigth)
-      `(eq (aref ,string (1- (length ,string))) 8206)
+  (if (fboundp 'bidi-string-mark-left-to-right)
+      ;; LRM, RLM, PDF characters as integers to avoid breaking Emacs
+      ;; 23.
+      `(memq (aref ,string (1- (length ,string))) '(8206 8207 8236))
     nil))
 
 (defvar gnus-lrm-string (if (ignore-errors (string 8206))
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index bb8c719a4fd..8651b583757 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -1499,9 +1499,6 @@ the type of the variable (string, integer, character, etc).")
 (defvar gnus-newsgroup-forwarded nil
   "List of articles that have been forwarded in the current newsgroup.")
 
-(defvar gnus-newsgroup-recent nil
-  "List of articles that have are recent in the current newsgroup.")
-
 (defvar gnus-newsgroup-expirable nil
   "Sorted list of articles in the current newsgroup that can be expired.")
 
@@ -1578,7 +1575,6 @@ This list will always be a subset of gnus-newsgroup-undownloaded.")
     gnus-newsgroup-saved
     gnus-newsgroup-replied
     gnus-newsgroup-forwarded
-    gnus-newsgroup-recent
     gnus-newsgroup-expirable
     gnus-newsgroup-killed
     gnus-newsgroup-unseen
@@ -3743,8 +3739,6 @@ buffer that was in action when the last article was fetched."
                  gnus-forwarded-mark)
                 ((memq gnus-tmp-current gnus-newsgroup-saved)
                  gnus-saved-mark)
-                ((memq gnus-tmp-number gnus-newsgroup-recent)
-                 gnus-recent-mark)
                 ((memq gnus-tmp-number gnus-newsgroup-unseen)
                  gnus-unseen-mark)
                 (t gnus-no-mark)))
@@ -5395,8 +5389,6 @@ or a straight list of headers."
                     gnus-forwarded-mark)
                    ((memq number gnus-newsgroup-saved)
                     gnus-saved-mark)
-                   ((memq number gnus-newsgroup-recent)
-                    gnus-recent-mark)
                    ((memq number gnus-newsgroup-unseen)
                     gnus-unseen-mark)
                    (t gnus-no-mark))
@@ -5551,7 +5543,7 @@ or a straight list of headers."
 (defun gnus-fetch-headers (articles &optional limit force-new dependencies)
   "Fetch headers of ARTICLES."
   (let ((name (gnus-group-decoded-name gnus-newsgroup-name)))
-    (gnus-message 5 "Fetching headers for %s..." name)
+    (gnus-message 7 "Fetching headers for %s..." name)
     (prog1
         (if (eq 'nov
                 (setq gnus-headers-retrieved-by
@@ -5568,7 +5560,7 @@ or a straight list of headers."
             (gnus-get-newsgroup-headers-xover
              articles force-new dependencies gnus-newsgroup-name t)
           (gnus-get-newsgroup-headers dependencies force-new))
-      (gnus-message 5 "Fetching headers for %s...done" name))))
+      (gnus-message 7 "Fetching headers for %s...done" name))))
 
 (defun gnus-select-newsgroup (group &optional read-all select-articles)
   "Select newsgroup GROUP.
@@ -5807,8 +5799,6 @@ If SELECT-ARTICLES, only select those articles from GROUP."
       (memq article gnus-newsgroup-forwarded))
      ((eq type 'seen)
       (not (memq article gnus-newsgroup-unseen)))
-     ((eq type 'recent)
-      (memq article gnus-newsgroup-recent))
      (t t))))
 
 (defun gnus-articles-to-read (group &optional read-all)
@@ -10985,8 +10975,6 @@ If NO-EXPIRE, auto-expiry will be inhibited."
           gnus-forwarded-mark)
          ((memq article gnus-newsgroup-saved)
           gnus-saved-mark)
-         ((memq article gnus-newsgroup-recent)
-          gnus-recent-mark)
          ((memq article gnus-newsgroup-unseen)
           gnus-unseen-mark)
          (t gnus-no-mark))
@@ -12594,12 +12582,16 @@ UNREAD is a sorted list."
     ;; Go through all these summary buffers and offer to save them.
     (when buffers
       (save-excursion
-        (map-y-or-n-p
-         "Update summary buffer %s? "
-         (lambda (buf)
-           (switch-to-buffer buf)
-           (gnus-summary-exit))
-         buffers)))))
+        (if (eq gnus-interactive-exit 'quiet)
+            (dolist (buffer buffers)
+              (switch-to-buffer buffer)
+              (gnus-summary-exit))
+          (map-y-or-n-p
+           "Update summary buffer %s? "
+           (lambda (buf)
+             (switch-to-buffer buf)
+             (gnus-summary-exit))
+           buffers))))))
 
 (defun gnus-summary-setup-default-charset ()
   "Setup newsgroup default charset."
diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el
index 34953611966..e9d6ba423fd 100644
--- a/lisp/gnus/gnus-util.el
+++ b/lisp/gnus/gnus-util.el
@@ -471,12 +471,13 @@ Cache the result as a text property stored in DATE."
       (setq i (* 2 i)))
     i))
 
-(defcustom gnus-verbose 7
+(defcustom gnus-verbose 6
   "*Integer that says how verbose Gnus should be.
 The higher the number, the more messages Gnus will flash to say what
 it's doing.  At zero, Gnus will be totally mute; at five, Gnus will
 display most important messages; and at ten, Gnus will keep on
 jabbering all the time."
+  :version "24.1"
   :group 'gnus-start
   :type 'integer)
 
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index 34759cee06f..924d974eb3c 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -1395,13 +1395,6 @@ non-numeric prefix - `C-u M-x gnus', in short."
   :type '(repeat string))
 (make-obsolete-variable 'gnus-secondary-servers 'gnus-select-method "24.1")
 
-(defcustom gnus-nntp-server nil
-  "The name of the host running the NNTP server."
-  :group 'gnus-server
-  :type '(choice (const :tag "disable" nil)
-                 string))
-(make-obsolete-variable 'gnus-nntp-server 'gnus-select-method "24.1")
-
 (defcustom gnus-secondary-select-methods nil
   "A list of secondary methods that will be used for reading news.
 This is a list where each element is a complete select method (see
@@ -1591,9 +1584,12 @@ commands will still require prompting."
   :type 'boolean)
 
 (defcustom gnus-interactive-exit t
-  "*If non-nil, require your confirmation when exiting Gnus."
+  "*If non-nil, require your confirmation when exiting Gnus.
+If `quiet', update any active summary buffers automatically
+first before exiting."
   :group 'gnus-exit
-  :type 'boolean)
+  :type '(choice boolean
+                 (const quiet)))
 
 (defcustom gnus-extract-address-components 'gnus-extract-address-components
   "*Function for extracting address components from a From header.
@@ -2623,7 +2619,7 @@ a string, be sure to use a valid format, see RFC 2616."
     (scored . score) (saved . save)
     (cached . cache) (downloadable . download)
     (unsendable . unsend) (forwarded . forward)
-    (recent . recent) (seen . seen)))
+    (seen . seen)))
 
 (defconst gnus-article-special-mark-lists
   '((seen range)
@@ -2689,8 +2685,7 @@ such as a mark that says whether an article is stored in the cache
                         gnus-newsrc-last-checked-date
                         gnus-newsrc-alist gnus-server-alist
                         gnus-killed-list gnus-zombie-list
-                        gnus-topic-topology gnus-topic-alist
-                        gnus-format-specs)
+                        gnus-topic-topology gnus-topic-alist)
   "Gnus variables saved in the quick startup file.")
 
 (defvar gnus-newsrc-alist nil
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 194ebf81873..f78e2b0339d 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -6329,7 +6329,7 @@ between beginning of field and beginning of line."
               (progn
                 (gnus-select-frame-set-input-focus (window-frame window))
                 (select-window window))
-            (funcall (or switch-function 'pop-to-buffer) buffer)
+            (funcall (or switch-function 'switch-to-buffer) buffer)
             (set-buffer buffer))
           (when (and (buffer-modified-p)
                      (not (prog1
@@ -6337,7 +6337,7 @@ between beginning of field and beginning of line."
                                "Message already being composed; erase? ")
                             (message nil))))
             (error "Message being composed")))
-      (funcall (or switch-function 'pop-to-buffer) name)
+      (funcall (or switch-function 'switch-to-buffer) name)
       (set-buffer name))
     (erase-buffer)
     (message-mode)))
@@ -7619,12 +7619,8 @@ you."
   "Like `message-mail' command, but display mail buffer in another window."
   (interactive)
   (unless (message-mail-user-agent)
-    (let ((pop-up-windows t)
-          (special-display-buffer-names nil)
-          (special-display-regexps nil)
-          (same-window-buffer-names nil)
-          (same-window-regexps nil))
-      (message-pop-to-buffer (message-buffer-name "mail" to))))
+    (message-pop-to-buffer (message-buffer-name "mail" to)
+                           'switch-to-buffer-other-window))
   (let ((message-this-is-mail t))
     (message-setup `((To . ,(or to "")) (Subject . ,(or subject "")))
                    nil nil nil 'switch-to-buffer-other-window)))
@@ -7634,12 +7630,8 @@ you."
   "Like `message-mail' command, but display mail buffer in another frame."
   (interactive)
   (unless (message-mail-user-agent)
-    (let ((pop-up-frames t)
-          (special-display-buffer-names nil)
-          (special-display-regexps nil)
-          (same-window-buffer-names nil)
-          (same-window-regexps nil))
-      (message-pop-to-buffer (message-buffer-name "mail" to))))
+    (message-pop-to-buffer (message-buffer-name "mail" to)
+                           'switch-to-buffer-other-frame))
   (let ((message-this-is-mail t))
     (message-setup `((To . ,(or to "")) (Subject . ,(or subject "")))
                    nil nil nil 'switch-to-buffer-other-frame)))
@@ -7648,12 +7640,8 @@ you."
 (defun message-news-other-window (&optional newsgroups subject)
   "Start editing a news article to be sent."
   (interactive)
-  (let ((pop-up-windows t)
-        (special-display-buffer-names nil)
-        (special-display-regexps nil)
-        (same-window-buffer-names nil)
-        (same-window-regexps nil))
-    (message-pop-to-buffer (message-buffer-name "posting" nil newsgroups)))
+  (message-pop-to-buffer (message-buffer-name "posting" nil newsgroups)
+                         'switch-to-buffer-other-window)
   (let ((message-this-is-news t))
     (message-setup `((Newsgroups . ,(or newsgroups ""))
                      (Subject . ,(or subject ""))))))
@@ -7662,12 +7650,8 @@ you."
 (defun message-news-other-frame (&optional newsgroups subject)
   "Start editing a news article to be sent."
   (interactive)
-  (let ((pop-up-frames t)
-        (special-display-buffer-names nil)
-        (special-display-regexps nil)
-        (same-window-buffer-names nil)
-        (same-window-regexps nil))
-    (message-pop-to-buffer (message-buffer-name "posting" nil newsgroups)))
+  (message-pop-to-buffer (message-buffer-name "posting" nil newsgroups)
+                         'switch-to-buffer-other-frame)
   (let ((message-this-is-news t))
     (message-setup `((Newsgroups . ,(or newsgroups ""))
                      (Subject . ,(or subject ""))))))
diff --git a/lisp/gnus/mm-encode.el b/lisp/gnus/mm-encode.el
index 055ba475b8e..0fb0e7a0795 100644
--- a/lisp/gnus/mm-encode.el
+++ b/lisp/gnus/mm-encode.el
@@ -97,6 +97,7 @@ This variable should never be set directly, but bound before a call to
     (insert "Content-Type: multipart/mixed; boundary=\"" boundary "\"\n")
     boundary))
 
+;;;###autoload
 (defun mm-default-file-encoding (file)
   "Return a default encoding for FILE."
   (if (not (string-match "\\.[^.]+$" file))
diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el
index 8b196fa26fc..e3939188a7b 100644
--- a/lisp/gnus/mml.el
+++ b/lisp/gnus/mml.el
@@ -897,6 +897,7 @@ If HANDLES is non-nil, use it instead reparsing the buffer."
 (autoload 'message-encode-message-body "message")
 (declare-function message-narrow-to-headers-or-head "message" ())
 
+;;;###autoload
 (defun mml-to-mime ()
   "Translate the current buffer from MML to MIME."
   ;; `message-encode-message-body' will insert an encoded Content-Description
@@ -1294,6 +1295,7 @@ to specify options."
   :version "22.1" ;; Gnus 5.10.9
   :group 'message)
 
+;;;###autoload
 (defun mml-attach-file (file &optional type description disposition)
   "Attach a file to the outgoing MIME message.
 The file is not inserted or encoded until you send the message with
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index 52c4b3c4290..d26df2395ec 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -168,6 +168,8 @@ textual parts.")
                    nnmail-extra-headers))))
 
 (deffoo nnimap-retrieve-headers (articles &optional group server fetch-old)
+  (when group
+    (setq group (nnimap-decode-gnus-group group)))
   (with-current-buffer nntp-server-buffer
     (erase-buffer)
     (when (nnimap-possibly-change-group group server)
@@ -190,7 +192,7 @@ textual parts.")
   (let (article bytes lines size string)
     (block nil
       (while (not (eobp))
-        (while (not (looking-at "\\* [0-9]+ FETCH.+UID \\([0-9]+\\)"))
+        (while (not (looking-at "\\* [0-9]+ FETCH.+?UID \\([0-9]+\\)"))
           (delete-region (point) (progn (forward-line 1) (point)))
           (when (eobp)
             (return)))
@@ -523,6 +525,8 @@ textual parts.")
   nnimap-status-string)
 
 (deffoo nnimap-request-article (article &optional group server to-buffer)
+  (when group
+    (setq group (nnimap-decode-gnus-group group)))
   (with-current-buffer nntp-server-buffer
     (let ((result (nnimap-possibly-change-group group server))
           parts structure)
@@ -554,6 +558,8 @@ textual parts.")
             (cons group article)))))))
 
 (deffoo nnimap-request-head (article &optional group server to-buffer)
+  (when group
+    (setq group (nnimap-decode-gnus-group group)))
   (when (nnimap-possibly-change-group group server)
     (with-current-buffer (nnimap-buffer)
       (when (stringp article)
@@ -700,7 +706,11 @@ textual parts.")
         (incf num)))
     (nreverse parts)))
 
+(defun nnimap-decode-gnus-group (group)
+  (decode-coding-string group 'utf-8))
+
 (deffoo nnimap-request-group (group &optional server dont-check info)
+  (setq group (nnimap-decode-gnus-group group))
   (let ((result (nnimap-possibly-change-group
                  ;; Don't SELECT the group if we're going to select it
                  ;; later, anyway.
@@ -750,16 +760,19 @@ textual parts.")
         t))))
 
 (deffoo nnimap-request-create-group (group &optional server args)
+  (setq group (nnimap-decode-gnus-group group))
   (when (nnimap-possibly-change-group nil server)
     (with-current-buffer (nnimap-buffer)
       (car (nnimap-command "CREATE %S" (utf7-encode group t))))))
 
 (deffoo nnimap-request-delete-group (group &optional force server)
+  (setq group (nnimap-decode-gnus-group group))
   (when (nnimap-possibly-change-group nil server)
     (with-current-buffer (nnimap-buffer)
       (car (nnimap-command "DELETE %S" (utf7-encode group t))))))
 
 (deffoo nnimap-request-rename-group (group new-name &optional server)
+  (setq group (nnimap-decode-gnus-group group))
   (when (nnimap-possibly-change-group nil server)
     (with-current-buffer (nnimap-buffer)
       (nnimap-unselect-group)
@@ -774,6 +787,7 @@ textual parts.")
   (nnimap-command "EXAMINE DOES.NOT.EXIST"))
 
 (deffoo nnimap-request-expunge-group (group &optional server)
+  (setq group (nnimap-decode-gnus-group group))
   (when (nnimap-possibly-change-group group server)
     (with-current-buffer (nnimap-buffer)
       (car (nnimap-command "EXPUNGE")))))
@@ -801,6 +815,7 @@ textual parts.")
 
 (deffoo nnimap-request-move-article (article group server accept-form
                                              &optional last internal-move-group)
+  (setq group (nnimap-decode-gnus-group group))
   (with-temp-buffer
     (mm-disable-multibyte)
     (when (funcall (if internal-move-group
@@ -829,6 +844,7 @@ textual parts.")
               result)))))))
 
 (deffoo nnimap-request-expire-articles (articles group &optional server force)
+  (setq group (nnimap-decode-gnus-group group))
   (cond
    ((null articles)
     nil)
@@ -956,6 +972,8 @@ textual parts.")
                                 "delete this article now"))))))
 
 (deffoo nnimap-request-scan (&optional group server)
+  (when group
+    (setq group (nnimap-decode-gnus-group group)))
   (when (and (nnimap-possibly-change-group nil server)
              nnimap-inbox
              nnimap-split-methods)
@@ -971,6 +989,7 @@ textual parts.")
     flags))
 
 (deffoo nnimap-request-update-group-status (group status &optional server)
+  (setq group (nnimap-decode-gnus-group group))
   (when (nnimap-possibly-change-group nil server)
     (let ((command (assoc
                     status
@@ -981,6 +1000,7 @@ textual parts.")
           (nnimap-command "%s %S" (cadr command) (utf7-encode group t)))))))
 
 (deffoo nnimap-request-set-mark (group actions &optional server)
+  (setq group (nnimap-decode-gnus-group group))
   (when (nnimap-possibly-change-group group server)
     (let (sequence)
       (with-current-buffer (nnimap-buffer)
@@ -1005,6 +1025,7 @@ textual parts.")
           (nnimap-wait-for-response sequence))))))
 
 (deffoo nnimap-request-accept-article (group &optional server last)
+  (setq group (nnimap-decode-gnus-group group))
   (when (nnimap-possibly-change-group nil server)
     (nnmail-check-syntax)
     (let ((message-id (message-field-value "message-id"))
@@ -1081,6 +1102,7 @@ textual parts.")
     result))
 
 (deffoo nnimap-request-replace-article (article group buffer)
+  (setq group (nnimap-decode-gnus-group group))
   (let (group-art)
     (when (and (nnimap-possibly-change-group group nil)
                ;; Put the article into the group.
@@ -1186,7 +1208,8 @@ textual parts.")
         ;; what and how to request the data.
         (dolist (info infos)
           (setq params (gnus-info-params info)
-                group (gnus-group-real-name (gnus-info-group info))
+                group (nnimap-decode-gnus-group
+                       (gnus-group-real-name (gnus-info-group info)))
                 active (cdr (assq 'active params))
                 uidvalidity (cdr (assq 'uidvalidity params))
                 modseq (cdr (assq 'modseq params)))
@@ -1262,13 +1285,15 @@ textual parts.")
                    (active (gnus-active group)))
               (when active
                 (insert (format "%S %d %d y\n"
-                                (gnus-group-real-name group)
+                                (decode-coding-string
+                                 (gnus-group-real-name group) 'utf-8)
                                 (cdr active)
                                 (car active)))))))))))
 
 (defun nnimap-update-infos (flags infos)
   (dolist (info infos)
-    (let* ((group (gnus-group-real-name (gnus-info-group info)))
+    (let* ((group (nnimap-decode-gnus-group
+                   (gnus-group-real-name (gnus-info-group info))))
            (marks (cdr (assoc group flags))))
       (when marks
         (nnimap-update-info info marks)))))
@@ -1570,6 +1595,8 @@ textual parts.")
                   (articles &optional limit force-new dependencies))
 
 (deffoo nnimap-request-thread (header &optional group server)
+  (when group
+    (setq group (nnimap-decode-gnus-group group)))
   (if gnus-refer-thread-use-nnir
       (nnir-search-thread header)
     (when (nnimap-possibly-change-group group server)
diff --git a/lisp/gnus/nnrss.el b/lisp/gnus/nnrss.el
index b12700fac64..3e3b7326f29 100644
--- a/lisp/gnus/nnrss.el
+++ b/lisp/gnus/nnrss.el
@@ -363,12 +363,13 @@ for decoding when the cdr that the data specify is not available.")
 
 (deffoo nnrss-retrieve-groups (groups &optional server)
   (dolist (group groups)
+    (setq group (nnrss-decode-group-name group))
     (nnrss-possibly-change-group group server)
     (nnrss-check-group group server))
   (with-current-buffer nntp-server-buffer
     (erase-buffer)
     (dolist (group groups)
-      (let ((elem (assoc group nnrss-server-data)))
+      (let ((elem (assoc (gnus-group-decoded-name group) nnrss-server-data)))
         (insert (format "%S %s 1 y\n" group (or (cadr elem) 0)))))
     'active))
 
diff --git a/lisp/gnus/plstore.el b/lisp/gnus/plstore.el
index 5f9a61aa843..ab78e508480 100644
--- a/lisp/gnus/plstore.el
+++ b/lisp/gnus/plstore.el
@@ -135,38 +135,38 @@ May either be a string or a list of strings.")
     (message "%s...%d%%" handback
              (if (> total 0) (floor (* (/ current (float total)) 100)) 0))))
 
-(defun plstore--get-buffer (this)
-  (aref this 0))
+(defun plstore--get-buffer (arg)
+  (aref arg 0))
 
-(defun plstore--get-alist (this)
-  (aref this 1))
+(defun plstore--get-alist (arg)
+  (aref arg 1))
 
-(defun plstore--get-encrypted-data (this)
-  (aref this 2))
+(defun plstore--get-encrypted-data (arg)
+  (aref arg 2))
 
-(defun plstore--get-secret-alist (this)
-  (aref this 3))
+(defun plstore--get-secret-alist (arg)
+  (aref arg 3))
 
-(defun plstore--get-merged-alist (this)
-  (aref this 4))
+(defun plstore--get-merged-alist (arg)
+  (aref arg 4))
 
-(defun plstore--set-buffer (this buffer)
-  (aset this 0 buffer))
+(defun plstore--set-buffer (arg buffer)
+  (aset arg 0 buffer))
 
-(defun plstore--set-alist (this plist)
-  (aset this 1 plist))
+(defun plstore--set-alist (arg plist)
+  (aset arg 1 plist))
 
-(defun plstore--set-encrypted-data (this encrypted-data)
-  (aset this 2 encrypted-data))
+(defun plstore--set-encrypted-data (arg encrypted-data)
+  (aset arg 2 encrypted-data))
 
-(defun plstore--set-secret-alist (this secret-alist)
-  (aset this 3 secret-alist))
+(defun plstore--set-secret-alist (arg secret-alist)
+  (aset arg 3 secret-alist))
 
-(defun plstore--set-merged-alist (this merged-alist)
-  (aset this 4 merged-alist))
+(defun plstore--set-merged-alist (arg merged-alist)
+  (aset arg 4 merged-alist))
 
-(defun plstore-get-file (this)
-  (buffer-file-name (plstore--get-buffer this)))
+(defun plstore-get-file (arg)
+  (buffer-file-name (plstore--get-buffer arg)))
 
 (defun plstore--make (&optional buffer alist encrypted-data secret-alist
                                 merged-alist)
diff --git a/lisp/help.el b/lisp/help.el
index 3ed6f79275a..ca8f76515cf 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -527,7 +527,7 @@ If INSERT (the prefix arg) is non-nil, insert the message in the buffer."
   (unless definition (error "No command"))
   (let ((func (indirect-function definition))
         (defs nil)
-        (standard-output (if insert (current-buffer) t)))
+        (standard-output (if insert (current-buffer) standard-output)))
     ;; In DEFS, find all symbols that are aliases for DEFINITION.
     (mapatoms (lambda (symbol)
                 (and (fboundp symbol)
@@ -625,7 +625,7 @@ temporarily enables it to allow getting help on disabled items and buttons."
                     (aref key 1)
                   (aref key 0)))
          (modifiers (event-modifiers event))
-         (standard-output (if insert (current-buffer) t))
+         (standard-output (if insert (current-buffer) standard-output))
          (mouse-msg (if (or (memq 'click modifiers) (memq 'down modifiers)
                             (memq 'drag modifiers)) " at that spot" ""))
          (defn (key-binding key t))
diff --git a/lisp/ielm.el b/lisp/ielm.el
index 4397ea0b413..94bb299eaac 100644
--- a/lisp/ielm.el
+++ b/lisp/ielm.el
@@ -553,8 +553,6 @@ Customized bindings may be defined in `ielm-map', which currently contains:
 
 ;;; User command
 
-;;;###autoload (add-hook 'same-window-buffer-names (purecopy "*ielm*"))
-
 ;;;###autoload
 (defun ielm nil
   "Interactively evaluate Emacs Lisp expressions.
@@ -565,7 +563,7 @@ Switches to the buffer `*ielm*', or creates it if it does not exist."
       (with-current-buffer (get-buffer-create "*ielm*")
         (unless (zerop (buffer-size)) (setq old-point (point)))
         (inferior-emacs-lisp-mode)))
-    (pop-to-buffer "*ielm*")
+    (switch-to-buffer "*ielm*")
     (when old-point (push-mark old-point))))
 
 (provide 'ielm)
diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index f75f4e20219..cffa2592aa1 100644
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -163,7 +163,7 @@ Stop if the left edge of the image is reached."
   (interactive "p")
   (image-forward-hscroll (- n)))
 
-(defun image-next-line (&optional n)
+(defun image-next-line (n)
   "Scroll image in current window upward by N lines.
 Stop if the bottom edge of the image is reached."
   (interactive "p")
diff --git a/lisp/info.el b/lisp/info.el
index 191e75f9750..40959885edb 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -610,10 +610,7 @@ in `Info-file-supports-index-cookies-list'."
   "Like `info' but show the Info buffer in another window."
   (interactive (if current-prefix-arg
                    (list (read-file-name "Info file name: " nil nil t))))
-  (let (same-window-buffer-names same-window-regexps)
-    (info file-or-node)))
-
-;;;###autoload (add-hook 'same-window-regexps (purecopy "\\*info\\*\\(\\|<[0-9]+>\\)"))
+  (info-setup file-or-node (switch-to-buffer-other-window "*info*")))
 
 ;;;###autoload (put 'info 'info-file (purecopy "emacs"))
 ;;;###autoload
@@ -643,7 +640,10 @@ See a list of available Info commands in `Info-mode'."
                     (read-file-name "Info file name: " nil nil t))
                 (if (numberp current-prefix-arg)
                     (format "*info*<%s>" current-prefix-arg))))
-  (pop-to-buffer (or buffer "*info*"))
+  (info-setup file-or-node (switch-to-buffer (or buffer "*info*"))))
+
+(defun info-setup (file-or-node buffer)
+  "Display Info node FILE-OR-NODE in BUFFER."
   (if (and buffer (not (eq major-mode 'Info-mode)))
       (Info-mode))
   (if file-or-node
@@ -775,7 +775,7 @@ it says do not attempt further (recursive) error recovery."
   (info-initialize)
   (setq filename (Info-find-file filename))
   ;; Go into Info buffer.
-  (or (eq major-mode 'Info-mode) (pop-to-buffer "*info*"))
+  (or (eq major-mode 'Info-mode) (switch-to-buffer "*info*"))
   ;; Record the node we are leaving, if we were in one.
   (and (not no-going-back)
        Info-current-file
@@ -809,7 +809,7 @@ otherwise, that defaults to `Top'."
   "Go to an Info node FILENAME and NODENAME, re-reading disk contents.
 When *info* is already displaying FILENAME and NODENAME, the window position
 is preserved, if possible."
-  (or (eq major-mode 'Info-mode) (pop-to-buffer "*info*"))
+  (or (eq major-mode 'Info-mode) (switch-to-buffer "*info*"))
   (let ((old-filename Info-current-file)
         (old-nodename Info-current-node)
         (old-buffer-name (buffer-name))
@@ -821,7 +821,7 @@ is preserved, if possible."
         (new-history  (and Info-current-file
                            (list Info-current-file Info-current-node (point)))))
     (kill-buffer (current-buffer))
-    (pop-to-buffer (or old-buffer-name "*info*"))
+    (switch-to-buffer (or old-buffer-name "*info*"))
     (Info-mode)
     (Info-find-node filename nodename)
     (setq Info-history-forward old-history-forward)
@@ -2021,7 +2021,7 @@ End of submatch 0, 1, and 3 are the same, so you can safely concat."
   (interactive)
   ;; In case another window is currently selected
   (save-window-excursion
-    (or (eq major-mode 'Info-mode) (pop-to-buffer "*info*"))
+    (or (eq major-mode 'Info-mode) (switch-to-buffer "*info*"))
     (Info-goto-node (Info-extract-pointer "next"))))
 
 (defun Info-prev ()
@@ -2029,7 +2029,7 @@ End of submatch 0, 1, and 3 are the same, so you can safely concat."
   (interactive)
   ;; In case another window is currently selected
   (save-window-excursion
-    (or (eq major-mode 'Info-mode) (pop-to-buffer "*info*"))
+    (or (eq major-mode 'Info-mode) (switch-to-buffer "*info*"))
     (Info-goto-node (Info-extract-pointer "prev[ious]*" "previous"))))
 
 (defun Info-up (&optional same-file)
@@ -2038,7 +2038,7 @@ If SAME-FILE is non-nil, do not move to a different Info file."
   (interactive)
   ;; In case another window is currently selected
   (save-window-excursion
-    (or (eq major-mode 'Info-mode) (pop-to-buffer "*info*"))
+    (or (eq major-mode 'Info-mode) (switch-to-buffer "*info*"))
     (let ((old-node Info-current-node)
           (old-file Info-current-file)
           (node (Info-extract-pointer "up")) p)
@@ -4775,7 +4775,7 @@ The INDENT level is ignored."
           (select-window bwin)
           (raise-frame (window-frame bwin)))
       (if speedbar-power-click
-          (let ((pop-up-frames t)) (select-window (display-buffer buff)))
+          (switch-to-buffer-other-frame buff)
         (speedbar-select-attached-frame)
         (switch-to-buffer buff)))
     (if (not (string-match "^(\\([^)]+\\))\\([^.]+\\)$" node))
@@ -4954,7 +4954,7 @@ type returned by `Info-bookmark-make-record', which see."
           (setq found buffer
                 blist nil))))
     (if found
-        (pop-to-buffer found)
+        (switch-to-buffer found)
       (info-initialize)
       (info (Info-find-file manual)))))
 
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 128fb86b7b4..3276447e72f 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -2914,10 +2914,6 @@ on encoding."
             (setq c (1+ c))))
         (setq ucs-names names))))
 
-(defvar ucs-completions (lazy-completion-table ucs-completions ucs-names)
-  "Lazy completion table for completing on Unicode character names.")
-(put 'ucs-completions 'risky-local-variable t)
-
 (defun read-char-by-name (prompt)
   "Read a character by its Unicode name or hex number string.
 Display PROMPT and read a string that represents a character by its
@@ -2935,7 +2931,12 @@ This function also accepts a hexadecimal number of Unicode code
 point or a number in hash notation, e.g. #o21430 for octal,
 #x2318 for hex, or #10r8984 for decimal."
   (let* ((completion-ignore-case t)
-         (input (completing-read prompt ucs-completions)))
+         (input (completing-read
+                 prompt
+                 (lambda (string pred action)
+                   (if (eq action 'metadata)
+                       '(metadata (category . unicode-name))
+                     (complete-with-action action (ucs-names) string pred))))))
     (cond
      ((string-match-p "^[0-9a-fA-F]+$" input)
       (string-to-number input 16))
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 7f54067f9aa..00ed9b4aed2 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1087,9 +1087,7 @@ The following additional command keys are active while editing.
 \\[isearch-nonincremental-exit-minibuffer] to do one nonincremental search.
 \\[isearch-forward-exit-minibuffer] to resume isearching forward.
 \\[isearch-reverse-exit-minibuffer] to resume isearching backward.
-\\[isearch-complete-edit] to complete the search string using the search ring.
-\\<isearch-mode-map>
-If first char entered is \\[isearch-yank-word-or-char], then do word search instead."
+\\[isearch-complete-edit] to complete the search string using the search ring."
 
   ;; This code is very hairy for several reasons, explained in the code.
   ;; Mainly, isearch-mode must be terminated while editing and then restarted.
@@ -1381,8 +1379,8 @@ Use `isearch-exit' to quit without signaling."
   "Start `query-replace' with string to replace from last search string.
 The arg DELIMITED (prefix arg if interactive), if non-nil, means replace
 only matches surrounded by word boundaries.  Note that using the prefix arg
-is possible only when `isearch-allow-scroll' is non-nil, and it don't
-always provides the correct matches for `query-replace', so the preferred
+is possible only when `isearch-allow-scroll' is non-nil, and it doesn't
+always provide the correct matches for `query-replace', so the preferred
 way to run word replacements from Isearch is `M-s w ... M-%'."
   (interactive
    (list current-prefix-arg))
diff --git a/lisp/mail/reporter.el b/lisp/mail/reporter.el
index 45700d4d60d..6c5448aca83 100644
--- a/lisp/mail/reporter.el
+++ b/lisp/mail/reporter.el
@@ -332,12 +332,11 @@ mail-sending package is used for editing and sending the message."
         hookvar)
     ;; do the work
     (require 'sendmail)
+    ;; Just in case the original buffer is not visible now, bring it
+    ;; back somewhere
+    (display-buffer reporter-eval-buffer)
     ;; If mailbuf did not get made visible before, make it visible now.
-    (let (same-window-buffer-names same-window-regexps)
-      (pop-to-buffer mailbuf)
-      ;; Just in case the original buffer is not visible now, bring it
-      ;; back somewhere
-      (and pop-up-windows (display-buffer reporter-eval-buffer)))
+    (pop-to-buffer mailbuf)
     (goto-char (point-min))
     (mail-position-on-field "to")
     (insert address)
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index ac07f07a76b..db06de9be76 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -91,6 +91,7 @@ its character representation and its display representation.")
 (defvar messages-head)
 (defvar total-messages)
 (defvar tool-bar-map)
+(defvar mail-encode-mml)
 
 (defvar rmail-header-style 'normal
   "The current header display style choice, one of
@@ -642,7 +643,7 @@ unless the feature specified by `rmail-mime-feature' is available."
   :version "23.3"
   :group 'rmail)
 
-(defvar rmail-enable-mime-composing nil
+(defvar rmail-enable-mime-composing t
   "*If non-nil, RMAIL uses `rmail-insert-mime-forwarded-message-function' to forward.")
 
 ;; FIXME unused.
@@ -3794,9 +3795,17 @@ see the documentation of `rmail-resend'."
             ;; Insert after header separator--before signature if any.
             (rfc822-goto-eoh)
             (forward-line 1)
-            (if (or rmail-enable-mime rmail-enable-mime-composing)
-                (funcall rmail-insert-mime-forwarded-message-function
-                         forward-buffer)
+            (if (and rmail-enable-mime rmail-enable-mime-composing)
+                (prog1
+                    (funcall rmail-insert-mime-forwarded-message-function
+                             forward-buffer)
+                  ;; rmail-insert-mime-forwarded-message-function
+                  ;; works by inserting MML tags into forward-buffer.
+                  ;; The MUA will need to convert it to MIME before
+                  ;; sending.  mail-encode-mml tells them to do that.
+                  ;; message.el does that automagically.
+                  (or (eq mail-user-agent 'message-user-agent)
+                      (setq mail-encode-mml t)))
               (insert "------- Start of forwarded message -------\n")
               ;; Quote lines with `- ' if they start with `-'.
               (let ((beg (point)) end)
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index cb02a4b374d..6bcf65945b5 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -307,6 +307,9 @@ The default value matches citations like `foo-bar>' plus whitespace."
     (define-key map [menu-bar mail]
       (cons "Mail" (make-sparse-keymap "Mail")))
 
+    (define-key map [menu-bar mail attachment]
+      '("Attach File" . mail-add-attachment))
+
     (define-key map [menu-bar mail fill]
       '("Fill Citation" . mail-fill-yanked-message))
 
@@ -562,11 +565,7 @@ To change your decision later, customize `send-mail-function'.\n")
                                     send-actions return-action
                                     &rest ignored)
   (if switch-function
-      (let ((special-display-buffer-names nil)
-            (special-display-regexps nil)
-            (same-window-buffer-names nil)
-            (same-window-regexps nil))
-        (funcall switch-function "*mail*")))
+      (funcall switch-function "*mail*"))
   (let ((cc (cdr (assoc-string "cc" other-headers t)))
         (in-reply-to (cdr (assoc-string "in-reply-to" other-headers t)))
         (body (cdr (assoc-string "body" other-headers t))))
@@ -678,6 +677,7 @@ switching to, the `*mail*' buffer.  See also `mail-setup-hook'."
   :options '(footnote-mode))
 
 (defvar mail-mode-abbrev-table text-mode-abbrev-table)
+(defvar mail-encode-mml)
 ;;;###autoload
 (define-derived-mode mail-mode text-mode "Mail"
   "Major mode for editing mail to be sent.
@@ -696,11 +696,15 @@ Here are commands that move to a header field (and create it if there isn't):
 \\[mail-signature]  mail-signature (insert `mail-signature-file' file).
 \\[mail-yank-original]  mail-yank-original (insert current message, in Rmail).
 \\[mail-fill-yanked-message]  mail-fill-yanked-message (fill what was yanked).
+\\[mail-insert-file] insert a text file into the message.
+\\[mail-add-attachment] attach to the message a file as binary attachment.
 Turning on Mail mode runs the normal hooks `text-mode-hook' and
 `mail-mode-hook' (in that order)."
   (make-local-variable 'mail-reply-action)
   (make-local-variable 'mail-send-actions)
   (make-local-variable 'mail-return-action)
+  (make-local-variable 'mail-encode-mml)
+  (setq mail-encode-mml nil)
   (setq buffer-offer-save t)
   (make-local-variable 'font-lock-defaults)
   (setq font-lock-defaults '(mail-font-lock-keywords t t))
@@ -862,6 +866,7 @@ header when sending a message to a mailing list."
   :type '(repeat string)
   :group 'sendmail)
 
+(declare-function mml-to-mime "mml" ())
 
 (defun mail-send ()
   "Send the message in the current buffer.
@@ -934,6 +939,9 @@ the user from the mailer."
               (error "Invalid header line (maybe a continuation line lacks initial whitespace)"))
             (forward-line 1)))
         (goto-char opoint)
+        (when mail-encode-mml
+          (mml-to-mime)
+          (setq mail-encode-mml nil))
         (run-hooks 'mail-send-hook)
         (message "Sending...")
         (funcall send-mail-function)
@@ -1688,7 +1696,7 @@ If the current line has `mail-yank-prefix', insert it on the new line."
   (split-line mail-yank-prefix))
 
 
-(defun mail-attach-file (&optional file)
+(defun mail-insert-file (&optional file)
   "Insert a file at the end of the buffer, with separator lines around it."
   (interactive "fAttach file: ")
   (save-excursion
@@ -1707,13 +1715,25 @@ If the current line has `mail-yank-prefix', insert it on the new line."
       (insert-file-contents file)
       (or (bolp) (newline))
       (goto-char start))))
+
+(define-obsolete-function-alias 'mail-attach-file 'mail-insert-file "24.1")
+
+(declare-function mml-attach-file "mml"
+                  (file &optional type description disposition))
+(declare-function mm-default-file-encoding "mm-encode" (file))
+
+(defun mail-add-attachment (file)
+  "Add FILE as a MIME attachment to the end of the mail message being composed."
+  (interactive "fAttach file: ")
+  (mml-attach-file file
+                   (or (mm-default-file-encoding file)
+                       "application/octet-stream") nil)
+  (setq mail-encode-mml t))
+
 
 ;; Put these commands last, to reduce chance of lossage from quitting
 ;; in middle of loading the file.
 
-;;;###autoload (add-hook 'same-window-buffer-names (purecopy "*mail*"))
-;;;###autoload (add-hook 'same-window-buffer-names (purecopy "*unsent mail*"))
-
 ;;;###autoload
 (defun mail (&optional noerase to subject in-reply-to cc replybuffer
                        actions return-action)
@@ -1765,11 +1785,11 @@ The seventh argument ACTIONS is a list of actions to take
  This is how Rmail arranges to mark messages `answered'."
   (interactive "P")
   (if (eq noerase 'new)
-      (pop-to-buffer (generate-new-buffer "*mail*"))
+      (switch-to-buffer (generate-new-buffer "*mail*"))
     (and noerase
          (not (get-buffer "*mail*"))
          (setq noerase nil))
-    (pop-to-buffer "*mail*"))
+    (switch-to-buffer "*mail*"))
 
   ;; Avoid danger that the auto-save file can't be written.
   (let ((dir (expand-file-name
@@ -1919,7 +1939,7 @@ you can move to one of them and type C-c C-c to recover that one."
                   (dired-noselect file-name
                                   (concat dired-listing-switches " -t"))))
              (save-selected-window
-               (select-window (display-buffer dispbuf t))
+               (switch-to-buffer-other-window dispbuf)
                (goto-char (point-min))
                (forward-line 2)
                (dired-move-to-filename)
@@ -1942,24 +1962,14 @@ you can move to one of them and type C-c C-c to recover that one."
 (defun mail-other-window (&optional noerase to subject in-reply-to cc replybuffer sendactions)
   "Like `mail' command, but display mail buffer in another window."
   (interactive "P")
-  (let ((pop-up-windows t)
-        (special-display-buffer-names nil)
-        (special-display-regexps nil)
-        (same-window-buffer-names nil)
-        (same-window-regexps nil))
-    (pop-to-buffer "*mail*"))
+  (switch-to-buffer-other-window "*mail*")
   (mail noerase to subject in-reply-to cc replybuffer sendactions))
 
 ;;;###autoload
 (defun mail-other-frame (&optional noerase to subject in-reply-to cc replybuffer sendactions)
   "Like `mail' command, but display mail buffer in another frame."
   (interactive "P")
-  (let ((pop-up-frames t)
-        (special-display-buffer-names nil)
-        (special-display-regexps nil)
-        (same-window-buffer-names nil)
-        (same-window-regexps nil))
-    (pop-to-buffer "*mail*"))
+  (switch-to-buffer-other-frame "*mail*")
   (mail noerase to subject in-reply-to cc replybuffer sendactions))
 
 ;; Do not add anything but external entries on this page.
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 51a087bc084..6a912cd6273 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -2141,6 +2141,16 @@ CHANNELS is a comma- or space-separated string of channel names."
       (dolist (b buffers) ;; order the new channel buffers in the buffer list
         (switch-to-buffer b)))))
 
+(defun-rcirc-command invite (nick-channel)
+  "Invite NICK to CHANNEL."
+  (interactive (list
+                (concat
+                 (completing-read "Invite nick: "
+                                  (with-rcirc-server-buffer rcirc-nick-table))
+                 " "
+                 (read-string "Channel: "))))
+  (rcirc-send-string process (concat "INVITE " nick-channel)))
+
 ;; TODO: /part #channel reason, or consider removing #channel altogether
 (defun-rcirc-command part (channel)
   "Part CHANNEL."
diff --git a/lisp/net/rlogin.el b/lisp/net/rlogin.el
index e2619e3bf79..effdcabfb65 100644
--- a/lisp/net/rlogin.el
+++ b/lisp/net/rlogin.el
@@ -125,8 +125,6 @@ this variable is set from that."
 
 
 
-;;;###autoload (add-hook 'same-window-regexps (purecopy "^\\*rlogin-.*\\*\\(\\|<[0-9]+>\\)"))
-
 (defvar rlogin-history nil)
 
 ;;;###autoload
@@ -196,7 +194,7 @@ variable."
           (t
            (setq buffer-name (generate-new-buffer-name buffer-name))))
     (setq buffer (get-buffer-create buffer-name))
-    (pop-to-buffer buffer-name)
+    (switch-to-buffer buffer-name)
     (unless (comint-check-proc buffer-name)
       (comint-exec buffer buffer-name rlogin-program nil args)
       (rlogin-mode)
diff --git a/lisp/net/telnet.el b/lisp/net/telnet.el
index d4850fed345..59850f68d44 100644
--- a/lisp/net/telnet.el
+++ b/lisp/net/telnet.el
@@ -190,8 +190,6 @@ rejecting one login and prompting again for a username and password.")
       (delete-region comint-last-input-start
                      comint-last-input-end)))
 
-;;;###autoload (add-hook 'same-window-regexps (purecopy "\\*telnet-.*\\*\\(\\|<[0-9]+>\\)"))
-
 ;;;###autoload
 (defun telnet (host &optional port)
   "Open a network login connection to host named HOST (a string).
@@ -219,8 +217,8 @@ Normally input is edited in Emacs and sent a line at a time."
          (telnet-options (if (cdr properties) (cons "-l" (cdr properties))))
          process)
     (if (and buffer (get-buffer-process buffer))
-        (pop-to-buffer (concat "*" name "*"))
-      (pop-to-buffer
+        (switch-to-buffer (concat "*" name "*"))
+      (switch-to-buffer
        (apply 'make-comint name telnet-program nil telnet-options))
       (setq process (get-buffer-process (current-buffer)))
       (set-process-filter process 'telnet-initial-filter)
@@ -246,8 +244,6 @@ Data is sent to the remote host when RET is typed."
   (set (make-local-variable 'comint-prompt-regexp) telnet-prompt-pattern)
   (set (make-local-variable 'comint-use-prompt-regexp) t))
 
-;;;###autoload (add-hook 'same-window-regexps (purecopy "\\*rsh-[^-]*\\*\\(\\|<[0-9]*>\\)"))
-
 ;;;###autoload
 (defun rsh (host)
   "Open a network login connection to host named HOST (a string).
@@ -256,7 +252,7 @@ Normally input is edited in Emacs and sent a line at a time."
   (interactive "sOpen rsh connection to host: ")
   (require 'shell)
   (let ((name (concat "rsh-" host )))
-    (pop-to-buffer (make-comint name remote-shell-program nil host))
+    (switch-to-buffer (make-comint name remote-shell-program nil host))
     (set-process-filter (get-process name) 'telnet-initial-filter)
     (telnet-mode)
     (setq telnet-count -16)))
diff --git a/lisp/paren.el b/lisp/paren.el
index 8bd96b9317a..fb5c0bf36e9 100644
--- a/lisp/paren.el
+++ b/lisp/paren.el
@@ -135,13 +135,23 @@ in `show-paren-style' after `show-paren-delay' seconds of Emacs idle time."
 ;; and show it until input arrives.
 (defun show-paren-function ()
   (if show-paren-mode
-      (let ((oldpos (point))
-            (dir (cond ((eq (syntax-class (syntax-after (1- (point)))) 5) -1)
-                       ((eq (syntax-class (syntax-after (point)))      4) 1)))
-            pos mismatch face)
+      (let* ((oldpos (point))
+             (dir (cond ((eq (syntax-class (syntax-after (1- (point)))) 5) -1)
+                        ((eq (syntax-class (syntax-after (point)))      4) 1)))
+             (unescaped
+              (when dir
+                ;; Verify an even number of quoting characters precede the paren.
+                ;; Follow the same logic as in `blink-matching-open'.
+                (= (if (= dir -1) 1 0)
+                   (logand 1 (- (point)
+                                (save-excursion
+                                  (if (= dir -1) (forward-char -1))
+                                  (skip-syntax-backward "/\\")
+                                  (point)))))))
+             pos mismatch face)
         ;;
         ;; Find the other end of the sexp.
-        (when dir
+        (when unescaped
           (save-excursion
             (save-restriction
               ;; Determine the range within which to look for a match.
diff --git a/lisp/play/doctor.el b/lisp/play/doctor.el
index 54a5a4ef6c9..b20f6968088 100644
--- a/lisp/play/doctor.el
+++ b/lisp/play/doctor.el
@@ -163,6 +163,7 @@ reads the sentence before point, and prints the Doctor's answer."
                  (you7re you\'re (i am))
                  (you7ve you\'ve (i have))
                  (you7ll you\'ll (i will)))))
+  (set (make-local-variable 'doctor-sent) nil)
   (set (make-local-variable 'doctor-found) nil)
   (set (make-local-variable 'doctor-owner) nil)
   (set (make-local-variable 'doctor--history) nil)
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index 4299c413312..eec63b4fa3b 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -1545,6 +1545,10 @@ initialization, then `awk-mode-hook'.
 
 Key bindings:
 \\{awk-mode-map}"
+  ;; We need the next line to stop the macro defining
+  ;; `awk-mode-syntax-table'.  This would mask the real table which is
+  ;; declared in cc-awk.el and hasn't yet been loaded.
+  :syntax-table nil
   (require 'cc-awk)                     ; Added 2003/6/10.
   (c-initialize-cc-mode t)
   (set-syntax-table awk-mode-syntax-table)
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index cd891a8df60..619c423902c 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -2408,9 +2408,8 @@ and overlay is highlighted between MK and END-MK."
                              ;; also do this while we change buffer
                              (compilation-set-window w msg)
                              compilation-highlight-regexp)))
-    ;; Ideally, the window-size should be passed to `display-buffer' (via
-    ;; something like special-display-buffer) so it's only used when
-    ;; creating a new window.
+    ;; Ideally, the window-size should be passed to `display-buffer'
+    ;; so it's only used when creating a new window.
     (unless pre-existing (compilation-set-window-height w))
 
     (if from-compilation-buffer
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index 87209a78ffb..a4d7cff4127 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/lisp/progmodes/gdb-mi.el
@@ -3980,18 +3980,12 @@ SPLIT-HORIZONTAL and show BUF in the new window."
 (defun gdb-frame-gdb-buffer ()
   "Display GUD buffer in a new frame."
   (interactive)
-  (let ((special-display-regexps (append special-display-regexps '(".*")))
-        (special-display-frame-alist
-         (remove '(menu-bar-lines) (remove '(tool-bar-lines)
-                                           gdb-frame-parameters)))
-        (same-window-regexps nil))
-    (display-buffer gud-comint-buffer)))
+  (display-buffer-other-frame gud-comint-buffer))
 
 (defun gdb-display-gdb-buffer ()
   "Display GUD buffer."
   (interactive)
-  (let ((same-window-regexps nil))
-    (select-window (display-buffer gud-comint-buffer nil 0))))
+  (pop-to-buffer gud-comint-buffer nil 0))
 
 (defun gdb-set-window-buffer (name &optional ignore-dedicated window)
   "Set buffer of selected window to NAME and dedicate window.
@@ -4012,7 +4006,7 @@ window is dedicated."
   (gdb-display-breakpoints-buffer)
   (delete-other-windows)
   ;; Don't dedicate.
-  (pop-to-buffer gud-comint-buffer)
+  (switch-to-buffer gud-comint-buffer)
   (let ((win0 (selected-window))
         (win1 (split-window nil ( / ( * (window-height) 3) 4)))
         (win2 (split-window nil ( / (window-height) 3)))
@@ -4071,7 +4065,7 @@ With arg, display additional buffers iff arg is positive."
   "Restore the basic arrangement of windows used by gdb.
 This arrangement depends on the value of `gdb-many-windows'."
   (interactive)
-  (pop-to-buffer gud-comint-buffer) ;Select the right window and frame.
+  (switch-to-buffer gud-comint-buffer) ;Select the right window and frame.
   (delete-other-windows)
   (if gdb-many-windows
       (gdb-setup-windows)
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index a54d1438368..25a23fed293 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -112,20 +112,9 @@ Used to grey out relevant toolbar icons.")
 (defun gud-goto-info ()
   "Go to relevant Emacs info node."
   (interactive)
-  (let ((same-window-regexps same-window-regexps)
-        (display-buffer-reuse-frames t))
-    (catch 'info-found
-      (walk-windows
-       (lambda (window)
-         (if (eq (window-buffer window) (get-buffer "*info*"))
-             (progn
-               (setq same-window-regexps nil)
-               (throw 'info-found nil))))
-       nil 0)
-      (select-frame (make-frame)))
-    (if (eq gud-minor-mode 'gdbmi)
-        (info "(emacs)GDB Graphical Interface")
-      (info "(emacs)Debuggers"))))
+  (if (eq gud-minor-mode 'gdbmi)
+      (info-other-window "(emacs)GDB Graphical Interface")
+    (info-other-window "(emacs)Debuggers")))
 
 (defun gud-tool-bar-item-visible-no-fringe ()
   (not (or (eq (buffer-local-value 'major-mode (window-buffer)) 'speedbar-mode)
@@ -2466,10 +2455,6 @@ comint mode, which see."
   (set (make-local-variable 'gud-delete-prompt-marker) (make-marker))
   (add-hook 'kill-buffer-hook 'gud-kill-buffer-hook nil t))
 
-;; Cause our buffers to be displayed, by default,
-;; in the selected window.
-;;;###autoload (add-hook 'same-window-regexps (purecopy "\\*gud-.*\\*\\(\\|<[0-9]+>\\)"))
-
 (defcustom gud-chdir-before-run t
   "Non-nil if GUD should `cd' to the debugged executable."
   :group 'gud
@@ -2511,7 +2496,7 @@ comint mode, which see."
                       file-subst)))
          (filepart (and file-word (concat "-" (file-name-nondirectory file))))
          (existing-buffer (get-buffer (concat "*gud" filepart "*"))))
-    (pop-to-buffer (concat "*gud" filepart "*"))
+    (switch-to-buffer (concat "*gud" filepart "*"))
     (when (and existing-buffer (get-buffer-process existing-buffer))
       (error "This program is already being debugged"))
     ;; Set the dir, in case the buffer already existed with a different dir.
diff --git a/lisp/progmodes/inf-lisp.el b/lisp/progmodes/inf-lisp.el
index e4e56054f9d..0765f74a1cf 100644
--- a/lisp/progmodes/inf-lisp.el
+++ b/lisp/progmodes/inf-lisp.el
@@ -297,8 +297,7 @@ of `inferior-lisp-program').  Runs the hooks from
                            "inferior-lisp" (car cmdlist) nil (cdr cmdlist)))
         (inferior-lisp-mode)))
   (setq inferior-lisp-buffer "*inferior-lisp*")
-  (pop-to-buffer "*inferior-lisp*"))
-;;;###autoload (add-hook 'same-window-buffer-names (purecopy "*inferior-lisp*"))
+  (switch-to-buffer "*inferior-lisp*"))
 
 ;;;###autoload
 (defalias 'run-lisp 'inferior-lisp)
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 3f923f496b9..38bf9552b2a 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -86,7 +86,6 @@
 (add-to-list 'interpreter-mode-alist (cons (purecopy "python") 'python-mode))
 ;;;###autoload
 (add-to-list 'auto-mode-alist (cons (purecopy "\\.py\\'")  'python-mode))
-(add-to-list 'same-window-buffer-names (purecopy "*Python*"))
 
 ;;;; Font lock
 
diff --git a/lisp/progmodes/scheme.el b/lisp/progmodes/scheme.el
index 470b309434c..66300d97621 100644
--- a/lisp/progmodes/scheme.el
+++ b/lisp/progmodes/scheme.el
@@ -442,9 +442,19 @@ that variable's value is a string."
 
 (defvar calculate-lisp-indent-last-sexp)
 
-;; Copied from lisp-indent-function, but with gets of
-;; scheme-indent-{function,hook}.
+
+;; FIXME this duplicates almost all of lisp-indent-function.
+;; Extract common code to a subroutine.
 (defun scheme-indent-function (indent-point state)
+  "Scheme mode function for the value of the variable `lisp-indent-function'.
+This behaves like the function `lisp-indent-function', except that:
+
+i) it checks for a non-nil value of the property `scheme-indent-function'
+\(or the deprecated `scheme-indent-hook'), rather than `lisp-indent-function'.
+
+ii) if that property specifies a function, it is called with three
+arguments (not two), the third argument being the default (i.e., current)
+indentation."
   (let ((normal-indent (current-column)))
     (goto-char (1+ (elt state 1)))
     (parse-partial-sexp (point) calculate-lisp-indent-last-sexp 0 t)
diff --git a/lisp/replace.el b/lisp/replace.el
index fb98a714dff..ee430fd9855 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -928,7 +928,7 @@ To return to ordinary Occur mode, use \\[occur-mode]."
 
 (defalias 'occur-mode-mouse-goto 'occur-mode-goto-occurrence)
 (defun occur-mode-goto-occurrence (&optional event)
-  "Go to the occurrence the current line describes."
+  "Go to the occurrence on the current line."
   (interactive (list last-nonmenu-event))
   (let ((pos
          (if (null event)
@@ -939,10 +939,8 @@ To return to ordinary Occur mode, use \\[occur-mode]."
            (with-current-buffer (window-buffer (posn-window (event-end event)))
              (save-excursion
                (goto-char (posn-point (event-end event)))
-               (occur-mode-find-occurrence)))))
-        same-window-buffer-names
-        same-window-regexps)
-    (pop-to-buffer (marker-buffer pos))
+               (occur-mode-find-occurrence))))))
+    (pop-to-buffer (marker-buffer pos) t)
     (goto-char pos)
     (run-hooks 'occur-mode-find-occurrence-hook)))
 
@@ -958,11 +956,8 @@ To return to ordinary Occur mode, use \\[occur-mode]."
   "Display in another window the occurrence the current line describes."
   (interactive)
   (let ((pos (occur-mode-find-occurrence))
-        window
-        ;; Bind these to ensure `display-buffer' puts it in another window.
-        same-window-buffer-names
-        same-window-regexps)
-    (setq window (display-buffer (marker-buffer pos)))
+        window)
+    (setq window (display-buffer (marker-buffer pos) t))
     ;; This is the way to set point in the proper window.
     (save-selected-window
       (select-window window)
diff --git a/lisp/shell.el b/lisp/shell.el
index 909ebb48afc..8c5781f9333 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -650,9 +650,9 @@ Otherwise, one argument `-i' is passed to the shell.
                 t shell-file-name))
               'localname))))
 
-  ;; Pop to buffer, so that the buffer's window will be correctly set
-  ;; when we call comint (so that comint sets the COLUMNS env var properly).
-  (pop-to-buffer buffer)
+  ;; The buffer's window must be correctly set when we call comint (so
+  ;; that comint sets the COLUMNS env var properly).
+  (switch-to-buffer buffer)
   (unless (comint-check-proc buffer)
     (let* ((prog (or explicit-shell-file-name
                      (getenv "ESHELL") shell-file-name))
@@ -669,9 +669,6 @@ Otherwise, one argument `-i' is passed to the shell.
       (shell-mode)))
   buffer)
 
-;; Don't do this when shell.el is loaded, only while dumping.
-;;;###autoload (add-hook 'same-window-buffer-names (purecopy "*shell*"))
-
 ;;; Directory tracking
 ;;
 ;; This code provides the shell mode input sentinel
diff --git a/lisp/simple.el b/lisp/simple.el
index 2d4f883f1ed..74343496c72 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -938,9 +938,10 @@ rather than line counts."
       (forward-line (1- line)))))
 
 (defun count-words-region (start end)
-  "Print the number of words in the region.
-When called interactively, the word count is printed in echo area."
-  (interactive "r")
+  "Count the number of words in the active region.
+If the region is not active, counts the number of words in the buffer."
+  (interactive (if (use-region-p) (list (region-beginning) (region-end))
+                 (list (point-min) (point-max))))
   (let ((count 0))
     (save-excursion
       (save-restriction
@@ -948,8 +949,10 @@ When called interactively, the word count is printed in echo area."
         (goto-char (point-min))
         (while (forward-word 1)
           (setq count (1+ count)))))
-    (if (called-interactively-p 'interactive)
-        (message "Region has %d words" count))
+    (when (called-interactively-p 'interactive)
+      (message "%s has %d words"
+               (if (use-region-p) "Region" "Buffer")
+               count))
     count))
 
 (defun count-lines-region (start end)
@@ -983,12 +986,12 @@ and the greater of them is not at the start of a line."
       (if (eq selective-display t)
           (save-match-data
             (let ((done 0))
-              (while (re-search-forward "[\n\C-m]" nil t 40)
-                (setq done (+ 40 done)))
-              (while (re-search-forward "[\n\C-m]" nil t 1)
-                (setq done (+ 1 done)))
-              (goto-char (point-max))
-              (if (and (/= start end)
+                     (while (re-search-forward "[\n\C-m]" nil t 40)
+                       (setq done (+ 40 done)))
+                     (while (re-search-forward "[\n\C-m]" nil t 1)
+                       (setq done (+ 1 done)))
+                     (goto-char (point-max))
+                     (if (and (/= start end)
                        (not (bolp)))
                   (1+ done)
                 done)))
@@ -5729,6 +5732,11 @@ else the end of the last line.  This function obeys RFC822."
          "^\\([:\n]\\|[^: \t\n]+[ \t\n]\\)" nil 'move)
     (goto-char (match-beginning 0))))
 
+;; Used by Rmail (e.g., rmail-forward).
+(defvar mail-encode-mml nil
+  "If non-nil, mail-user-agent's `sendfunc' command should mml-encode
+the outgoing message before sending it.")
+
 (defun compose-mail (&optional to subject other-headers continue
                      switch-function yank-action send-actions
                      return-action)
diff --git a/lisp/subr.el b/lisp/subr.el
index a2676b1173d..0d8797b6f63 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1747,7 +1747,7 @@ Return nil if there isn't one."
 
 (put 'eval-after-load 'lisp-indent-function 1)
 (defun eval-after-load (file form)
-  "Arrange that, if FILE is ever loaded, FORM will be run at that time.
+  "Arrange that if FILE is loaded, FORM will be run immediately afterwards.
 If FILE is already loaded, evaluate FORM right now.
 
 If a matching file is loaded again, FORM will be evaluated again.
@@ -1904,7 +1904,9 @@ Value is t if a query was formerly required."
     (or (not process)
         (not (memq (process-status process) '(run stop open listen)))
         (not (process-query-on-exit-flag process))
-        (yes-or-no-p "Buffer has a running process; kill it? "))))
+        (yes-or-no-p
+         (format "Buffer %S has a running process; kill it? "
+                 (buffer-name (current-buffer)))))))
 
 (add-hook 'kill-buffer-query-functions 'process-kill-buffer-query-function)
 
@@ -3249,7 +3251,9 @@ The value returned is the value of the last form in BODY."
 NUM specifies which parenthesized expression in the last regexp.
  Value is nil if NUMth pair didn't match, or there were less than NUM pairs.
 Zero means the entire text matched by the whole regexp or whole string.
-STRING should be given if the last search was by `string-match' on STRING."
+STRING should be given if the last search was by `string-match' on STRING.
+If STRING is nil, the current buffer should be the same buffer
+the search/match was performed in."
   (if (match-beginning num)
       (if string
           (substring string (match-beginning num) (match-end num))
@@ -3260,7 +3264,9 @@ STRING should be given if the last search was by `string-match' on STRING."
 NUM specifies which parenthesized expression in the last regexp.
  Value is nil if NUMth pair didn't match, or there were less than NUM pairs.
 Zero means the entire text matched by the whole regexp or whole string.
-STRING should be given if the last search was by `string-match' on STRING."
+STRING should be given if the last search was by `string-match' on STRING.
+If STRING is nil, the current buffer should be the same buffer
+the search/match was performed in."
   (if (match-beginning num)
       (if string
           (substring-no-properties string (match-beginning num)
diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el
index 0383251523f..3efb2f158c0 100644
--- a/lisp/textmodes/bibtex.el
+++ b/lisp/textmodes/bibtex.el
@@ -4038,10 +4038,8 @@ A prefix arg negates the value of `bibtex-search-entry-globally'."
                 ;; `bibtex-search-entry' moves point if key found
                 (setq found (bibtex-search-entry key)))))
         (cond ((and found display)
-               (let ((same-window-buffer-names
-                      (cons (buffer-name buffer) same-window-buffer-names)))
-                 (pop-to-buffer buffer)
-                 (bibtex-reposition-window)))
+               (switch-to-buffer buffer)
+               (bibtex-reposition-window))
               (found (set-buffer buffer))
               (display (message "Key `%s' not found" key)))
         found)
diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el
index e6837d0abde..4eb4efc3766 100644
--- a/lisp/textmodes/flyspell.el
+++ b/lisp/textmodes/flyspell.el
@@ -33,9 +33,6 @@
 ;; M-x flyspell-prog-mode.
 ;; In that mode only text inside comments is checked.
 ;;
-;; Note: consider setting the variable ispell-parser to `tex' to
-;; avoid TeX command checking; use `(setq ispell-parser 'tex)'.
-;;
 ;; Some user variables control the behavior of flyspell.  They are
 ;; those defined under the `User variables' comment.
 
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 5714179fcfe..8ad0a8ee43f 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,9 @@
+2011-09-13  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * url-http.el (url-http-find-free-connection): If there was an
+        error on connect, make sure the user isn't bothered with
+        irrelevant questions.
+
 2011-08-07  Chong Yidong  <cyd@stupidchicken.com>
 
         * url-http.el (url-http-parse-headers): For HTTP 301/302/307,
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index a21aed21436..0ba3aa2c5fe 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -180,6 +180,10 @@ request.")
                    ;; Drop the temp buffer link before killing the buffer.
                    (set-process-buffer proc nil))
                  proc)
+             ;; If there was an error on connect, make sure we don't
+             ;; get queried.
+             (when (get-buffer-process buf)
+               (set-process-query-on-exit-flag (get-buffer-process buf) nil))
              (kill-buffer buf)))))))
 
 ;; Building an HTTP request
diff --git a/lisp/wdired.el b/lisp/wdired.el
index f71979e2727..cc99bd40628 100644
--- a/lisp/wdired.el
+++ b/lisp/wdired.el
@@ -216,6 +216,8 @@ See `wdired-mode'."
        (buffer-substring (point-min) (point-max)))
   (set (make-local-variable 'wdired-old-point) (point))
   (set (make-local-variable 'query-replace-skip-read-only) t)
+  (set (make-local-variable 'isearch-filter-predicate)
+       'wdired-isearch-filter-read-only)
   (use-local-map wdired-mode-map)
   (force-mode-line-update)
   (setq buffer-read-only nil)
@@ -241,6 +243,11 @@ See `wdired-mode'."
                  "Press \\[wdired-finish-edit] when finished \
 or \\[wdired-abort-changes] to abort changes")))
 
+(defun wdired-isearch-filter-read-only (beg end)
+  "Skip matches that have a read-only property."
+  (and (isearch-filter-visible beg end)
+       (not (text-property-not-all (min beg end) (max beg end)
+                                   'read-only nil))))
 
 ;; Protect the buffer so only the filenames can be changed, and put
 ;; properties so filenames (old and new) can be easily found.
diff --git a/lisp/window.el b/lisp/window.el
index d771f9ffdcd..3a229a4e447 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -2258,40 +2258,10 @@ and no others."
         (next-window base-window (if nomini 'arg) all-frames))))
 
 ;;; Deleting windows.
-(defcustom window-auto-delete t
-  "If non-nil, quitting a window can delete the window.
-If this variable is t, functions that quit a window can delete
-the window and, if applicable, the corresponding frame.  If it is
-'frame, these functions can delete a window and its frame,
-provided there are no other windows on the frame.  If it is
-'window, these functions can delete the window, provided there
-are other windows on the corresponding frame.  If this variable
-is nil, functions that quit a window never delete the window or
-the associated frame.
-
-Note that a frame can be effectively deleted if and only if
-another frame still exists.
-
-Functions quitting a window and consequently affected by this
-variable are `switch-to-prev-buffer' including its callers like
-`bury-buffer', `replace-buffer-in-windows' and its callers like
-`kill-buffer', and `quit-window'."
-  :type '(choice
-          (const :tag "Always" t)
-          (const :tag "Window" window)
-          (const :tag "Frame" frame)
-          (const :tag "Never" nil))
-  :group 'windows)
-
-(defun window-deletable-p (&optional window force)
+(defun window-deletable-p (&optional window)
   "Return t if WINDOW can be safely deleted from its frame.
 Return `frame' if deleting WINDOW should also delete its
-frame.
-
-Optional argument FORCE non-nil means return non-nil unless
-WINDOW is the root window of the only visible frame.  FORCE nil
-or omitted means return nil unless WINDOW is either dedicated to
-its buffer or has no previous buffer to show instead."
+frame."
   (setq window (window-normalize-any-window window))
 
   (unless ignore-window-parameters
@@ -2301,32 +2271,18 @@ its buffer or has no previous buffer to show instead."
 
   (let* ((parent (window-parent window))
          (frame (window-frame window))
-         (buffer (window-buffer window))
-         (dedicated (and (window-buffer window) (window-dedicated-p window)))
-         ;; prev non-nil means there is another buffer we can show
-         ;; in WINDOW instead.
-         (prev (and (window-prev-buffers window)
-                    (or (cdr (window-prev-buffers window))
-                        (not (eq (caar (window-prev-buffers window))
-                                 buffer))))))
+         (buffer (window-buffer window)))
     (cond
      ((frame-root-window-p window)
-      (when (and (or force dedicated
-                     (and (not prev) (memq window-auto-delete '(t frame))))
-                 (other-visible-frames-p frame))
-        ;; We can delete WINDOW's frame if (1) either FORCE is non-nil,
-        ;; WINDOW is dedicated to its buffer, or there are no previous
-        ;; buffers to show and (2) there are other visible frames left.
+      ;; WINDOW's frame can be deleted only if there are other frames
+      ;; on the same terminal.
+      (unless (eq frame (next-frame frame 0))
         'frame))
-     ((and (or force dedicated
-               (and (not prev) (memq window-auto-delete '(t window))))
-           (or ignore-window-parameters
-               (not (eq (window-parameter window 'window-side) 'none))
-               (and parent
-                    (eq (window-parameter parent 'window-side) 'none))))
-      ;; We can delete WINDOW if (1) either FORCE is non-nil, WINDOW is
-      ;; dedicated to its buffer, or there are no previous buffers to
-      ;; show and (2) WINDOW is not the main window of its frame.
+     ((or ignore-window-parameters
+          (not (eq (window-parameter window 'window-side) 'none))
+          (and parent (eq (window-parameter parent 'window-side) 'none)))
+      ;; WINDOW can be deleted unless it is the main window of its
+      ;; frame.
       t))))
 
 (defun window-or-subwindow-p (subwindow window)
@@ -2594,84 +2550,75 @@ shall not be switched to in future invocations of this command."
          (old-buffer (window-buffer window))
          ;; Save this since it's destroyed by `set-window-buffer'.
          (next-buffers (window-next-buffers window))
-         entry new-buffer killed-buffers deletable visible)
-    (cond
-     ;; When BURY-OR-KILL is non-nil, there's no previous buffer for
-     ;; this window, and we can delete the window (or the frame) do
-     ;; that.
-     ((and bury-or-kill (setq deletable (window-deletable-p window)))
-      (if (eq deletable 'frame)
-          (delete-frame (window-frame window))
-        (delete-window window)))
-     ((window-dedicated-p window)
-      (error "Window %s is dedicated to buffer %s" window old-buffer)))
-
-    (unless deletable
-      (catch 'found
-        ;; Scan WINDOW's previous buffers first, skipping entries of next
-        ;; buffers.
-        (dolist (entry (window-prev-buffers window))
-          (when (and (setq new-buffer (car entry))
-                     (or (buffer-live-p new-buffer)
+         entry new-buffer killed-buffers visible)
+    (when (window-dedicated-p window)
+      (error "Window %s is dedicated to buffer %s" window old-buffer))
+
+    (catch 'found
+      ;; Scan WINDOW's previous buffers first, skipping entries of next
+      ;; buffers.
+      (dolist (entry (window-prev-buffers window))
+        (when (and (setq new-buffer (car entry))
+                   (or (buffer-live-p new-buffer)
+                       (not (setq killed-buffers
+                                  (cons new-buffer killed-buffers))))
+                   (not (eq new-buffer old-buffer))
+                   (or bury-or-kill
+                       (not (memq new-buffer next-buffers))))
+          (set-window-buffer-start-and-point
+           window new-buffer (nth 1 entry) (nth 2 entry))
+          (throw 'found t)))
+      ;; Scan reverted buffer list of WINDOW's frame next, skipping
+      ;; entries of next buffers.  Note that when we bury or kill a
+      ;; buffer we don't reverse the global buffer list to avoid showing
+      ;; a buried buffer instead.  Otherwise, we must reverse the global
+      ;; buffer list in order to make sure that switching to the
+      ;; previous/next buffer traverse it in opposite directions.
+      (dolist (buffer (if bury-or-kill
+                          (buffer-list (window-frame window))
+                        (nreverse (buffer-list (window-frame window)))))
+        (when (and (buffer-live-p buffer)
+                   (not (eq buffer old-buffer))
+                   (not (eq (aref (buffer-name buffer) 0) ?\s))
+                   (or bury-or-kill (not (memq buffer next-buffers))))
+          (if (get-buffer-window buffer)
+              ;; Try to avoid showing a buffer visible in some other window.
+              (setq visible buffer)
+            (setq new-buffer buffer)
+            (set-window-buffer-start-and-point window new-buffer)
+            (throw 'found t))))
+      (unless bury-or-kill
+        ;; Scan reverted next buffers last (must not use nreverse
+        ;; here!).
+        (dolist (buffer (reverse next-buffers))
+          ;; Actually, buffer _must_ be live here since otherwise it
+          ;; would have been caught in the scan of previous buffers.
+          (when (and (or (buffer-live-p buffer)
                          (not (setq killed-buffers
-                                    (cons new-buffer killed-buffers))))
-                     (not (eq new-buffer old-buffer))
-                     (or bury-or-kill
-                         (not (memq new-buffer next-buffers))))
-            (set-window-buffer-start-and-point
-             window new-buffer (nth 1 entry) (nth 2 entry))
-            (throw 'found t)))
-        ;; Scan reverted buffer list of WINDOW's frame next, skipping
-        ;; entries of next buffers.  Note that when we bury or kill a
-        ;; buffer we don't reverse the global buffer list to avoid showing
-        ;; a buried buffer instead.  Otherwise, we must reverse the global
-        ;; buffer list in order to make sure that switching to the
-        ;; previous/next buffer traverse it in opposite directions.
-        (dolist (buffer (if bury-or-kill
-                            (buffer-list (window-frame window))
-                          (nreverse (buffer-list (window-frame window)))))
-          (when (and (buffer-live-p buffer)
+                                    (cons buffer killed-buffers))))
                      (not (eq buffer old-buffer))
-                     (not (eq (aref (buffer-name buffer) 0) ?\s))
-                     (or bury-or-kill (not (memq buffer next-buffers))))
-            (if (get-buffer-window buffer)
-                ;; Try to avoid showing a buffer visible in some other window.
-                (setq visible buffer)
+                     (setq entry (assq buffer (window-prev-buffers window))))
             (setq new-buffer buffer)
-            (set-window-buffer-start-and-point window new-buffer)
+            (set-window-buffer-start-and-point
+             window new-buffer (nth 1 entry) (nth 2 entry))
             (throw 'found t))))
-        (unless bury-or-kill
-          ;; Scan reverted next buffers last (must not use nreverse
-          ;; here!).
-          (dolist (buffer (reverse next-buffers))
-            ;; Actually, buffer _must_ be live here since otherwise it
-            ;; would have been caught in the scan of previous buffers.
-            (when (and (or (buffer-live-p buffer)
-                           (not (setq killed-buffers
-                                      (cons buffer killed-buffers))))
-                       (not (eq buffer old-buffer))
-                       (setq entry (assq buffer (window-prev-buffers window))))
-              (setq new-buffer buffer)
-              (set-window-buffer-start-and-point
-               window new-buffer (nth 1 entry) (nth 2 entry))
-              (throw 'found t))))
-
-        ;; Show a buffer visible in another window.
-        (when visible
-          (setq new-buffer visible)
-          (set-window-buffer-start-and-point window new-buffer)))
-
-      (if bury-or-kill
-          ;; Remove `old-buffer' from WINDOW's previous and (restored list
-          ;; of) next buffers.
-          (progn
-            (set-window-prev-buffers
-             window (assq-delete-all old-buffer (window-prev-buffers window)))
-            (set-window-next-buffers window (delq old-buffer next-buffers)))
-        ;; Move `old-buffer' to head of WINDOW's restored list of next
-        ;; buffers.
-        (set-window-next-buffers
-         window (cons old-buffer (delq old-buffer next-buffers)))))
+
+      ;; Show a buffer visible in another window.
+      (when visible
+        (setq new-buffer visible)
+        (set-window-buffer-start-and-point window new-buffer)))
+
+    (if bury-or-kill
+        ;; Remove `old-buffer' from WINDOW's previous and (restored list
+        ;; of) next buffers.
+        (progn
+          (set-window-prev-buffers
+           window (assq-delete-all old-buffer (window-prev-buffers window)))
+          (set-window-next-buffers window (delq old-buffer next-buffers)))
+      ;; Move `old-buffer' to head of WINDOW's restored list of next
+      ;; buffers.
+      (set-window-next-buffers
+       window (cons old-buffer (delq old-buffer next-buffers))))
 
     ;; Remove killed buffers from WINDOW's previous and next buffers.
     (when killed-buffers
@@ -2816,8 +2763,9 @@ displayed there."
            ;; Don't iconify if it's the only frame.
            (not (eq (next-frame nil 0) (selected-frame))))
       (iconify-frame (window-frame (selected-window))))
-     ((window-deletable-p)
+     ((eq (window-deletable-p) t)
       (delete-window)))
+
     ;; Always return nil.
     nil))
 
@@ -2871,13 +2819,13 @@ frames left."
         (all-frames (cond ((not frame) t) ((eq frame t) nil) (t frame))))
     (dolist (window (window-list-1 nil nil all-frames))
       (if (eq (window-buffer window) buffer)
-          (let ((deletable (window-deletable-p window t)))
+          (let ((deletable (window-deletable-p window)))
             (cond
-             ((eq deletable 'frame)
-              ;; Delete frame.
+             ((and (eq deletable 'frame) (window-dedicated-p window))
+              ;; Delete frame if and only if window is dedicated.
               (delete-frame (window-frame window)))
-             (deletable
-              ;; Delete window only.
+             ((eq deletable t)
+              ;; Delete window.
               (delete-window window))
              (t
               ;; In window switch to previous buffer.
@@ -2902,7 +2850,8 @@ all window-local buffer lists."
   (let ((buffer (window-normalize-buffer buffer-or-name)))
     (dolist (window (window-list-1 nil nil t))
       (if (eq (window-buffer window) buffer)
-          (let ((deletable (window-deletable-p window)))
+          (let ((deletable (and (window-dedicated-p window)
+                                (window-deletable-p window))))
             (cond
              ((eq deletable 'frame)
               ;; Delete frame.
@@ -2931,13 +2880,21 @@ one.  If non-nil, reset `quit-restore' parameter to nil."
   (setq window (window-normalize-live-window window))
   (let ((buffer (window-buffer window))
         (quit-restore (window-parameter window 'quit-restore))
-        deletable resize)
+        resize)
     (cond
-     ((setq deletable (window-deletable-p window))
-      ;; Check if WINDOW's frame can be deleted.
-      (if (eq deletable 'frame)
-          (delete-frame (window-frame window))
-        (delete-window window))
+     ((and (eq (car-safe quit-restore) 'new-frame)
+           (eq (nth 1 quit-restore) (window-buffer window))
+           (eq (window-deletable-p window) 'frame))
+      ;; WINDOW's frame can be deleted.
+      (delete-frame (window-frame window))
+      ;; If the previously selected window is still alive, select it.
+      (when (window-live-p (nth 2 quit-restore))
+        (select-window (nth 2 quit-restore))))
+     ((and (eq (car-safe quit-restore) 'new-window)
+           (eq (nth 1 quit-restore) (window-buffer window))
+           (eq (window-deletable-p window) t))
+      ;; WINDOW's can be deleted.
+      (delete-window window)
       ;; If the previously selected window is still alive, select it.
       (when (window-live-p (nth 2 quit-restore))
         (select-window (nth 2 quit-restore))))
@@ -4497,53 +4454,80 @@ BUFFER-OR-NAME and return that buffer."
             buffer))
     (current-buffer)))
 
-(defvar display-buffer-alist nil
+(defconst display-buffer--action-function-custom-type
+  '(choice :tag "Function"
+           (const :tag "--" ignore) ; default for insertion
+           (const display-buffer--maybe-same-window)
+           (const display-buffer-reuse-window)
+           (const display-buffer--special)
+           (const display-buffer--maybe-pop-up-frame-or-window)
+           (const display-buffer-use-some-window)
+           (const display-buffer-same-window)
+           (const display-buffer-pop-up-frame)
+           (const display-buffer-use-some-window)
+           (function :tag "Other function"))
+  "Custom type for `display-buffer' action functions.")
+
+(defconst display-buffer--action-custom-type
+  `(cons :tag "Action"
+         (choice :tag "Action functions"
+                 ,display-buffer--action-function-custom-type
+                 (repeat
+                  :tag "List of functions"
+                  ,display-buffer--action-function-custom-type))
+         (alist :tag "Action arguments"
+                :key-type symbol
+                :value-type (sexp :tag "Value")))
+  "Custom type for `display-buffer' actions.")
+
+(defcustom display-buffer-alist nil
   "Alist of conditional actions for `display-buffer'.
 This is a list of elements (CONDITION . ACTION), where:
 
  CONDITION is either a regexp matching buffer names, or a function
   that takes a buffer and returns a boolean.
 
- ACTION is a cons cell (FUNCTION . ALIST), where FUNCTION is
-  either a function or a list of functions.  Each such function
-  should accept 2 arguments: a buffer to display and an alist of
-  the same form as ALIST.  It should return the window used, or
-  nil if it fails to display the window.  See `display-buffer'
-  for more details.
-
-Usable action functions include:
- `display-buffer-reuse-selected-window'
- `display-buffer-same-window'
- `display-buffer-maybe-same-window'
- `display-buffer-reuse-window'
- `display-buffer-pop-up-frame'
- `display-buffer-pop-up-window'
- `display-buffer-reuse-or-pop-window'
- `display-buffer-use-some-window'
+ ACTION is a cons cell (FUNCTION . ALIST), where FUNCTION is a
+  function or a list of functions.  Each such function should
+  accept 2 arguments: a buffer to display and an alist of the
+  same form as ALIST.  See `display-buffer' for details."
+  :type `(alist :key-type
+                (choice :tag "Condition"
+                        regexp
+                        (function :tag "Matcher function"))
+                :value-type ,display-buffer--action-custom-type)
+  :risky t
+  :version "24.1"
+  :group 'windows)
 
-The above functions recognize the following alist entries:
- - `inhibit-same-window', if non-nil, prevents the same window
-   from being used for display.
- - `reuse-frame' specifies the frames that can be searched for a
-   window displaying the buffer.  Its values have the same
-   meaning as the ALL-FRAMES arg to `get-buffer-window-list'.")
-
-(defvar display-buffer-default-action
-  '((display-buffer-reuse-selected-window
-     display-buffer-maybe-same-window
-     display-buffer-reuse-or-pop-window
+(defcustom display-buffer-default-action
+  '((display-buffer--maybe-same-window
+     display-buffer-reuse-window
+     display-buffer--special
+     display-buffer--maybe-pop-up-frame-or-window
      display-buffer-use-some-window
-     ;; If all else fails, pop up a new frame regardless of
-     ;; restrictions.
+     ;; If all else fails, pop up a new frame.
      display-buffer-pop-up-frame))
   "List of default actions for `display-buffer'.
-It should be a cons cell of the form (FUNCTION . ALIST), which
-has the same meaning as in `display-buffer-alist'.")
+It should be a cons cell (FUNCTION . ALIST), where FUNCTION is a
+function or a list of functions.  Each function should accept 2
+arguments: a buffer to display and an alist similar to ALIST.
+See `display-buffer' for details."
+  :type display-buffer--action-custom-type
+  :risky t
+  :version "24.1"
+  :group 'windows)
 
-(defvar display-buffer-overriding-action nil
+(defcustom display-buffer-overriding-action '(nil . nil)
   "Overriding action to perform to display a buffer.
-If non-nil, it should be a cons cell (FUNCTION . ALIST), which
-has the same meaning as in `display-buffer-alist'.")
+It should be a cons cell (FUNCTION . ALIST), where FUNCTION is a
+function or a list of functions.  Each function should accept 2
+arguments: a buffer to display and an alist similar to ALIST.
+See `display-buffer' for details."
+  :type display-buffer--action-custom-type
+  :risky t
+  :version "24.1"
+  :group 'windows)
 
 (defun display-buffer-assq-regexp (buffer-name alist)
   "Retrieve ALIST entry corresponding to BUFFER-NAME."
@@ -4557,8 +4541,23 @@ has the same meaning as in `display-buffer-alist'.")
                        (funcall key buffer-name alist)))
           (throw 'match (cdr entry)))))))
 
+(defvar display-buffer--same-window-action
+  '(display-buffer-same-window
+    (inhibit-same-window . nil))
+  "A `display-buffer' action for displaying in the same window.")
+(put 'display-buffer--same-window-action 'risky-local-variable t)
+
+(defvar display-buffer--other-frame-action
+  '((display-buffer-reuse-window
+     display-buffer--special
+     display-buffer-pop-up-frame)
+    (reusable-frames . 0)
+    (inhibit-same-window . t))
+  "A `display-buffer' action for displaying in another frame.")
+(put 'display-buffer--other-frame-action 'risky-local-variable t)
+
 (defun display-buffer (&optional buffer-or-name action frame)
-  "Display BUFFER-OR-NAME in some window.
+  "Display BUFFER-OR-NAME in some window, without selecting it.
 BUFFER-OR-NAME must be a buffer or the name of an existing
 buffer.  Return the window chosen for displaying BUFFER-OR-NAME,
 or nil if no such window is found.
@@ -4567,14 +4566,30 @@ Optional argument ACTION should have the form (FUNCTION . ALIST).
 FUNCTION is either a function or a list of functions.  Each such
 function is called with 2 arguments: the buffer to display and an
 alist.  It should either display the buffer and return the
-window, or return nil if it is unable to display the buffer.
+window, or return nil if unable to display the buffer.
+
+`display-buffer' builds a function list and an alist from
+`display-buffer-overriding-action', `display-buffer-alist',
+ACTION, and `display-buffer-default-action' (in that order).
+Then it calls each function in the combined function list in
+turn, passing the buffer as the first argument and the combined
+alist as the second argument, until a function returns non-nil.
 
-`display-buffer' constructs a list of action functions and an
-action alist by combining `display-buffer-overriding-action',
-`display-buffer-alist', the ACTION argument, and
-`display-buffer-default-action' (in that order).  It calls each
-action function in turn, passing the combined action alist as the
-second argument, until one of the functions returns non-nil.
+Available action functions include:
+ `display-buffer-same-window'
+ `display-buffer-reuse-window'
+ `display-buffer-pop-up-frame'
+ `display-buffer-pop-up-window'
+ `display-buffer-use-some-window'
+
+Recognized alist entries include:
+
+ `inhibit-same-window' -- A non-nil value prevents the same
+                          window from being used for display.
+
+ `reusable-frames' -- Value specifies frame(s) to search for a
+                      window that already displays the buffer.
+                      See `display-buffer-reuse-window'.
 
 The ACTION argument to `display-buffer' can also have a non-nil
 and non-list value.  This means to display the buffer in a window
@@ -4582,14 +4597,10 @@ other than the selected one, even if it is already displayed in
 the selected window.  If called interactively with a prefix
 argument, ACTION is t.
 
-Optional argument FRAME specifies where to look for a window that
-already displays the buffer.  If nil, check only the selected
-frame (actually the last non-minibuffer frame), except if
-`display-buffer-reuse-frames' or `pop-up-frames' is non-nil
-\(non-nil and not graphic-only on a text-only terminal), in which
-case check all visible or iconified frames.  Otherwise, FRAME can
-be a specific frame, `visible' (all visible frames), 0 (all
-frames on the current terminal), or t (all frames)."
+Optional argument FRAME, if non-nil, acts like an additional
+ALIST entry (reusable-frames . FRAME), specifying the frame(s) to
+search for a window that is already displaying the buffer.  See
+`display-buffer-reuse-window'."
   (interactive (list (read-buffer "Display buffer: " (other-buffer))
                      (if current-prefix-arg t)))
   (let ((buffer (window-normalize-buffer-to-display buffer-or-name))
@@ -4608,7 +4619,7 @@ frames on the current terminal), or t (all frames)."
               (cons nil (append (if inhibit-same-window
                                     '((inhibit-same-window . t)))
                                 (if frame
-                                    `((reuse-frame . ,frame))))))
+                                    `((reusable-frames . ,frame))))))
              ;; Construct action function list and action alist.
              (actions (list display-buffer-overriding-action
                             user-action action extra-action
@@ -4632,88 +4643,83 @@ frames on the current terminal), or t (all frames)."
 This uses the function `display-buffer' as a subroutine; see
 its documentation for additional customization information."
   (interactive "BDisplay buffer in other frame: ")
-  (let ((pop-up-frames t)
-        same-window-buffer-names same-window-regexps
-        ;;(old-window (selected-window))
-        new-window)
-    (setq new-window (display-buffer buffer t))
-    ;; This may have been here in order to prevent the new frame from hiding
-    ;; the old frame.  But it does more harm than good.
-    ;; Maybe we should call `raise-window' on the old-frame instead?  --Stef
-    ;;(lower-frame (window-frame new-window))
-
-    ;; This may have been here in order to make sure the old-frame gets the
-    ;; focus.  But not only can it cause an annoying flicker, with some
-    ;; window-managers it just makes the window invisible, with no easy
-    ;; way to recover it.  --Stef
-    ;;(make-frame-invisible (window-frame old-window))
-    ;;(make-frame-visible (window-frame old-window))
-    ))
+  (display-buffer buffer display-buffer--other-frame-action t))
 
 ;;; `display-buffer' action functions:
 
-(defun display-buffer-reuse-selected-window (buffer alist)
-  "Try to display BUFFER in the selected window if it is already there.
-If this succeeds, return the selected window.
-
-This fails if BUFFER is not displayed in the selected window, or
-if ALIST has a non-nil `inhibit-same-window' entry.  In that
-case, return nil."
-  (when (and (not (cdr (assq 'inhibit-same-window alist)))
-             (eq buffer (window-buffer)))
-    (display-buffer-record-window 'reuse-window (selected-window) buffer)
-    (window--display-buffer-1 (selected-window))))
-
 (defun display-buffer-same-window (buffer alist)
-  "Try to display BUFFER in the selected window.
-If this succeeds, return the selected window.
-
-This fails if the selected window is a minibuffer window or is
-dedicated to another buffer, or if ALIST has a non-nil
-`inhibit-same-window' entry.  In that case, return nil."
+  "Display BUFFER in the selected window.
+This fails if ALIST has a non-nil `inhibit-same-window' entry, or
+if the selected window is a minibuffer window or is dedicated to
+another buffer; in that case, return nil.  Otherwise, return the
+selected window."
   (unless (or (cdr (assq 'inhibit-same-window alist))
               (window-minibuffer-p)
               (window-dedicated-p))
     (display-buffer-record-window 'reuse-window (selected-window) buffer)
     (window--display-buffer-2 buffer (selected-window))))
 
-(defun display-buffer-maybe-same-window (buffer alist)
-  "Try to display BUFFER in the selected window.
-This acts like `display-buffer-same-window', except that it also
-fails if `same-window-p' returns nil for this buffer."
+(defun display-buffer--maybe-same-window (buffer alist)
+  "Conditionally display BUFFER in the selected window.
+If `same-window-p' returns non-nil for BUFFER's name, call
+`display-buffer-same-window' and return its value.  Otherwise,
+return nil."
   (and (same-window-p (buffer-name buffer))
        (display-buffer-same-window buffer alist)))
 
 (defun display-buffer-reuse-window (buffer alist)
   "Return a window that is already displaying BUFFER.
-If no usable window is found, return nil.
-
-If ALIST has a non-nil `inhibit-same-window' entry, the same
-window cannot be reused.
-
-If ALIST contains a `reuse-frame' entry, that determines the
-frames to check for a window displaying the buffer.  If the entry
-is omitted or the value is nil, check only this frame.  The value
-can also be a specific frame, `visible' (all visible frames),
-0 (all frames on the current terminal), or t (all frames)."
-  (let* ((can-use-selected-window
-          (not (cdr (assq 'inhibit-same-window alist))))
-         (frames (or (cdr (assq 'reuse-frame alist))
-                     (last-nonminibuffer-frame)))
-         (window (catch 'found
-                   (dolist (window (get-buffer-window-list
-                                    buffer 'nomini frames))
-                     (when (or can-use-selected-window
-                               (not (eq (selected-window) window)))
-                       (throw 'found window))))))
+Return nil if no usable window is found.
+
+If ALIST has a non-nil `inhibit-same-window' entry, the selected
+window is not eligible for reuse.
+
+If ALIST contains a `reusable-frames' entry, its value determines
+which frames to search for a reusable window:
+  nil -- the selected frame (actually the last non-minibuffer frame)
+  A frame   -- just that frame
+  `visible' -- all visible frames
+  0   -- all frames on the current terminal
+  t   -- all frames.
+
+If ALIST contains no `reusable-frames' entry, search just the
+selected frame if `display-buffer-reuse-frames' and
+`pop-up-frames' are both nil; search all frames on the current
+terminal if either of those variables is non-nil."
+  (let* ((alist-entry (assq 'reusable-frames alist))
+         (frames (cond (alist-entry (cdr alist-entry))
+                       ((if (eq pop-up-frames 'graphic-only)
+                            (display-graphic-p)
+                          pop-up-frames)
+                        0)
+                       (display-buffer-reuse-frames 0)
+                       (t (last-nonminibuffer-frame))))
+         (window (if (and (eq buffer (window-buffer))
+                          (not (cdr (assq 'inhibit-same-window alist))))
+                     (selected-window)
+                   (car (delq (selected-window)
+                              (get-buffer-window-list buffer 'nomini
+                                                      frames))))))
     (when window
       (display-buffer-record-window 'reuse-window window buffer)
       (window--display-buffer-1 window))))
 
+(defun display-buffer--special (buffer alist)
+  "Try to display BUFFER using `special-display-function'.
+Call `special-display-p' on BUFFER's name, and if that returns
+non-nil, call `special-display-function' on BUFFER."
+  (and special-display-function
+       ;; `special-display-p' returns either t or a list of frame
+       ;; parameters to pass to `special-display-function'.
+       (let ((pars (special-display-p (buffer-name buffer))))
+         (when pars
+           (funcall special-display-function
+                    buffer (if (listp pars) pars))))))
+
 (defun display-buffer-pop-up-frame (buffer alist)
   "Display BUFFER in a new frame.
-This works by calling `pop-up-frame-function'.  If sucessful,
-return the window on the new frame; otherwise return nil."
+This works by calling `pop-up-frame-function'.  If successful,
+return the window used; otherwise return nil."
   (let ((fun pop-up-frame-function)
         frame window)
     (when (and fun
@@ -4751,42 +4757,20 @@ If sucessful, return the new window; otherwise return nil."
       (set-window-prev-buffers window nil)
       window)))
 
-;; This display action function groups together some lower-level ones:
-(defun display-buffer-reuse-or-pop-window (buffer alist)
-  "Display BUFFER in some window other than the selected one.
-This attempts to call the following functions (in order):
- - `display-buffer-reuse-window', ensuring that it checks all
-   frames on this terminal if `display-buffer-reuse-frames' or
-   `pop-up-frames' is non-nil.
- - `special-display-function', if it is available.
- - `display-buffer-pop-up-frame', if specified by `pop-up-frames'.
- - `display-buffer-pop-up-window', if specified by `pop-up-windows'.
-
-If BUFFER is sucessfully display, return its window; otherwise
-return nil."
-  (let ((use-pop-up-frames (if (eq pop-up-frames 'graphic-only)
-                               (display-graphic-p)
-                             pop-up-frames)))
-    (or (display-buffer-reuse-window
-         buffer
-         ;; If `display-buffer-reuse-frames' or `pop-up-frames' is
-         ;; non-nil, check all frames on this terminal.
-         (if (and (null (cdr (assq 'reuse-frame alist)))
-                  (or use-pop-up-frames display-buffer-reuse-frames))
-             (cons '(reuse-frame . 0) alist)
-           alist))
-        ;; Try with `special-display-function':
-        (and special-display-function
-             ;; `special-display-p' returns either t or a list of frame
-             ;; parameters to pass to `special-display-function'.
-             (let ((pars (special-display-p (buffer-name buffer))))
-               (when pars
-                 (funcall special-display-function
-                          buffer (if (listp pars) pars)))))
-        (and use-pop-up-frames
-             (display-buffer-pop-up-frame buffer alist))
-        (and pop-up-windows
-             (display-buffer-pop-up-window buffer alist)))))
+(defun display-buffer--maybe-pop-up-frame-or-window (buffer alist)
+  "Try displaying BUFFER based on `pop-up-frames' or `pop-up-windows'.
+
+If `pop-up-frames' is non-nil (and not `graphic-only' on a
+text-only terminal), try with `display-buffer-pop-up-frame'.
+
+If that cannot be done, and `pop-up-windows' is non-nil, try
+again with `display-buffer-pop-up-window'."
+  (or (and (if (eq pop-up-frames 'graphic-only)
+               (display-graphic-p)
+             pop-up-frames)
+           (display-buffer-pop-up-frame buffer alist))
+      (and pop-up-windows
+           (display-buffer-pop-up-window buffer alist))))
 
 (defun display-buffer-use-some-window (buffer alist)
   "Display BUFFER in an existing window.
@@ -4802,10 +4786,7 @@ return the window.  If no suitable window is found, return nil."
                (selected-window)))
          (frame (or (window--frame-usable-p (selected-frame))
                     (window--frame-usable-p (last-nonminibuffer-frame))))
-         (use-pop-up-frames (if (eq pop-up-frames 'graphic-only)
-                                (display-graphic-p)
-                              pop-up-frames))
-         window popped-up-frame)
+         window)
     (unwind-protect
         (setq window
               ;; Reuse an existing window.
@@ -4819,17 +4800,12 @@ return the window.  If no suitable window is found, return nil."
                     (unless (and not-this-window
                                  (eq window (selected-window)))
                       window))
-                  (get-largest-window 0)
-                  (and use-pop-up-frames
-                       (prog1
-                           (frame-selected-window (funcall pop-up-frame-function))
-                         (setq popped-up-frame t)))))
+                  (get-largest-window 0)))
       (when (window-live-p window-to-undedicate)
         ;; Restore dedicated status of selected window.
         (set-window-dedicated-p window-to-undedicate nil)))
     (when window
-      (display-buffer-record-window
-       (if popped-up-frame 'pop-up-frame 'reuse-window) window buffer)
+      (display-buffer-record-window 'reuse-window window buffer)
       (window--even-window-heights window)
       (window--display-buffer-2 buffer window))))
 
@@ -4856,13 +4832,11 @@ Optional third arg NORECORD non-nil means do not put this buffer
 at the front of the list of recently selected ones."
   (interactive (list (read-buffer "Pop to buffer: " (other-buffer))
                      (if current-prefix-arg t)))
-  (setq buffer (window-normalize-buffer-to-display
-                ;; BUFFER nil means another buffer.
-                (or buffer (other-buffer))))
+  (setq buffer (window-normalize-buffer-to-switch-to buffer))
   (set-buffer buffer)
   (let* ((old-window (selected-window))
          (old-frame (selected-frame))
-         (window (display-buffer (current-buffer) action))
+         (window (display-buffer buffer action))
          (frame (window-frame window)))
     (if (eq frame old-frame)
         ;; Make sure new window is selected (Bug#8615), (Bug#6954).
@@ -4936,18 +4910,7 @@ Return the buffer switched to."
    (list (read-buffer-to-switch "Switch to buffer: ") nil nil))
   (let ((buffer (window-normalize-buffer-to-switch-to buffer-or-name)))
     (if (null force-same-window)
-        (cond
-         ((eq buffer (window-buffer))
-          (unless norecord
-            (select-window (selected-window)))
-          (set-buffer buffer))
-         ((or (window-minibuffer-p) (window-dedicated-p))
-          (pop-to-buffer buffer))
-         (t
-          (set-window-buffer nil buffer)
-          (unless norecord
-            (select-window (selected-window)))
-          (set-buffer buffer)))
+        (pop-to-buffer buffer display-buffer--same-window-action norecord)
       (cond
        ;; Don't call set-window-buffer if it's not needed since it
        ;; might signal an error (e.g. if the window is dedicated).
@@ -4983,10 +4946,8 @@ This uses the function `display-buffer' as a subroutine; see its
 documentation for additional customization information."
   (interactive
    (list (read-buffer-to-switch "Switch to buffer in other window: ")))
-  (let ((buffer (window-normalize-buffer-to-switch-to buffer-or-name))
-        (pop-up-windows t)
-        same-window-buffer-names same-window-regexps)
-    (pop-to-buffer buffer t norecord)))
+  (let ((pop-up-windows t))
+    (pop-to-buffer buffer-or-name t norecord)))
 
 (defun switch-to-buffer-other-frame (buffer-or-name &optional norecord)
   "Switch to buffer BUFFER-OR-NAME in another frame.
@@ -5009,10 +4970,7 @@ This uses the function `display-buffer' as a subroutine; see its
 documentation for additional customization information."
   (interactive
    (list (read-buffer-to-switch "Switch to buffer in other frame: ")))
-  (let ((buffer (window-normalize-buffer-to-switch-to buffer-or-name))
-        (pop-up-frames t)
-        same-window-buffer-names same-window-regexps)
-    (pop-to-buffer buffer t norecord)))
+  (pop-to-buffer buffer-or-name display-buffer--other-frame-action norecord))
 
 (defun set-window-text-height (window height)
   "Set the height in lines of the text display area of WINDOW to HEIGHT.
diff --git a/lisp/woman.el b/lisp/woman.el
index c6bd4a4c8d1..75a36d6ac36 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -2621,15 +2621,27 @@ If DELETE is non-nil then delete from point."
     ;; Process matching .el anything:
     (cond ((string= request "ie")
            ;; Discard unless previous .ie c `evaluated to false'.
+           ;; IIUC, an .ie must be followed by an .el.
+           ;; (An if with no else uses .if rather than .ie.)
+           ;; TODO warn if no .el found?
+           ;; The .el should come immediately after the .ie (modulo
+           ;; comments etc), but this searches to eob.
            (cond ((re-search-forward "^[.'][ \t]*el[ \t]*" nil t)
                   (woman-delete-match 0)
                   (woman-if-body "el" nil (not delete)))))
+;;; FIXME neither the comment nor the code here make sense to me.
+;;; This branch was executed for an else (any else, AFAICS).
+;;; At this point, the else in question has already been processed above.
+;;; The re-search will find the _next_ else, if there is one, and
+;;; delete it.  If there is one, it belongs to another if block.  (Bug#9447)
+;;; woman0-el does not need this bit either.
           ;; Got here after processing a single-line `.ie' as a body
           ;; clause to be discarded:
-          ((string= request "el")
-           (cond ((re-search-forward "^[.'][ \t]*el[ \t]*" nil t)
-                  (woman-delete-match 0)
-                  (woman-if-body "el" nil t)))))
+;;;       ((string= request "el")
+;;;        (cond ((re-search-forward "^[.'][ \t]*el[ \t]*" nil t)
+;;;               (woman-delete-match 0)
+;;;               (woman-if-body "el" nil t)))))
+          )
     (goto-char from)))
 
 (defun woman0-el ()
@@ -2925,11 +2937,15 @@ interpolated by `\*x' and `\*(xx' escapes."
     ("bv" "|")                          ; bold vertical
 
     ;; groff etc. extensions:
+    ;; List these via eg man -Tdvi groff_char > groff_char.dvi.
     ("lq" "\"")
     ("rq" "\"")
     ("aq" "'")
     ("ha" "^")
     ("ti" "~")
+    ("oq" "‘")                          ; u2018
+    ("cq" "’")                          ; u2019
+    ("hy" "‐")                          ; u2010
     )
   "Alist of special character codes with ASCII and extended-font equivalents.
 Each alist elements has the form
@@ -4582,4 +4598,9 @@ logging the message."
 
 (provide 'woman)
 
+
+;; Local Variables:
+;; coding: utf-8
+;; End:
+
 ;;; woman.el ends here
diff --git a/m4/include_next.m4 b/m4/include_next.m4
index ebf081a1101..14a1009b5d4 100644
--- a/m4/include_next.m4
+++ b/m4/include_next.m4
@@ -1,4 +1,4 @@
-# include_next.m4 serial 20
+# include_next.m4 serial 21
 dnl Copyright (C) 2006-2011 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -207,17 +207,34 @@ dnl until we can assume autoconf 2.64 or newer.
                  aix*) gl_absname_cpp="$ac_cpp -C" ;;
                  *)    gl_absname_cpp="$ac_cpp" ;;
                esac
+changequote(,)
+               case "$host_os" in
+                 mingw*)
+                   dnl For the sake of native Windows compilers (excluding gcc),
+                   dnl treat backslash as a directory separator, like /.
+                   dnl Actually, these compilers use a double-backslash as
+                   dnl directory separator, inside the
+                   dnl   # line "filename"
+                   dnl directives.
+                   gl_dirsep_regex='[/\\]'
+                   ;;
+                 *)
+                   gl_dirsep_regex='/'
+                   ;;
+               esac
+changequote([,])
+               gl_absolute_header_sed='\#'"${gl_dirsep_regex}"']m4_defn([gl_HEADER_NAME])[#{
+                   s#.*"\(.*'"${gl_dirsep_regex}"']m4_defn([gl_HEADER_NAME])[\)".*#\1#
+                   s#^/[^/]#//&#
+                   p
+                   q
+                 }'
                dnl eval is necessary to expand gl_absname_cpp.
                dnl Ultrix and Pyramid sh refuse to redirect output of eval,
                dnl so use subshell.
                AS_VAR_SET(gl_next_header,
                  ['"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD |
-                  sed -n '\#/]m4_defn([gl_HEADER_NAME])[#{
-                    s#.*"\(.*/]m4_defn([gl_HEADER_NAME])[\)".*#\1#
-                    s#^/[^/]#//&#
-                    p
-                    q
-                  }'`'"'])
+                      sed -n "$gl_absolute_header_sed"`'"'])
           m4_if([$2], [check],
             [else
                AS_VAR_SET(gl_next_header, ['<'gl_HEADER_NAME'>'])
diff --git a/m4/nocrash.m4 b/m4/nocrash.m4
index 0cc0d53ebf7..60aad952956 100644
--- a/m4/nocrash.m4
+++ b/m4/nocrash.m4
@@ -1,4 +1,4 @@
-# nocrash.m4 serial 2
+# nocrash.m4 serial 3
 dnl Copyright (C) 2005, 2009-2011 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -79,6 +79,34 @@ nocrash_init (void)
     }
   }
 }
+#elif (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+/* Avoid a crash on native Windows.  */
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <winerror.h>
+static LONG WINAPI
+exception_filter (EXCEPTION_POINTERS *ExceptionInfo)
+{
+  switch (ExceptionInfo->ExceptionRecord->ExceptionCode)
+    {
+    case EXCEPTION_ACCESS_VIOLATION:
+    case EXCEPTION_IN_PAGE_ERROR:
+    case EXCEPTION_STACK_OVERFLOW:
+    case EXCEPTION_GUARD_PAGE:
+    case EXCEPTION_PRIV_INSTRUCTION:
+    case EXCEPTION_ILLEGAL_INSTRUCTION:
+    case EXCEPTION_DATATYPE_MISALIGNMENT:
+    case EXCEPTION_ARRAY_BOUNDS_EXCEEDED:
+    case EXCEPTION_NONCONTINUABLE_EXCEPTION:
+      exit (1);
+    }
+  return EXCEPTION_CONTINUE_SEARCH;
+}
+static void
+nocrash_init (void)
+{
+  SetUnhandledExceptionFilter ((LPTOP_LEVEL_EXCEPTION_FILTER) exception_filter);
+}
 #else
 /* Avoid a crash on POSIX systems.  */
 #include <signal.h>
diff --git a/m4/signal_h.m4 b/m4/signal_h.m4
index b9536fb0e3c..c3f25386ca2 100644
--- a/m4/signal_h.m4
+++ b/m4/signal_h.m4
@@ -1,4 +1,4 @@
-# signal_h.m4 serial 16
+# signal_h.m4 serial 17
 dnl Copyright (C) 2007-2011 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -17,6 +17,9 @@ AC_DEFUN([gl_SIGNAL_H],
 #include <signal.h>
     ]])
 
+  dnl Ensure the type pid_t gets defined.
+  AC_REQUIRE([AC_TYPE_PID_T])
+
   AC_REQUIRE([AC_TYPE_UID_T])
 
   dnl Persuade glibc <signal.h> to define sighandler_t.
diff --git a/m4/time_h.m4 b/m4/time_h.m4
index 615da1cfd39..6e6394fdc90 100644
--- a/m4/time_h.m4
+++ b/m4/time_h.m4
@@ -2,7 +2,7 @@
 
 # Copyright (C) 2000-2001, 2003-2007, 2009-2011 Free Software Foundation, Inc.
 
-# serial 4
+# serial 5
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -23,6 +23,9 @@ AC_DEFUN([gl_HEADER_TIME_H_BODY],
   AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS])
   gl_NEXT_HEADERS([time.h])
   AC_REQUIRE([gl_CHECK_TYPE_STRUCT_TIMESPEC])
+
+  dnl Ensure the type pid_t gets defined.
+  AC_REQUIRE([AC_TYPE_PID_T])
 ])
 
 dnl Define HAVE_STRUCT_TIMESPEC if `struct timespec' is declared
diff --git a/m4/unistd_h.m4 b/m4/unistd_h.m4
index fb6fe077265..6483b815d60 100644
--- a/m4/unistd_h.m4
+++ b/m4/unistd_h.m4
@@ -1,4 +1,4 @@
-# unistd_h.m4 serial 56
+# unistd_h.m4 serial 57
 dnl Copyright (C) 2006-2011 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -21,6 +21,9 @@ AC_DEFUN([gl_UNISTD_H],
   fi
   AC_SUBST([HAVE_UNISTD_H])
 
+  dnl Ensure the type pid_t gets defined.
+  AC_REQUIRE([AC_TYPE_PID_T])
+
   dnl Check for declarations of anything we want to poison if the
   dnl corresponding gnulib module is not in use.
   gl_WARN_ON_USE_PREPARE([[#include <unistd.h>
diff --git a/nt/config.nt b/nt/config.nt
index ae3807538c0..1b56289bbc0 100644
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -470,7 +470,7 @@ extern char *getenv ();
 #define BITS_PER_LONG 32
 #endif
 
-#if defined(__MINGW32__) || _MSC_VER >= 1400
+#if defined (__MINGW32__) || _MSC_VER >= 1400
 
 /* Define to 1 if the system has the type `long long int'. */
 # define HAVE_LONG_LONG_INT 1
diff --git a/src/ChangeLog b/src/ChangeLog
index a4c985b1a0c..9f8361153a1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,83 @@
+2011-09-14  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (try_window_reusing_current_matrix): Fix incorrect
+        computation of loop end.  Reported by Johan Bockgård
+        <bojohan@gnu.org>.
+
+2011-09-13  Chong Yidong  <cyd@stupidchicken.com>
+
+        * frame.c (Fother_visible_frames_p): Function deleted.
+
+2011-09-12  Eli Zaretskii  <eliz@gnu.org>
+
+        * indent.c (compute_motion): Process display vector front to back
+        rather than the other way around.  (Bug#2496)
+
+2011-09-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * fileio.c (Finsert_file_contents): Don't assume beg_offset is 0.
+
+2011-09-11  Chong Yidong  <cyd@stupidchicken.com>
+
+        * minibuf.c (Fread_from_minibuffer): Doc fix.
+
+2011-09-11  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (produce_stretch_glyph): Fix a typo made in changes from
+        2011-08-30T17:32:44Z!eliz@gnu.org.  (Bug#9475)
+
+2011-09-11  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * fileio.c (Fvisited_file_modtime): Document `(-1 65535)' as a
+        value for non-existent files.
+
+2011-09-11  Eli Zaretskii  <eliz@gnu.org>
+
+        * fileio.c (Finsert_file_contents): If the file cannot be opened,
+        set its "size" to -1.  This will set the modtime_size field of
+        the corresponding buffer to -1, which is what
+        verify-visited-file-modtime expects for files that do not exist.
+        (Bug#9139)
+
+2011-09-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * keymap.h (KEY_DESCRIPTION_SIZE, push_key_description): Move decls
+        here ...
+        * lisp.h: ... from here.  push_key_description is no longer
+        defined in keyboard.c, so its declaration should not be in
+        lisp.h's "Defined in keyboard.c" section, and KEY_DESCRIPTION_SIZE
+        logically belongs with push_key_description.
+
+2011-09-10  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * buffer.h: Include <sys/types.h> instead of <time.h>.
+        Otherwise, off_t wasn't defined on FreeBSD 9.0-BETA2 i386.
+        Problem reported by Herbert J. Skuhra.
+
+2011-09-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * xml.c (parse_region): Make the parsing work for
+        non-comment-starting XML files again (bug#9144).
+
+2011-09-10  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * image.c (gif_load): Fix calculation of bottom and right corner.
+        (Bug#9468)
+
+2011-09-10  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (MAX_DISP_SCAN): Decrease to 250.  Prevents sluggish
+        redisplay in small windows.
+
+2011-09-09  Eli Zaretskii  <eliz@gnu.org>
+
+        * frame.c (x_report_frame_params): Cast to avoid compiler warnings.
+
+2011-09-08  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.c (Fset_window_prev_buffers, Fset_window_next_buffers):
+        Operate on live windows only.
+
 2011-09-08  Juanma Barranquero  <lekktu@gmail.com>
 
         * emacs.c (my_heap_start): #ifdef to avoid warnings when unused.
@@ -891,7 +971,7 @@
 
         * nsfns.m (as_script, as_result, as_status): New static variables.
         (ns_run_ascript): New function.
-        (Fns_do_applescript): Set variables as_*. Make an NSApplicationDefined
+        (Fns_do_applescript): Set variables as_*.  Make an NSApplicationDefined
         event with data2 set to NSAPP_DATA2_RUNASSCRIPT, post it and then start
         the event loop.  Get status from as_status (Bug#7276).
 
@@ -1067,7 +1147,7 @@
 
         * xdisp.c: Remove one-slot cache of display string positions.
         (compute_display_string_pos): Accept an additional argument
-        DISP_PROP_P; callers changed. Scan at most 5K characters forward
+        DISP_PROP_P; callers changed.  Scan at most 5K characters forward
         for a display string or property.  If found, set DISP_PROP_P
         non-zero.
 
@@ -2085,7 +2165,7 @@
         (Fput_unicode_property_internal): New functions.
         (syms_of_chartab): DEFSYM Qchar_code_property_table, defsubr
         Sunicode_property_table_internal, Sget_unicode_property_internal,
-        and Sput_unicode_property_internal. Defvar_lisp
+        and Sput_unicode_property_internal.  Defvar_lisp
         char-code-property-alist.
 
         * composite.c (CHAR_COMPOSABLE_P): Adjust for the change of
@@ -2117,7 +2197,7 @@
         (store_config_changed_event): Add comment.
         (dpyinfo_valid, store_font_name_changed, map_tool_bar_style)
         (store_tool_bar_style_changed): New functions.
-        (store_monospaced_changed): Add comment. Call dpyinfo_valid.
+        (store_monospaced_changed): Add comment.  Call dpyinfo_valid.
         (struct xsettings): Move font inside HAVE_XFT.
         (GSETTINGS_TOOL_BAR_STYLE, GSETTINGS_FONT_NAME): New defines.
         (GSETTINGS_MONO_FONT): Rename from SYSTEM_MONO_FONT.
@@ -2126,7 +2206,7 @@
         Check for changes in GSETTINGS_TOOL_BAR_STYLE and GSETTINGS_FONT_NAME
         also.
         (GCONF_TOOL_BAR_STYLE, GCONF_FONT_NAME): New defines.
-        (GCONF_MONO_FONT): Rename from SYSTEM_MONO_FONT. Move inside HAVE_XFT.
+        (GCONF_MONO_FONT): Rename from SYSTEM_MONO_FONT.  Move inside HAVE_XFT.
         (something_changed_gconfCB): Rename from something_changedCB.
         Check for changes in GCONF_TOOL_BAR_STYLE and GCONF_FONT_NAME also.
         (parse_settings): Move check for font inside HAVE_XFT.
diff --git a/src/alloc.c b/src/alloc.c
index 2d256800466..ad1741e308f 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -1880,7 +1880,7 @@ check_string_free_list (void)
   while (s != NULL)
     {
       if ((uintptr_t) s < 1024)
-        abort();
+        abort ();
       s = NEXT_FREE_LISP_STRING (s);
     }
 }
@@ -2531,17 +2531,17 @@ make_uninit_multibyte_string (EMACS_INT nchars, EMACS_INT nbytes)
    / (sizeof (struct Lisp_Float) * CHAR_BIT + 1))
 
 #define GETMARKBIT(block,n)                             \
-  (((block)->gcmarkbits[(n) / (sizeof(int) * CHAR_BIT)] \
-    >> ((n) % (sizeof(int) * CHAR_BIT)))                \
+  (((block)->gcmarkbits[(n) / (sizeof (int) * CHAR_BIT)]        \
+    >> ((n) % (sizeof (int) * CHAR_BIT)))               \
    & 1)
 
 #define SETMARKBIT(block,n)                             \
-  (block)->gcmarkbits[(n) / (sizeof(int) * CHAR_BIT)]   \
-  |= 1 << ((n) % (sizeof(int) * CHAR_BIT))
+  (block)->gcmarkbits[(n) / (sizeof (int) * CHAR_BIT)]  \
+  |= 1 << ((n) % (sizeof (int) * CHAR_BIT))
 
 #define UNSETMARKBIT(block,n)                           \
-  (block)->gcmarkbits[(n) / (sizeof(int) * CHAR_BIT)]   \
-  &= ~(1 << ((n) % (sizeof(int) * CHAR_BIT)))
+  (block)->gcmarkbits[(n) / (sizeof (int) * CHAR_BIT)]  \
+  &= ~(1 << ((n) % (sizeof (int) * CHAR_BIT)))
 
 #define FLOAT_BLOCK(fptr) \
   ((struct float_block *) (((uintptr_t) (fptr)) & ~(BLOCK_ALIGN - 1)))
@@ -2553,7 +2553,7 @@ struct float_block
 {
   /* Place `floats' at the beginning, to ease up FLOAT_INDEX's job.  */
   struct Lisp_Float floats[FLOAT_BLOCK_SIZE];
-  int gcmarkbits[1 + FLOAT_BLOCK_SIZE / (sizeof(int) * CHAR_BIT)];
+  int gcmarkbits[1 + FLOAT_BLOCK_SIZE / (sizeof (int) * CHAR_BIT)];
   struct float_block *next;
 };
 
@@ -2659,7 +2659,7 @@ struct cons_block
 {
   /* Place `conses' at the beginning, to ease up CONS_INDEX's job.  */
   struct Lisp_Cons conses[CONS_BLOCK_SIZE];
-  int gcmarkbits[1 + CONS_BLOCK_SIZE / (sizeof(int) * CHAR_BIT)];
+  int gcmarkbits[1 + CONS_BLOCK_SIZE / (sizeof (int) * CHAR_BIT)];
   struct cons_block *next;
 };
 
@@ -2964,7 +2964,7 @@ allocate_hash_table (void)
 struct window *
 allocate_window (void)
 {
-  return ALLOCATE_PSEUDOVECTOR(struct window, current_matrix, PVEC_WINDOW);
+  return ALLOCATE_PSEUDOVECTOR (struct window, current_matrix, PVEC_WINDOW);
 }
 
 
@@ -4159,7 +4159,7 @@ mark_maybe_pointer (void *p)
           break;
 
         case MEM_TYPE_BUFFER:
-          if (live_buffer_p (m, p) && !VECTOR_MARKED_P((struct buffer *)p))
+          if (live_buffer_p (m, p) && !VECTOR_MARKED_P ((struct buffer *)p))
             XSETVECTOR (obj, p);
           break;
 
diff --git a/src/buffer.h b/src/buffer.h
index c50cfe56c77..73628fe6dfc 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -18,7 +18,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <time.h> /* for time_t */
+#include <sys/types.h> /* for off_t, time_t */
 
 /* Accessing the parameters of the current buffer.  */
 
diff --git a/src/callproc.c b/src/callproc.c
index 1bdb57a27d0..97531f73848 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -691,7 +691,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
   /* Enable sending signal if user quits below.  */
   call_process_exited = 0;
 
-#if defined(MSDOS)
+#if defined (MSDOS)
   /* MSDOS needs different cleanup information.  */
   record_unwind_protect (call_process_cleanup,
                          Fcons (Fcurrent_buffer (),
@@ -1315,7 +1315,7 @@ child_setup (int in, int out, int err, register char **new_argv, int set_pgrp, L
   if (err != in && err != out)
     emacs_close (err);
 
-#if defined(USG)
+#if defined (USG)
 #ifndef SETPGRP_RELEASES_CTTY
   setpgrp ();                   /* No arguments but equivalent in this case */
 #endif
diff --git a/src/casefiddle.c b/src/casefiddle.c
index 50ad4eeda74..77222c9e0a3 100644
--- a/src/casefiddle.c
+++ b/src/casefiddle.c
@@ -223,7 +223,7 @@ casify_region (enum case_action flag, Lisp_Object b, Lisp_Object e)
   record_change (start, end - start);
   start_byte = CHAR_TO_BYTE (start);
 
-  SETUP_BUFFER_SYNTAX_TABLE();  /* For syntax_prefix_flag_p.  */
+  SETUP_BUFFER_SYNTAX_TABLE (); /* For syntax_prefix_flag_p.  */
 
   while (start < end)
     {
@@ -434,9 +434,9 @@ syms_of_casefiddle (void)
 void
 keys_of_casefiddle (void)
 {
-  initial_define_key (control_x_map, Ctl('U'), "upcase-region");
+  initial_define_key (control_x_map, Ctl ('U'), "upcase-region");
   Fput (intern ("upcase-region"), Qdisabled, Qt);
-  initial_define_key (control_x_map, Ctl('L'), "downcase-region");
+  initial_define_key (control_x_map, Ctl ('L'), "downcase-region");
   Fput (intern ("downcase-region"), Qdisabled, Qt);
 
   initial_define_key (meta_map, 'u', "upcase-word");
diff --git a/src/ccl.c b/src/ccl.c
index b28a284f70a..cb96eece5ee 100644
--- a/src/ccl.c
+++ b/src/ccl.c
@@ -61,7 +61,7 @@ static Lisp_Object Vccl_program_table;
 
 /* Return a hash table of id number ID.  */
 #define GET_HASH_TABLE(id) \
-  (XHASH_TABLE (XCDR(XVECTOR(Vtranslation_hash_table_vector)->contents[(id)])))
+  (XHASH_TABLE (XCDR (XVECTOR (Vtranslation_hash_table_vector)->contents[(id)])))
 
 /* CCL (Code Conversion Language) is a simple language which has
    operations on one input buffer, one output buffer, and 7 registers.
@@ -706,7 +706,7 @@ do					\
     ccl->status = CCL_STAT_SUCCESS;     \
     goto ccl_finish;                    \
   }                                     \
-while(0)
+while (0)
 
 /* Suspend CCL program because of reading from empty input buffer or
    writing to full output buffer.  When this program is resumed, the
@@ -730,7 +730,7 @@ do					\
     ccl->status = CCL_STAT_INVALID_CMD; \
     goto ccl_error_handler;             \
   }                                     \
-while(0)
+while (0)
 
 #else
 
@@ -741,7 +741,7 @@ do					\
     ccl->status = CCL_STAT_INVALID_CMD; \
     goto ccl_error_handler;             \
   }                                     \
-while(0)
+while (0)
 
 #endif
 
@@ -1419,7 +1419,7 @@ ccl_driver (struct ccl_program *ccl, int *source, int *destination, int src_size
                     else if (INTEGERP (content) && IN_INT_RANGE (XINT (content)))
                       {
                         reg[RRR] = i;
-                        reg[rrr] = XINT(content);
+                        reg[rrr] = XINT (content);
                         break;
                       }
                     else if (EQ (content, Qt) || EQ (content, Qlambda))
@@ -1692,7 +1692,7 @@ ccl_driver (struct ccl_program *ccl, int *source, int *destination, int src_size
                     value = XCDR (content);
                     if (!INTEGERP (attrib) || !INTEGERP (value))
                       continue;
-                    reg[rrr] = XINT(value);
+                    reg[rrr] = XINT (value);
                     break;
                   }
                 else if (SYMBOLP (content))
@@ -1729,8 +1729,8 @@ ccl_driver (struct ccl_program *ccl, int *source, int *destination, int src_size
       switch (ccl->status)
         {
         case CCL_STAT_INVALID_CMD:
-          sprintf(msg, "\nCCL: Invalid command %x (ccl_code = %x) at %d.",
-                  code & 0x1F, code, this_ic);
+          sprintf (msg, "\nCCL: Invalid command %x (ccl_code = %x) at %d.",
+                   code & 0x1F, code, this_ic);
 #ifdef CCL_DEBUG
           {
             int i = ccl_backtrace_idx - 1;
@@ -1748,7 +1748,7 @@ ccl_driver (struct ccl_program *ccl, int *source, int *destination, int src_size
                 if (i < 0) i = CCL_DEBUG_BACKTRACE_LEN - 1;
                 if (ccl_backtrace_table[i] == 0)
                   break;
-                sprintf(msg, " %d", ccl_backtrace_table[i]);
+                sprintf (msg, " %d", ccl_backtrace_table[i]);
                 msglen = strlen (msg);
                 if (dst + msglen > (dst_bytes ? dst_end : src))
                   break;
@@ -1762,11 +1762,11 @@ ccl_driver (struct ccl_program *ccl, int *source, int *destination, int src_size
 
         case CCL_STAT_QUIT:
           if (! ccl->quit_silently)
-            sprintf(msg, "\nCCL: Quited.");
+            sprintf (msg, "\nCCL: Quited.");
           break;
 
         default:
-          sprintf(msg, "\nCCL: Unknown error type (%d)", ccl->status);
+          sprintf (msg, "\nCCL: Unknown error type (%d)", ccl->status);
         }
 
       msglen = strlen (msg);
diff --git a/src/dbusbind.c b/src/dbusbind.c
index 2a38d15873c..227d4e647e9 100644
--- a/src/dbusbind.c
+++ b/src/dbusbind.c
@@ -1880,7 +1880,7 @@ xd_read_queued_messages (int fd, void *data, int for_read)
         busp = CDR_SAFE (busp);
       }
 
-  if (NILP(bus))
+  if (NILP (bus))
     return;
 
   /* We ignore all Lisp errors during the call.  */
diff --git a/src/dired.c b/src/dired.c
index 415f9ac5ae5..be94b16cf75 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -1003,7 +1003,7 @@ so last access time will always be midnight of that day.  */)
   values[10] = INTEGER_TO_CONS (s.st_ino);
   values[11] = INTEGER_TO_CONS (s.st_dev);
 
-  return Flist (sizeof(values) / sizeof(values[0]), values);
+  return Flist (sizeof (values) / sizeof (values[0]), values);
 }
 
 DEFUN ("file-attributes-lessp", Ffile_attributes_lessp, Sfile_attributes_lessp, 2, 2, 0,
diff --git a/src/dispextern.h b/src/dispextern.h
index 1b2df45086c..bc75dc5d2e6 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -1290,10 +1290,10 @@ struct glyph_string
   unsigned padding_p : 1;
 
   /* The GC to use for drawing this glyph string.  */
-#if defined(HAVE_X_WINDOWS)
+#if defined (HAVE_X_WINDOWS)
   GC gc;
 #endif
-#if defined(HAVE_NTGUI)
+#if defined (HAVE_NTGUI)
   XGCValues *gc;
   HDC hdc;
 #endif
diff --git a/src/dispnew.c b/src/dispnew.c
index abe09ed6a49..50b96b699f9 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -92,7 +92,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #endif
 #endif /* not __GNU_LIBRARY__ */
 
-#if defined(HAVE_TERM_H) && defined (GNU_LINUX) && defined (HAVE_LIBNCURSES)
+#if defined (HAVE_TERM_H) && defined (GNU_LINUX) && defined (HAVE_LIBNCURSES)
 #include <term.h>               /* for tgetent */
 #endif
 
@@ -4925,7 +4925,7 @@ count_match (struct glyph *str1, struct glyph *end1, struct glyph *str2, struct
 
 /* Char insertion/deletion cost vector, from term.c */
 
-#define char_ins_del_cost(f) (&char_ins_del_vector[FRAME_TOTAL_COLS((f))])
+#define char_ins_del_cost(f) (&char_ins_del_vector[FRAME_TOTAL_COLS ((f))])
 
 
 /* Perform a frame-based update on line VPOS in frame FRAME.  */
@@ -5377,7 +5377,7 @@ buffer_posn_from_coords (struct window *w, int *x, int *y, struct display_pos *p
     }
 
   /* Add extra (default width) columns if clicked after EOL. */
-  x1 = max(0, it.current_x + it.pixel_width - it.first_visible_x);
+  x1 = max (0, it.current_x + it.pixel_width - it.first_visible_x);
   if (x0 > x1)
     it.hpos += (x0 - x1) / WINDOW_FRAME_COLUMN_WIDTH (w);
 
@@ -6241,7 +6241,7 @@ init_display (void)
       )
     {
       Vinitial_window_system = Qns;
-      Vwindow_system_version = make_number(10);
+      Vwindow_system_version = make_number (10);
       adjust_frame_glyphs_initially ();
       return;
     }
@@ -6340,7 +6340,7 @@ init_display (void)
     {
       /* For the initial frame, we don't have any way of knowing what
          are the foreground and background colors of the terminal.  */
-      struct frame *sf = SELECTED_FRAME();
+      struct frame *sf = SELECTED_FRAME ();
 
       FRAME_FOREGROUND_PIXEL (sf) = FACE_TTY_DEFAULT_FG_COLOR;
       FRAME_BACKGROUND_PIXEL (sf) = FACE_TTY_DEFAULT_BG_COLOR;
diff --git a/src/doprnt.c b/src/doprnt.c
index 638fa4d6312..8db7c0f2ada 100644
--- a/src/doprnt.c
+++ b/src/doprnt.c
@@ -347,7 +347,7 @@ doprnt (char *buffer, ptrdiff_t bufsize, const char *format,
             case 'e':
             case 'g':
               {
-                double d = va_arg(ap, double);
+                double d = va_arg (ap, double);
                 sprintf (sprintf_buffer, fmtcpy, d);
                 /* Now copy into final output, truncating as necessary.  */
                 string = sprintf_buffer;
@@ -427,7 +427,7 @@ doprnt (char *buffer, ptrdiff_t bufsize, const char *format,
 
             case 'c':
               {
-                int chr = va_arg(ap, int);
+                int chr = va_arg (ap, int);
                 tem = CHAR_STRING (chr, (unsigned char *) charbuf);
                 string = charbuf;
                 string[tem] = 0;
diff --git a/src/dosfns.c b/src/dosfns.c
index e903ef20af0..ab3433b7902 100644
--- a/src/dosfns.c
+++ b/src/dosfns.c
@@ -343,13 +343,13 @@ init_dosfns (void)
         {
           dpmiregs.x.ax = 0x168e;
           dpmiregs.x.dx = 3;    /* get VM title */
-          dpmiregs.x.cx = sizeof(parent_vm_title) - 1;
+          dpmiregs.x.cx = sizeof (parent_vm_title) - 1;
           dpmiregs.x.es = __tb >> 4;
           dpmiregs.x.di = __tb & 15;
           dpmiregs.x.sp = dpmiregs.x.ss = dpmiregs.x.flags = 0;
           _go32_dpmi_simulate_int (0x2f, &dpmiregs);
           if (dpmiregs.x.ax == 1)
-            dosmemget (__tb, sizeof(parent_vm_title), parent_vm_title);
+            dosmemget (__tb, sizeof (parent_vm_title), parent_vm_title);
         }
     }
   else
@@ -573,7 +573,7 @@ system_process_attributes (Lisp_Object pid)
                             Fsymbol_value (intern ("before-init-time"))),
                      attrs);
       attrs = Fcons (Fcons (Qvsize,
-                            make_fixnum_or_float ((unsigned long)sbrk(0)/1024)),
+                            make_fixnum_or_float ((unsigned long)sbrk (0)/1024)),
                      attrs);
       attrs = Fcons (Fcons (Qetime, tem), attrs);
 #ifndef SYSTEM_MALLOC
diff --git a/src/editfns.c b/src/editfns.c
index 580298c6e7d..596765d899e 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -146,7 +146,7 @@ init_editfns (void)
   /* If the user name claimed in the environment vars differs from
      the real uid, use the claimed name to find the full name.  */
   tem = Fstring_equal (Vuser_login_name, Vuser_real_login_name);
-  Vuser_full_name = Fuser_full_name (NILP (tem)? make_number (geteuid())
+  Vuser_full_name = Fuser_full_name (NILP (tem)? make_number (geteuid ())
                                      : Vuser_login_name);
 
   p = getenv ("NAME");
@@ -3254,7 +3254,7 @@ save_restriction_save (void)
       end = buildmark (ZV, ZV_BYTE);
 
       /* END must move forward if text is inserted at its exact location.  */
-      XMARKER(end)->insertion_type = 1;
+      XMARKER (end)->insertion_type = 1;
 
       return Fcons (beg, end);
     }
diff --git a/src/emacs.c b/src/emacs.c
index c766523b1c3..d0e7a748849 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -165,7 +165,7 @@ int inhibit_window_system;
    data on the first attempt to change it inside asynchronous code.  */
 int running_asynch_code;
 
-#if defined(HAVE_X_WINDOWS) || defined(HAVE_NS)
+#if defined (HAVE_X_WINDOWS) || defined (HAVE_NS)
 /* If non-zero, -d was specified, meaning we're using some window system.  */
 int display_arg;
 #endif
@@ -811,7 +811,7 @@ main (int argc, char **argv)
     {
       static char heapexec[] = "EMACS_HEAP_EXEC=true";
       /* Set this so we only do this once.  */
-      putenv(heapexec);
+      putenv (heapexec);
 
       /* A flag to turn off address randomization which is introduced
          in linux kernel shipped with fedora core 4 */
@@ -851,7 +851,7 @@ main (int argc, char **argv)
        stack allocation routine for new process that the allocation
        fails if stack limit is not on page boundary.  So, round up the
        new limit to page boundary.  */
-      newlim = (newlim + getpagesize () - 1) / getpagesize () * getpagesize();
+      newlim = (newlim + getpagesize () - 1) / getpagesize () * getpagesize ();
 #endif
       if (newlim > rlim.rlim_max)
         {
@@ -1100,7 +1100,7 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem
             || strlen (dname_arg) < 1 || strlen (dname_arg) > 70)
           {
             fprintf (stderr, "emacs daemon: daemon name absent or too long\n");
-            exit(1);
+            exit (1);
           }
         dname_arg2[0] = '\0';
         sscanf (dname_arg, "\n%d,%d\n%s", &(daemon_pipe[0]), &(daemon_pipe[1]),
@@ -1118,7 +1118,7 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem
       fcntl (daemon_pipe[1], F_SETFD, FD_CLOEXEC);
 
 #ifdef HAVE_SETSID
-      setsid();
+      setsid ();
 #endif
 #else /* DOS_NT */
       fprintf (stderr, "This platform does not support the -daemon flag.\n");
@@ -1319,7 +1319,7 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem
     = argmatch (argv, argc, "-nsl", "--no-site-lisp", 11, NULL, &skip_args);
 
 #ifdef HAVE_NS
-  ns_alloc_autorelease_pool();
+  ns_alloc_autorelease_pool ();
   if (!noninteractive)
     {
 #ifdef NS_IMPL_COCOA
@@ -1327,12 +1327,12 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem
         {
           /* FIXME: Do the right thing if getenv returns NULL, or if
              chdir fails.  */
-          if (!strncmp(argv[skip_args], "-psn", 4))
+          if (!strncmp (argv[skip_args], "-psn", 4))
             {
               skip_args += 1;
               chdir (getenv ("HOME"));
             }
-          else if (skip_args+1 < argc && !strncmp(argv[skip_args+1], "-psn", 4))
+          else if (skip_args+1 < argc && !strncmp (argv[skip_args+1], "-psn", 4))
             {
               skip_args += 2;
               chdir (getenv ("HOME"));
@@ -1560,9 +1560,9 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem
 
 #ifdef MSDOS
       syms_of_xmenu ();
-      syms_of_dosfns();
-      syms_of_msdos();
-      syms_of_win16select();
+      syms_of_dosfns ();
+      syms_of_msdos ();
+      syms_of_win16select ();
 #endif  /* MSDOS */
 
 #ifdef HAVE_NS
@@ -1661,7 +1661,7 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem
      GNU/Linux and MinGW.  It might work on some other systems too.
      Give it a try and tell us if it works on your system.  To compile
      for profiling, use the configure option --enable-profiling.  */
-#if defined (__FreeBSD__) || defined (GNU_LINUX) || defined(__MINGW32__)
+#if defined (__FreeBSD__) || defined (GNU_LINUX) || defined (__MINGW32__)
 #ifdef PROFILING
   if (initialized)
     {
diff --git a/src/emacsgtkfixed.c b/src/emacsgtkfixed.c
index 7b93319e978..8cde68d8303 100644
--- a/src/emacsgtkfixed.c
+++ b/src/emacsgtkfixed.c
@@ -1,4 +1,4 @@
-/* A Gtk Widget that inherits GtkFixed, but can be shrinked. 
+/* A Gtk Widget that inherits GtkFixed, but can be shrinked.
 This file is only use when compiling with Gtk+ 3.
 
 Copyright (C) 2011  Free Software Foundation, Inc.
@@ -237,10 +237,10 @@ emacs_fixed_get_preferred_height (GtkWidget *widget,
    (Bug#8919), and so users can resize our frames as they wish.  */
 
 void
-XSetWMSizeHints(Display* d,
-                Window w,
-                XSizeHints* hints,
-                Atom prop)
+XSetWMSizeHints (Display* d,
+                 Window w,
+                 XSizeHints* hints,
+                 Atom prop)
 {
   struct x_display_info *dpyinfo = x_display_info_for_display (d);
   struct frame *f = x_top_window_to_frame (dpyinfo, w);
@@ -279,7 +279,7 @@ XSetWMSizeHints(Display* d,
 /* Override this X11 function.
    This function is in the same X11 file as the one above.  So we must
    provide it also.  */
-   
+
 void
 XSetWMNormalHints (Display *d, Window w, XSizeHints *hints)
 {
diff --git a/src/eval.c b/src/eval.c
index f2407cede31..57a273cd4aa 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -467,7 +467,7 @@ usage: (setq [SYM VAL]...)  */)
 
       args_left = Fcdr (Fcdr (args_left));
     }
-  while (!NILP(args_left));
+  while (!NILP (args_left));
 
   UNGCPRO;
   return val;
diff --git a/src/fileio.c b/src/fileio.c
index fe0fb593208..08be41f9fe4 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1472,7 +1472,7 @@ search_embedded_absfilename (char *nm, char *endp)
       if ((0
            || IS_DIRECTORY_SEP (p[-1]))
           && file_name_absolute_p (p)
-#if defined (WINDOWSNT) || defined(CYGWIN)
+#if defined (WINDOWSNT) || defined (CYGWIN)
           /* // at start of file name is meaningful in Apollo,
              WindowsNT and Cygwin systems.  */
           && !(IS_DIRECTORY_SEP (p[0]) && p - 1 == nm)
@@ -2497,7 +2497,7 @@ See also `file-exists-p' and `file-attributes'.  */)
 
   absname = ENCODE_FILE (absname);
 
-#if defined(DOS_NT) || defined(macintosh)
+#if defined (DOS_NT) || defined (macintosh)
   /* Under MS-DOS, Windows, and Macintosh, open does not work for
      directories.  */
   if (access (SDATA (absname), 0) == 0)
@@ -2782,7 +2782,7 @@ if file does not exist, is not accessible, or SELinux is disabled */)
     }
 #endif
 
-  return Flist (sizeof(values) / sizeof(values[0]), values);
+  return Flist (sizeof (values) / sizeof (values[0]), values);
 }
 
 DEFUN ("set-file-selinux-context", Fset_file_selinux_context,
@@ -2853,7 +2853,7 @@ is disabled. */)
           context_free (parsed_con);
         }
       else
-        report_file_error("Doing lgetfilecon", Fcons (absname, Qnil));
+        report_file_error ("Doing lgetfilecon", Fcons (absname, Qnil));
 
       if (con)
         freecon (con);
@@ -3253,6 +3253,7 @@ variable `last-coding-system-used' to the coding system actually used.  */)
       if (NILP (visit))
         report_file_error ("Opening input file", Fcons (orig_filename, Qnil));
       st.st_mtime = -1;
+      st.st_size = -1;
       how_much = 0;
       if (!NILP (Vcoding_system_for_read))
         Fset (Qbuffer_file_coding_system, Vcoding_system_for_read);
@@ -3545,7 +3546,7 @@ variable `last-coding-system-used' to the coding system actually used.  */)
       immediate_quit = 0;
       /* If the file matches the buffer completely,
          there's no need to replace anything.  */
-      if (same_at_start - BEGV_BYTE == end_offset)
+      if (same_at_start - BEGV_BYTE == end_offset - beg_offset)
         {
           emacs_close (fd);
           specpdl_ptr--;
@@ -5044,9 +5045,10 @@ Next attempt to save will certainly not complain of a discrepancy.  */)
 DEFUN ("visited-file-modtime", Fvisited_file_modtime,
        Svisited_file_modtime, 0, 0, 0,
        doc: /* Return the current buffer's recorded visited file modification time.
-The value is a list of the form (HIGH LOW), like the time values
-that `file-attributes' returns.  If the current buffer has no recorded
-file modification time, this function returns 0.
+The value is a list of the form (HIGH LOW), like the time values that
+`file-attributes' returns.  If the current buffer has no recorded file
+modification time, this function returns 0.  If the visited file
+doesn't exist, HIGH will be -1.
 See Info node `(elisp)Modification Time' for more details.  */)
   (void)
 {
diff --git a/src/filelock.c b/src/filelock.c
index 7235c862ef0..5ee2c039b81 100644
--- a/src/filelock.c
+++ b/src/filelock.c
@@ -630,7 +630,7 @@ unlock_all_files (void)
       b = XBUFFER (XCDR (XCAR (tail)));
       if (STRINGP (BVAR (b, file_truename)) && BUF_SAVE_MODIFF (b) < BUF_MODIFF (b))
         {
-          unlock_file(BVAR (b, file_truename));
+          unlock_file (BVAR (b, file_truename));
         }
     }
 }
diff --git a/src/floatfns.c b/src/floatfns.c
index 81cf6bdb61f..2011b4d942d 100644
--- a/src/floatfns.c
+++ b/src/floatfns.c
@@ -71,7 +71,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 extern double logb (double);
 #endif /* not HPUX and HAVE_LOGB and no logb macro */
 
-#if defined(DOMAIN) && defined(SING) && defined(OVERFLOW)
+#if defined (DOMAIN) && defined (SING) && defined (OVERFLOW)
     /* If those are defined, then this is probably a `matherr' machine. */
 # ifndef HAVE_MATHERR
 #  define HAVE_MATHERR
@@ -519,7 +519,7 @@ DEFUN ("expt", Fexpt, Sexpt, 2, 2, 0,
   if (f1 == 0.0 && f2 == 0.0)
     f1 = 1.0;
 #ifdef FLOAT_CHECK_DOMAIN
-  else if ((f1 == 0.0 && f2 < 0.0) || (f1 < 0 && f2 != floor(f2)))
+  else if ((f1 == 0.0 && f2 < 0.0) || (f1 < 0 && f2 != floor (f2)))
     domain_error2 ("expt", arg1, arg2);
 #endif
   IN_FLOAT2 (f3 = pow (f1, f2), "expt", arg1, arg2);
diff --git a/src/fns.c b/src/fns.c
index a3af6b8c15a..392f447a6d8 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -4704,13 +4704,13 @@ secure_hash (Lisp_Object algorithm, Lisp_Object object, Lisp_Object start, Lisp_
                     force_raw_text = 1;
                 }
 
-              if (NILP (coding_system) && !NILP (Fbuffer_file_name(object)))
+              if (NILP (coding_system) && !NILP (Fbuffer_file_name (object)))
                 {
                   /* Check file-coding-system-alist.  */
                   Lisp_Object args[4], val;
 
                   args[0] = Qwrite_region; args[1] = start; args[2] = end;
-                  args[3] = Fbuffer_file_name(object);
+                  args[3] = Fbuffer_file_name (object);
                   val = Ffind_operation_coding_system (4, args);
                   if (CONSP (val) && !NILP (XCDR (val)))
                     coding_system = XCDR (val);
diff --git a/src/font.c b/src/font.c
index 34cacb37ce4..1a4742ba959 100644
--- a/src/font.c
+++ b/src/font.c
@@ -1334,7 +1334,7 @@ font_parse_fcname (char *name, Lisp_Object font)
         {
           int decimal = 0, size_found = 1;
           for (q = p + 1; *q && *q != ':'; q++)
-            if (! isdigit(*q))
+            if (! isdigit (*q))
               {
                 if (*q != '.' || decimal)
                   {
@@ -3239,7 +3239,7 @@ font_open_for_lface (FRAME_PTR f, Lisp_Object entity, Lisp_Object *attrs, Lisp_O
           if (INTEGERP (height))
             pt = XINT (height);
           else
-            abort(); /* We should never end up here.  */
+            abort (); /* We should never end up here.  */
         }
 
       pt /= 10;
@@ -3247,7 +3247,7 @@ font_open_for_lface (FRAME_PTR f, Lisp_Object entity, Lisp_Object *attrs, Lisp_O
 #ifdef HAVE_NS
       if (size == 0)
         {
-          Lisp_Object ffsize = get_frame_param(f, Qfontsize);
+          Lisp_Object ffsize = get_frame_param (f, Qfontsize);
           size = NUMBERP (ffsize) ? POINT_TO_PIXEL (XINT (ffsize), f->resy) : 0;
         }
 #endif
diff --git a/src/frame.c b/src/frame.c
index 66b857a73e9..112f102a1f2 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1155,17 +1155,6 @@ other_visible_frames (FRAME_PTR f)
   return 1;
 }
 
-DEFUN ("other-visible-frames-p", Fother_visible_frames_p, Sother_visible_frames_p, 0, 1, 0,
-       doc: /* Return t if there are other visible frames beside FRAME.
-FRAME defaults to the selected frame.  */)
-  (Lisp_Object frame)
-{
-  if (NILP (frame))
-    frame = selected_frame;
-  CHECK_LIVE_FRAME (frame);
-  return other_visible_frames (XFRAME (frame)) ? Qt : Qnil;
-}
-
 /* Delete FRAME.  When FORCE equals Qnoelisp, delete FRAME
   unconditionally.  x_connection_closed and delete_terminal use
   this.  Any other value of FORCE implements the semantics
@@ -3098,7 +3087,11 @@ x_report_frame_params (struct frame *f, Lisp_Object *alistptr)
                       for non-toolkit scroll bar.
                       ruler-mode.el depends on this.  */
                    : Qnil));
-  w = FRAME_X_WINDOW (f);
+  /* FRAME_X_WINDOW is not guaranteed to return an integer.  E.g., on
+     MS-Windows it returns a value whose type is HANDLE, which is
+     actually a pointer.  Explicit casting avoids compiler
+     warnings.  */
+  w = (unsigned long) FRAME_X_WINDOW (f);
   sprintf (buf, "%lu", w);
   store_in_alist (alistptr, Qwindow_id,
                   build_string (buf));
@@ -3108,7 +3101,7 @@ x_report_frame_params (struct frame *f, Lisp_Object *alistptr)
   if (FRAME_X_OUTPUT (f)->widget)
 #endif
     {
-      w = FRAME_OUTER_WINDOW (f);
+      w = (unsigned long) FRAME_OUTER_WINDOW (f);
       sprintf (buf, "%lu", w);
     }
   store_in_alist (alistptr, Qouter_window_id,
@@ -4370,7 +4363,7 @@ Setting this variable does not affect existing frames, only new ones.  */);
   DEFVAR_LISP ("default-frame-scroll-bars", Vdefault_frame_scroll_bars,
                doc: /* Default position of scroll bars on this window-system.  */);
 #ifdef HAVE_WINDOW_SYSTEM
-#if defined(HAVE_NTGUI) || defined(NS_IMPL_COCOA) || (defined(USE_GTK) && defined(USE_TOOLKIT_SCROLL_BARS))
+#if defined (HAVE_NTGUI) || defined (NS_IMPL_COCOA) || (defined (USE_GTK) && defined (USE_TOOLKIT_SCROLL_BARS))
   /* MS-Windows, Mac OS X, and GTK have scroll bars on the right by
      default.  */
   Vdefault_frame_scroll_bars = Qright;
@@ -4471,7 +4464,6 @@ automatically.  See also `mouse-autoselect-window'.  */);
   defsubr (&Sframe_list);
   defsubr (&Snext_frame);
   defsubr (&Sprevious_frame);
-  defsubr (&Sother_visible_frames_p);
   defsubr (&Sdelete_frame);
   defsubr (&Smouse_position);
   defsubr (&Smouse_pixel_position);
diff --git a/src/fringe.c b/src/fringe.c
index 5878c541247..25fecca2334 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -456,7 +456,7 @@ static struct fringe_bitmap standard_bitmaps[] =
 
 #define NO_FRINGE_BITMAP 0
 #define UNDEF_FRINGE_BITMAP 1
-#define MAX_STANDARD_FRINGE_BITMAPS (sizeof(standard_bitmaps)/sizeof(standard_bitmaps[0]))
+#define MAX_STANDARD_FRINGE_BITMAPS (sizeof (standard_bitmaps)/sizeof (standard_bitmaps[0]))
 
 static struct fringe_bitmap **fringe_bitmaps;
 static Lisp_Object *fringe_faces;
@@ -1165,7 +1165,7 @@ update_window_fringes (struct window *w, int keep_current_p)
         }
       else if ((!row->reversed_p && row->truncated_on_left_p)
                || (row->reversed_p && row->truncated_on_right_p))
-        left = LEFT_FRINGE(0, Qtruncation, 0);
+        left = LEFT_FRINGE (0, Qtruncation, 0);
       else if (row->indicate_bob_p && EQ (boundary_top, Qleft))
         {
           left = ((row->indicate_eob_p && EQ (boundary_bot, Qleft))
@@ -1787,7 +1787,7 @@ init_fringe_once (void)
   int bt;
 
   for (bt = NO_FRINGE_BITMAP + 1; bt < MAX_STANDARD_FRINGE_BITMAPS; bt++)
-    init_fringe_bitmap(bt, &standard_bitmaps[bt], 1);
+    init_fringe_bitmap (bt, &standard_bitmaps[bt], 1);
 }
 
 void
diff --git a/src/getpagesize.h b/src/getpagesize.h
index 965d0bc0244..c0c4e504f0a 100644
--- a/src/getpagesize.h
+++ b/src/getpagesize.h
@@ -21,7 +21,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 # include <unistd.h>
 
 # ifdef _SC_PAGESIZE
-#  define getpagesize() sysconf(_SC_PAGESIZE)
+#  define getpagesize() sysconf (_SC_PAGESIZE)
 # else /* no _SC_PAGESIZE */
 #  ifdef HAVE_SYS_PARAM_H
 #   include <sys/param.h>
diff --git a/src/gmalloc.c b/src/gmalloc.c
index d49259b8ed7..7b5e6df009b 100644
--- a/src/gmalloc.c
+++ b/src/gmalloc.c
@@ -102,7 +102,7 @@ extern void malloc_enable_thread PP ((void));
    receive a fragment of a block.  Fragment sizes are powers of two,
    and all fragments of a block are the same size.  When all the
    fragments in a block have been freed, the block itself is freed.  */
-#define INT_BIT         (CHAR_BIT * sizeof(int))
+#define INT_BIT         (CHAR_BIT * sizeof (int))
 #define BLOCKLOG        (INT_BIT > 16 ? 12 : 9)
 #define BLOCKSIZE       (1 << BLOCKLOG)
 #define BLOCKIFY(SIZE)  (((SIZE) + BLOCKSIZE - 1) / BLOCKSIZE)
@@ -445,7 +445,7 @@ protect_malloc_state (protect_p)
     }
 }
 
-#define PROTECT_MALLOC_STATE(PROT) protect_malloc_state(PROT)
+#define PROTECT_MALLOC_STATE(PROT) protect_malloc_state (PROT)
 
 #else
 #define PROTECT_MALLOC_STATE(PROT)      /* empty */
@@ -1541,7 +1541,7 @@ _realloc_internal (ptr, size)
 {
   __ptr_t result;
 
-  LOCK();
+  LOCK ();
   result = _realloc_internal_nolock (ptr, size);
   UNLOCK ();
 
@@ -1625,7 +1625,7 @@ MA 02110-1301, USA.  */
 
 /* uClibc defines __GNU_LIBRARY__, but it is not completely
    compatible.  */
-#if !defined(__GNU_LIBRARY__) || defined(__UCLIBC__)
+#if !defined (__GNU_LIBRARY__) || defined (__UCLIBC__)
 #define __sbrk  sbrk
 #else /* __GNU_LIBRARY__ && ! defined (__UCLIBC__) */
 /* It is best not to declare this and cast its result on foreign operating
@@ -1647,7 +1647,7 @@ __default_morecore (increment)
      __malloc_ptrdiff_t increment;
 {
   __ptr_t result;
-#if defined(CYGWIN)
+#if defined (CYGWIN)
   if (!bss_sbrk_did_unexec)
     {
       return bss_sbrk (increment);
@@ -1830,7 +1830,7 @@ extern size_t __getpagesize PP ((void));
 #endif
 #else
 #include "getpagesize.h"
-#define  __getpagesize()        getpagesize()
+#define  __getpagesize()        getpagesize ()
 #endif
 
 #ifndef _MALLOC_INTERNAL
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 04d05d2a630..3cac8084dea 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -422,7 +422,7 @@ xg_get_image_for_pixmap (FRAME_PTR f,
 static void
 xg_set_cursor (GtkWidget *w, GdkCursor *cursor)
 {
-  GdkWindow *window = gtk_widget_get_window(w);
+  GdkWindow *window = gtk_widget_get_window (w);
   GList *children = gdk_window_peek_children (window);
 
   gdk_window_set_cursor (window, cursor);
diff --git a/src/image.c b/src/image.c
index c5dcbb32e5d..db201d5a831 100644
--- a/src/image.c
+++ b/src/image.c
@@ -56,7 +56,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define COLOR_TABLE_SUPPORT 1
 
 typedef struct x_bitmap_record Bitmap_Record;
-#define GET_PIXEL(ximg, x, y) XGetPixel(ximg, x, y)
+#define GET_PIXEL(ximg, x, y) XGetPixel (ximg, x, y)
 #define NO_PIXMAP None
 
 #define RGB_PIXEL_COLOR unsigned long
@@ -74,7 +74,7 @@ typedef struct x_bitmap_record Bitmap_Record;
 #undef COLOR_TABLE_SUPPORT
 
 typedef struct w32_bitmap_record Bitmap_Record;
-#define GET_PIXEL(ximg, x, y) GetPixel(ximg, x, y)
+#define GET_PIXEL(ximg, x, y) GetPixel (ximg, x, y)
 #define NO_PIXMAP 0
 
 #define RGB_PIXEL_COLOR COLORREF
@@ -106,7 +106,7 @@ Lisp_Object Qlibpng_version;
 
 typedef struct ns_bitmap_record Bitmap_Record;
 
-#define GET_PIXEL(ximg, x, y) XGetPixel(ximg, x, y)
+#define GET_PIXEL(ximg, x, y) XGetPixel (ximg, x, y)
 #define NO_PIXMAP 0
 
 #define RGB_PIXEL_COLOR unsigned long
@@ -115,7 +115,7 @@ typedef struct ns_bitmap_record Bitmap_Record;
 #define PIX_MASK_RETAIN 0
 #define PIX_MASK_DRAW   1
 
-#define FRAME_X_VISUAL FRAME_NS_DISPLAY_INFO(f)->visual
+#define FRAME_X_VISUAL FRAME_NS_DISPLAY_INFO (f)->visual
 #define x_defined_color(f, name, color_def, alloc) \
   ns_defined_color (f, name, color_def, alloc, 0)
 #define FRAME_X_SCREEN(f) 0
@@ -1106,8 +1106,8 @@ image_ascent (struct image *img, struct face *face, struct glyph_slice *slice)
              because a typical font is `top-heavy' (due to the presence
              uppercase letters), so the image placement should err towards
              being top-heavy too.  It also just generally looks better.  */
-          ascent = (height + FONT_BASE(face->font)
-                    - FONT_DESCENT(face->font) + 1) / 2;
+          ascent = (height + FONT_BASE (face->font)
+                    - FONT_DESCENT (face->font) + 1) / 2;
 #endif /* HAVE_NTGUI */
         }
       else
@@ -5545,7 +5545,7 @@ init_png_functions (Lisp_Object libraries)
 /* In libpng version 1.5, the jmpbuf member is hidden. (Bug#7908)  */
 #define PNG_LONGJMP(ptr) (fn_png_longjmp ((ptr), 1))
 #define PNG_JMPBUF(ptr) \
-  (*fn_png_set_longjmp_fn((ptr), longjmp, sizeof (jmp_buf)))
+  (*fn_png_set_longjmp_fn ((ptr), longjmp, sizeof (jmp_buf)))
 #endif
 
 /* Error and warning handlers installed when the PNG library
@@ -5966,9 +5966,9 @@ png_load (struct frame *f, struct image *img)
 static int
 png_load (struct frame *f, struct image *img)
 {
-  return ns_load_image(f, img,
-                       image_spec_value (img->spec, QCfile, NULL),
-                       image_spec_value (img->spec, QCdata, NULL));
+  return ns_load_image (f, img,
+                        image_spec_value (img->spec, QCfile, NULL),
+                        image_spec_value (img->spec, QCdata, NULL));
 }
 #endif  /* HAVE_NS */
 
@@ -6115,7 +6115,7 @@ jpeg_resync_to_restart_wrapper (j_decompress_ptr cinfo, int desired)
 
 #else
 
-#define fn_jpeg_CreateDecompress(a,b,c) jpeg_create_decompress(a)
+#define fn_jpeg_CreateDecompress(a,b,c) jpeg_create_decompress (a)
 #define fn_jpeg_start_decompress        jpeg_start_decompress
 #define fn_jpeg_finish_decompress       jpeg_finish_decompress
 #define fn_jpeg_destroy_decompress      jpeg_destroy_decompress
@@ -7229,8 +7229,10 @@ gif_load (struct frame *f, struct image *img)
 
   img->corners[TOP_CORNER] = gif->SavedImages[0].ImageDesc.Top;
   img->corners[LEFT_CORNER] = gif->SavedImages[0].ImageDesc.Left;
-  img->corners[BOT_CORNER] = img->corners[TOP_CORNER] + height;
-  img->corners[RIGHT_CORNER] = img->corners[LEFT_CORNER] + width;
+  img->corners[BOT_CORNER]
+    = img->corners[TOP_CORNER] + gif->SavedImages[0].ImageDesc.Height;
+  img->corners[RIGHT_CORNER]
+    = img->corners[LEFT_CORNER] + gif->SavedImages[0].ImageDesc.Width;
 
   if (!check_image_size (f, width, height))
     {
@@ -7623,7 +7625,7 @@ imagemagick_load_image (struct frame *f, struct image *img,
       return 0;
     }
 
-  if (MagickGetNumberImages(ping_wand) > 1)
+  if (MagickGetNumberImages (ping_wand) > 1)
     img->lisp_data =
       Fcons (Qcount,
              Fcons (make_number (MagickGetNumberImages (ping_wand)),
@@ -7648,7 +7650,7 @@ imagemagick_load_image (struct frame *f, struct image *img,
       if (im_image == NULL)
         goto imagemagick_no_wand;
       image_wand = NewMagickWandFromImage (im_image);
-      DestroyImage(im_image);
+      DestroyImage (im_image);
     }
   else
     {
@@ -7769,7 +7771,7 @@ imagemagick_load_image (struct frame *f, struct image *img,
 #ifdef COLOR_TABLE_SUPPORT
           free_color_table ();
 #endif
-          image_error("Imagemagick X bitmap allocation failure", Qnil, Qnil);
+          image_error ("Imagemagick X bitmap allocation failure", Qnil, Qnil);
           goto imagemagick_error;
         }
 
@@ -7823,7 +7825,7 @@ imagemagick_load_image (struct frame *f, struct image *img,
 #ifdef COLOR_TABLE_SUPPORT
           free_color_table ();
 #endif
-          image_error("Imagemagick X bitmap allocation failure", Qnil, Qnil);
+          image_error ("Imagemagick X bitmap allocation failure", Qnil, Qnil);
           goto imagemagick_error;
         }
 
diff --git a/src/indent.c b/src/indent.c
index 6e602d28f60..bae9ab1b46d 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -1543,7 +1543,7 @@ compute_motion (EMACS_INT from, EMACS_INT fromvpos, EMACS_INT fromhpos, int did_
               n = 1;
             }
 
-          for (i = n - 1; i >= 0; --i)
+          for (i = 0; i < n; ++i)
             {
               if (VECTORP (charvec))
                 {
diff --git a/src/insdel.c b/src/insdel.c
index 0cae578925d..01e5c57b2b0 100644
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -329,7 +329,7 @@ adjust_markers_for_insert (EMACS_INT from, EMACS_INT from_byte,
      - disordered overlays in the slot `overlays_before' of current_buffer.  */
   if (adjusted)
     {
-      fix_start_end_in_overlays(from, to);
+      fix_start_end_in_overlays (from, to);
       fix_overlays_before (current_buffer, from, to);
     }
 }
@@ -1606,7 +1606,7 @@ del_range_1 (EMACS_INT from, EMACS_INT to, int prepare, int ret_string)
   to_byte = CHAR_TO_BYTE (to);
 
   deletion = del_range_2 (from, from_byte, to, to_byte, ret_string);
-  GCPRO1(deletion);
+  GCPRO1 (deletion);
   signal_after_change (from, to - from, 0);
   update_compositions (from, from, CHECK_HEAD);
   UNGCPRO;
diff --git a/src/keyboard.c b/src/keyboard.c
index 8705c3cd65f..b266da07a42 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -411,7 +411,7 @@ int interrupts_deferred;
 
 /* If we support a window system, turn on the code to poll periodically
    to detect C-g.  It isn't actually used when doing interrupt input.  */
-#if defined(HAVE_WINDOW_SYSTEM) && !defined(USE_ASYNC_EVENTS)
+#if defined (HAVE_WINDOW_SYSTEM) && !defined (USE_ASYNC_EVENTS)
 #define POLL_FOR_INPUT
 #endif
 
@@ -3958,7 +3958,7 @@ kbd_buffer_get_event (KBOARD **kbp,
           kbd_fetch_ptr = event + 1;
         }
 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) \
-    || defined(HAVE_NS) || defined (USE_GTK)
+    || defined (HAVE_NS) || defined (USE_GTK)
       else if (event->kind == MENU_BAR_ACTIVATE_EVENT)
         {
           kbd_fetch_ptr = event + 1;
@@ -4075,7 +4075,7 @@ kbd_buffer_get_event (KBOARD **kbp,
               obj = make_lispy_event (event);
 
 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) \
-    || defined(HAVE_NS) || defined (USE_GTK)
+    || defined (HAVE_NS) || defined (USE_GTK)
               /* If this was a menu selection, then set the flag to inhibit
                  writing to last_nonmenu_event.  Don't do this if the event
                  we're returning is (menu-bar), though; that indicates the
@@ -5891,7 +5891,7 @@ make_lispy_event (struct input_event *event)
 #endif /* HAVE_MOUSE */
 
 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) \
-    || defined(HAVE_NS) || defined (USE_GTK)
+    || defined (HAVE_NS) || defined (USE_GTK)
     case MENU_BAR_EVENT:
       if (EQ (event->arg, event->frame_or_window))
         /* This is the prefix key.  We translate this to
@@ -6012,7 +6012,7 @@ make_lispy_event (struct input_event *event)
     }
 }
 
-#if defined(HAVE_MOUSE) || defined(HAVE_GPM)
+#if defined (HAVE_MOUSE) || defined (HAVE_GPM)
 
 static Lisp_Object
 make_lispy_movement (FRAME_PTR frame, Lisp_Object bar_window, enum scroll_bar_part part,
@@ -7024,7 +7024,7 @@ tty_read_avail_input (struct terminal *terminal,
   if (n_to_read > sizeof cbuf)
     n_to_read = sizeof cbuf;
 #else /* no FIONREAD */
-#if defined (USG) || defined(CYGWIN)
+#if defined (USG) || defined (CYGWIN)
   /* Read some input if available, but don't wait.  */
   n_to_read = sizeof cbuf;
   fcntl (fileno (tty->input), F_SETFL, O_NDELAY);
diff --git a/src/keymap.h b/src/keymap.h
index ec9d4cadbb1..a989f124b14 100644
--- a/src/keymap.h
+++ b/src/keymap.h
@@ -19,6 +19,16 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifndef KEYMAP_H
 #define KEYMAP_H
 
+/* The maximum byte size consumed by push_key_description.
+   All callers should assure that at least this size of memory is
+   allocated at the place pointed by the second argument.
+
+   There are 6 modifiers, each consumes 2 chars.
+   The octal form of a character code consumes
+   (1 + CHARACTERBITS / 3 + 1) chars (including backslash at the head).
+   We need one more byte for string terminator `\0'.  */
+#define KEY_DESCRIPTION_SIZE ((2 * 6) + 1 + (CHARACTERBITS / 3) + 1 + 1)
+
 #define KEYMAPP(m) (!NILP (get_keymap (m, 0, 0)))
 extern Lisp_Object Qkeymap, Qmenu_bar;
 extern Lisp_Object Qremap;
@@ -30,6 +40,7 @@ EXFUN (Fdefine_key, 3);
 EXFUN (Fcommand_remapping, 3);
 EXFUN (Fkey_binding, 4);
 EXFUN (Fkey_description, 2);
+extern char *push_key_description (EMACS_INT, char *, int);
 EXFUN (Fsingle_key_description, 2);
 EXFUN (Fwhere_is_internal, 5);
 EXFUN (Fcurrent_active_maps, 2);
diff --git a/src/lisp.h b/src/lisp.h
index 7936e6a6dec..64c94647f0e 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -132,9 +132,9 @@ extern int suppress_checking EXTERNALLY_VISIBLE;
 #define eassert(X) ((void) (0 && (X))) /* Check that X compiles.  */
 #else /* ENABLE_CHECKING */
 #if defined (__GNUC__) && __GNUC__ >= 2 && defined (__STDC__)
-#define eassert(cond) CHECK(cond,"assertion failed: " #cond)
+#define eassert(cond) CHECK (cond, "assertion failed: " #cond)
 #else
-#define eassert(cond) CHECK(cond,"assertion failed")
+#define eassert(cond) CHECK (cond, "assertion failed")
 #endif
 #endif /* ENABLE_CHECKING */
 
@@ -588,20 +588,20 @@ extern Lisp_Object make_number (EMACS_INT);
 
 /* Extract a value or address from a Lisp_Object.  */
 
-#define XCONS(a) (eassert (CONSP(a)),(struct Lisp_Cons *) XPNTR(a))
-#define XVECTOR(a) (eassert (VECTORLIKEP(a)),(struct Lisp_Vector *) XPNTR(a))
-#define XSTRING(a) (eassert (STRINGP(a)),(struct Lisp_String *) XPNTR(a))
-#define XSYMBOL(a) (eassert (SYMBOLP(a)),(struct Lisp_Symbol *) XPNTR(a))
-#define XFLOAT(a) (eassert (FLOATP(a)),(struct Lisp_Float *) XPNTR(a))
+#define XCONS(a) (eassert (CONSP (a)), (struct Lisp_Cons *) XPNTR (a))
+#define XVECTOR(a) (eassert (VECTORLIKEP (a)), (struct Lisp_Vector *) XPNTR (a))
+#define XSTRING(a) (eassert (STRINGP (a)), (struct Lisp_String *) XPNTR (a))
+#define XSYMBOL(a) (eassert (SYMBOLP (a)), (struct Lisp_Symbol *) XPNTR (a))
+#define XFLOAT(a) (eassert (FLOATP (a)), (struct Lisp_Float *) XPNTR (a))
 
 /* Misc types.  */
 
-#define XMISC(a)   ((union Lisp_Misc *) XPNTR(a))
-#define XMISCANY(a)     (eassert (MISCP (a)), &(XMISC(a)->u_any))
+#define XMISC(a)   ((union Lisp_Misc *) XPNTR (a))
+#define XMISCANY(a)     (eassert (MISCP (a)), &(XMISC (a)->u_any))
 #define XMISCTYPE(a)   (XMISCANY (a)->type)
-#define XMARKER(a)      (eassert (MARKERP (a)), &(XMISC(a)->u_marker))
-#define XOVERLAY(a)     (eassert (OVERLAYP (a)), &(XMISC(a)->u_overlay))
-#define XSAVE_VALUE(a)  (eassert (SAVE_VALUEP (a)), &(XMISC(a)->u_save_value))
+#define XMARKER(a)      (eassert (MARKERP (a)), &(XMISC (a)->u_marker))
+#define XOVERLAY(a)     (eassert (OVERLAYP (a)), &(XMISC (a)->u_overlay))
+#define XSAVE_VALUE(a)  (eassert (SAVE_VALUEP (a)), &(XMISC (a)->u_save_value))
 
 /* Forwarding object types.  */
 
@@ -616,14 +616,14 @@ extern Lisp_Object make_number (EMACS_INT);
 
 /* Pseudovector types.  */
 
-#define XPROCESS(a) (eassert (PROCESSP(a)),(struct Lisp_Process *) XPNTR(a))
-#define XWINDOW(a) (eassert (WINDOWP(a)),(struct window *) XPNTR(a))
-#define XTERMINAL(a) (eassert (TERMINALP(a)),(struct terminal *) XPNTR(a))
-#define XSUBR(a) (eassert (SUBRP(a)),(struct Lisp_Subr *) XPNTR(a))
-#define XBUFFER(a) (eassert (BUFFERP(a)),(struct buffer *) XPNTR(a))
-#define XCHAR_TABLE(a) (eassert (CHAR_TABLE_P (a)), (struct Lisp_Char_Table *) XPNTR(a))
-#define XSUB_CHAR_TABLE(a) (eassert (SUB_CHAR_TABLE_P (a)), (struct Lisp_Sub_Char_Table *) XPNTR(a))
-#define XBOOL_VECTOR(a) (eassert (BOOL_VECTOR_P (a)), (struct Lisp_Bool_Vector *) XPNTR(a))
+#define XPROCESS(a) (eassert (PROCESSP (a)), (struct Lisp_Process *) XPNTR (a))
+#define XWINDOW(a) (eassert (WINDOWP (a)), (struct window *) XPNTR (a))
+#define XTERMINAL(a) (eassert (TERMINALP (a)), (struct terminal *) XPNTR (a))
+#define XSUBR(a) (eassert (SUBRP (a)), (struct Lisp_Subr *) XPNTR (a))
+#define XBUFFER(a) (eassert (BUFFERP (a)), (struct buffer *) XPNTR (a))
+#define XCHAR_TABLE(a) (eassert (CHAR_TABLE_P (a)), (struct Lisp_Char_Table *) XPNTR (a))
+#define XSUB_CHAR_TABLE(a) (eassert (SUB_CHAR_TABLE_P (a)), (struct Lisp_Sub_Char_Table *) XPNTR (a))
+#define XBOOL_VECTOR(a) (eassert (BOOL_VECTOR_P (a)), (struct Lisp_Bool_Vector *) XPNTR (a))
 
 /* Construct a Lisp_Object from a value or address.  */
 
@@ -641,7 +641,7 @@ extern Lisp_Object make_number (EMACS_INT);
 
 /* Pseudovector types.  */
 
-#define XSETPVECTYPE(v, code) XSETTYPED_PVECTYPE(v, header.size, code)
+#define XSETPVECTYPE(v, code) XSETTYPED_PVECTYPE (v, header.size, code)
 #define XSETTYPED_PVECTYPE(v, size_member, code) \
   ((v)->size_member |= PSEUDOVECTOR_FLAG | (code))
 #define XSETPVECTYPESIZE(v, code, sizeval) \
@@ -753,8 +753,8 @@ struct Lisp_Cons
 #endif
 
 /* Use these from normal code.  */
-#define XCAR(c) LISP_MAKE_RVALUE(XCAR_AS_LVALUE(c))
-#define XCDR(c) LISP_MAKE_RVALUE(XCDR_AS_LVALUE(c))
+#define XCAR(c) LISP_MAKE_RVALUE (XCAR_AS_LVALUE (c))
+#define XCDR(c) LISP_MAKE_RVALUE (XCDR_AS_LVALUE (c))
 
 /* Use these to set the fields of a cons cell.
 
@@ -762,8 +762,8 @@ struct Lisp_Cons
    should not be read after 'c' is first modified.  Also, neither
    argument should be evaluated more than once; side effects are
    especially common in the second argument.  */
-#define XSETCAR(c,n) (XCAR_AS_LVALUE(c) = (n))
-#define XSETCDR(c,n) (XCDR_AS_LVALUE(c) = (n))
+#define XSETCAR(c,n) (XCAR_AS_LVALUE (c) = (n))
+#define XSETCDR(c,n) (XCDR_AS_LVALUE (c) = (n))
 
 /* Take the car or cdr of something whose type is not known.  */
 #define CAR(c)                                  \
@@ -876,14 +876,14 @@ struct Lisp_Vector
    of the shortest vector that would hold that struct.  */
 #define VECSIZE(type) ((sizeof (type)                                     \
                         - offsetof (struct Lisp_Vector, contents[0])      \
-                        + sizeof(Lisp_Object) - 1) /* round up */         \
+                        + sizeof (Lisp_Object) - 1) /* round up */        \
                        / sizeof (Lisp_Object))
 
 /* Like VECSIZE, but used when the pseudo-vector has non-Lisp_Object fields
    at the end and we need to compute the number of Lisp_Object fields (the
    ones that the GC needs to trace).  */
 #define PSEUDOVECSIZE(type, nonlispfield) \
-  ((offsetof(type, nonlispfield) - offsetof(struct Lisp_Vector, contents[0])) \
+  ((offsetof (type, nonlispfield) - offsetof (struct Lisp_Vector, contents[0])) \
    / sizeof (Lisp_Object))
 
 /* A char-table is a kind of vectorlike, with contents are like a
@@ -1603,16 +1603,6 @@ typedef unsigned char UCHAR;
    itself.  */
 #define CHARACTERBITS 22
 
-/* The maximum byte size consumed by push_key_description.
-   All callers should assure that at least this size of memory is
-   allocated at the place pointed by the second argument.
-
-   There are 6 modifiers, each consumes 2 chars.
-   The octal form of a character code consumes
-   (1 + CHARACTERBITS / 3 + 1) chars (including backslash at the head).
-   We need one more byte for string terminator `\0'.  */
-#define KEY_DESCRIPTION_SIZE ((2 * 6) + 1 + (CHARACTERBITS / 3) + 1 + 1)
-
 
 /* The glyph datatype, used to represent characters on the display.
    It consists of a char code and a face id.  */
@@ -3262,8 +3252,6 @@ extern void force_auto_save_soon (void);
 extern void init_keyboard (void);
 extern void syms_of_keyboard (void);
 extern void keys_of_keyboard (void);
-extern char *push_key_description (EMACS_INT, char *, int);
-
 
 /* Defined in indent.c */
 EXFUN (Fvertical_motion, 2);
@@ -3300,7 +3288,7 @@ extern void syms_of_frame (void);
 /* Defined in emacs.c */
 extern char **initial_argv;
 extern int initial_argc;
-#if defined(HAVE_X_WINDOWS) || defined(HAVE_NS)
+#if defined (HAVE_X_WINDOWS) || defined (HAVE_NS)
 extern int display_arg;
 #endif
 extern Lisp_Object decode_env_path (const char *, const char *);
@@ -3646,7 +3634,7 @@ extern void init_system_name (void);
 /* We used to use `abs', but that clashes with system headers on some
    platforms, and using a name reserved by Standard C is a bad idea
    anyway.  */
-#if !defined(eabs)
+#if !defined (eabs)
 #define eabs(x)         ((x) < 0 ? -(x) : (x))
 #endif
 
diff --git a/src/lread.c b/src/lread.c
index ec65e881b0e..11c4cf8c8f4 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1284,7 +1284,7 @@ Return t if the file exists and loads successfully.  */)
     }
 
   if (! NILP (Vpurify_flag))
-    Vpreloaded_file_list = Fcons (Fpurecopy(file), Vpreloaded_file_list);
+    Vpreloaded_file_list = Fcons (Fpurecopy (file), Vpreloaded_file_list);
 
   if (NILP (nomessage) || force_load_messages)
     {
diff --git a/src/m/alpha.h b/src/m/alpha.h
index 3a27cfd65d9..713598fa8b6 100644
--- a/src/m/alpha.h
+++ b/src/m/alpha.h
@@ -31,7 +31,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifdef __ELF__
 
-#if !defined(GNU_LINUX) && !defined(__NetBSD__)
+#if !defined (GNU_LINUX) && !defined (__NetBSD__)
 #define DATA_START    0x140000000
 #endif
 
diff --git a/src/menu.c b/src/menu.c
index fa31c8a51c1..587f55e14db 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -364,7 +364,7 @@ single_menu_item (Lisp_Object key, Lisp_Object item, Lisp_Object dummy, void *sk
       return;
     }
 
-#if defined(HAVE_X_WINDOWS) || defined(MSDOS)
+#if defined (HAVE_X_WINDOWS) || defined (MSDOS)
 #ifndef HAVE_BOXES
   /* Simulate radio buttons and toggle boxes by putting a prefix in
      front of them.  */
@@ -977,7 +977,7 @@ find_and_return_menu_selection (FRAME_PTR f, int keymaps, void *client_data)
   prefix = entry = Qnil;
   i = 0;
   subprefix_stack =
-    (Lisp_Object *)alloca(menu_items_used * sizeof (Lisp_Object));
+    (Lisp_Object *)alloca (menu_items_used * sizeof (Lisp_Object));
 
   while (i < menu_items_used)
     {
diff --git a/src/minibuf.c b/src/minibuf.c
index ad8f3ed8b86..d3f43b06254 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -914,12 +914,11 @@ Fifth arg HIST, if non-nil, specifies a history list and optionally
   history commands.  For consistency, you should also specify that
   element of the history as the value of INITIAL-CONTENTS.  Positions
   are counted starting from 1 at the beginning of the list.
-Sixth arg DEFAULT-VALUE is the default value or the list of default values.
-  If non-nil, it is available for history commands, and as the value
-  (or the first element of the list of default values) to return
-  if the user enters the empty string.  But, unless READ is non-nil,
-  `read-from-minibuffer' does NOT return DEFAULT-VALUE if the user enters
-  empty input!  It returns the empty string.
+Sixth arg DEFAULT-VALUE is a default value or list of default values.
+  If non-nil, it is available via history commands.  If READ is
+  non-nil, it is also the default to `read' if the user enters empty
+  input.  If READ is non-nil, `read-from-minibuffer' does NOT return
+  DEFAULT-VALUE for empty input!  It returns the empty string.
 Seventh arg INHERIT-INPUT-METHOD, if non-nil, means the minibuffer inherits
  the current input method and the setting of `enable-multibyte-characters'.
 If the variable `minibuffer-allow-text-properties' is non-nil,
diff --git a/src/msdos.c b/src/msdos.c
index 3f12bc85cbe..6b6e365a165 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -296,7 +296,7 @@ mouse_get_pos (FRAME_PTR *f, int insist, Lisp_Object *bar_window,
   FOR_EACH_FRAME (tail, frame)
     XFRAME (frame)->mouse_moved = 0;
 
-  *f = SELECTED_FRAME();
+  *f = SELECTED_FRAME ();
   *bar_window = Qnil;
   mouse_get_xy (&ix, &iy);
   *time = event_timestamp ();
@@ -310,7 +310,7 @@ mouse_check_moved (void)
   int x, y;
 
   mouse_get_xy (&x, &y);
-  SELECTED_FRAME()->mouse_moved |= (x != mouse_last_x || y != mouse_last_y);
+  SELECTED_FRAME ()->mouse_moved |= (x != mouse_last_x || y != mouse_last_y);
   mouse_last_x = x;
   mouse_last_y = y;
 }
@@ -582,7 +582,7 @@ dos_set_window_size (int *rows, int *cols)
   /* If the dimensions changed, the mouse highlight info is invalid.  */
   if (current_rows != *rows || current_cols != *cols)
     {
-      struct frame *f = SELECTED_FRAME();
+      struct frame *f = SELECTED_FRAME ();
       Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (f);
       Lisp_Object window = hlinfo->mouse_face_window;
 
@@ -639,7 +639,7 @@ msdos_set_cursor_shape (struct frame *f, int start_line, int width)
   /* Avoid the costly BIOS call if F isn't the currently selected
      frame.  Allow for NULL as unconditionally meaning the selected
      frame.  */
-  if (f && f != SELECTED_FRAME())
+  if (f && f != SELECTED_FRAME ())
     return;
 
   if (tty->termscript)
@@ -776,7 +776,7 @@ IT_ring_bell (struct frame *f)
 static void
 IT_set_face (int face)
 {
-  struct frame *sf = SELECTED_FRAME();
+  struct frame *sf = SELECTED_FRAME ();
   struct face *fp  = FACE_FROM_ID (sf, face);
   struct face *dfp = FACE_FROM_ID (sf, DEFAULT_FACE_ID);
   unsigned long fg, bg, dflt_fg, dflt_bg;
@@ -868,7 +868,7 @@ IT_write_glyphs (struct frame *f, struct glyph *str, int str_len)
 
   if (str_len <= 0) return;
 
-  sf = SELECTED_FRAME();
+  sf = SELECTED_FRAME ();
 
   /* Since faces get cached and uncached behind our back, we can't
      rely on their indices in the cache being consistent across
@@ -1755,7 +1755,7 @@ IT_set_frame_parameters (struct frame *f, Lisp_Object alist)
   if (redraw)
     {
       face_change_count++;      /* forces xdisp.c to recompute basic faces */
-      if (f == SELECTED_FRAME())
+      if (f == SELECTED_FRAME ())
         redraw_frame (f);
     }
 }
@@ -1772,7 +1772,7 @@ internal_terminal_init (void)
 {
   static int init_needed = 1;
   char *term = getenv ("TERM"), *colors;
-  struct frame *sf = SELECTED_FRAME();
+  struct frame *sf = SELECTED_FRAME ();
   struct tty_display_info *tty;
 
 #ifdef HAVE_X_WINDOWS
@@ -1923,7 +1923,7 @@ dos_get_saved_screen (char **screen, int *rows, int *cols)
 void
 check_x (void)
 {
-  if (! FRAME_MSDOS_P (SELECTED_FRAME()))
+  if (! FRAME_MSDOS_P (SELECTED_FRAME ()))
     error ("Not running under a window system");
 }
 
@@ -2442,12 +2442,12 @@ dos_rawgetc (void)
 {
   struct input_event event;
   union REGS regs;
-  Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (SELECTED_FRAME());
+  Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (SELECTED_FRAME ());
   EVENT_INIT (event);
 
 #ifndef HAVE_X_WINDOWS
   /* Maybe put the cursor where it should be.  */
-  IT_cmgoto (SELECTED_FRAME());
+  IT_cmgoto (SELECTED_FRAME ());
 #endif
 
   /* The following condition is equivalent to `kbhit ()', except that
@@ -2692,7 +2692,7 @@ dos_rawgetc (void)
           /* Generate SELECT_WINDOW_EVENTs when needed.  */
           if (!NILP (Vmouse_autoselect_window))
             {
-              mouse_window = window_from_coordinates (SELECTED_FRAME(),
+              mouse_window = window_from_coordinates (SELECTED_FRAME (),
                                                       mouse_last_x,
                                                       mouse_last_y,
                                                       0, 0);
@@ -2718,7 +2718,7 @@ dos_rawgetc (void)
           previous_help_echo_string = help_echo_string;
           help_echo_string = help_echo_object = help_echo_window = Qnil;
           help_echo_pos = -1;
-          note_mouse_highlight (SELECTED_FRAME(), mouse_last_x, mouse_last_y);
+          note_mouse_highlight (SELECTED_FRAME (), mouse_last_x, mouse_last_y);
           /* If the contents of the global variable help_echo has
              changed, generate a HELP_EVENT.  */
           if (!NILP (help_echo_string) || !NILP (previous_help_echo_string))
@@ -2913,7 +2913,7 @@ IT_menu_display (XMenu *menu, int y, int x, int pn, int *faces, int disp_help)
   int i, j, face, width,  mx, my, enabled, mousehere, row, col;
   struct glyph *text, *p;
   const unsigned char *q;
-  struct frame *sf = SELECTED_FRAME();
+  struct frame *sf = SELECTED_FRAME ();
 
   menu_help_message = NULL;
 
@@ -3092,7 +3092,7 @@ XMenuActivate (Display *foo, XMenu *menu, int *pane, int *selidx,
   int statecount, x, y, i, b, screensize, leave, result, onepane;
   int title_faces[4];           /* face to display the menu title */
   int faces[4], buffers_num_deleted = 0;
-  struct frame *sf = SELECTED_FRAME();
+  struct frame *sf = SELECTED_FRAME ();
   Lisp_Object saved_echo_area_message, selectface;
 
   /* Just in case we got here without a mouse present...  */
@@ -3539,10 +3539,10 @@ init_environment (int argc, char **argv, int skip_args)
           /* Some lusers set TMPDIR=e:, probably because some losing
              programs cannot handle multiple slashes if they use e:/.
              e: fails in `access' below, so we interpret e: as e:/.  */
-          tmp_len = strlen(tmp);
+          tmp_len = strlen (tmp);
           if (tmp[tmp_len - 1] != '/' && tmp[tmp_len - 1] != '\\')
             {
-              strcpy(buf, tmp);
+              strcpy (buf, tmp);
               buf[tmp_len++] = '/', buf[tmp_len] = 0;
               tmp = buf;
             }
diff --git a/src/nsgui.h b/src/nsgui.h
index 999dc27e310..5cc2eee3230 100644
--- a/src/nsgui.h
+++ b/src/nsgui.h
@@ -134,7 +134,7 @@ typedef struct {
 } XRectangle;
 
 #ifndef __OBJC__
-#if defined(__LP64__) && __LP64__
+#if defined (__LP64__) && __LP64__
 typedef double CGFloat;
 #else
 typedef float CGFloat;
diff --git a/src/nsterm.h b/src/nsterm.h
index 188ec732e82..b54e182780a 100644
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -362,7 +362,7 @@ extern EmacsMenu *mainMenu, *svcsMenu, *dockMenu;
 #endif
 
 #ifndef NS_HAVE_NSINTEGER
-#if defined(__LP64__) && __LP64__
+#if defined (__LP64__) && __LP64__
 typedef double CGFloat;
 typedef long NSInteger;
 typedef unsigned long NSUInteger;
diff --git a/src/print.c b/src/print.c
index d15590a8880..1d6998d8f1a 100644
--- a/src/print.c
+++ b/src/print.c
@@ -2029,9 +2029,9 @@ print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag
 
         case Lisp_Misc_Save_Value:
           strout ("#<save_value ", -1, -1, printcharfun);
-          sprintf(buf, "ptr=%p int=%"pD"d",
-                  XSAVE_VALUE (obj)->pointer,
-                  XSAVE_VALUE (obj)->integer);
+          sprintf (buf, "ptr=%p int=%"pD"d",
+                   XSAVE_VALUE (obj)->pointer,
+                   XSAVE_VALUE (obj)->integer);
           strout (buf, -1, -1, printcharfun);
           PRINTCHAR ('>');
           break;
diff --git a/src/process.c b/src/process.c
index 058ad5f871f..90ad9c21681 100644
--- a/src/process.c
+++ b/src/process.c
@@ -54,16 +54,16 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #endif
 
 #include <sys/ioctl.h>
-#if defined(HAVE_NET_IF_H)
+#if defined (HAVE_NET_IF_H)
 #include <net/if.h>
 #endif /* HAVE_NET_IF_H */
 
-#if defined(HAVE_IFADDRS_H)
+#if defined (HAVE_IFADDRS_H)
 /* Must be after net/if.h */
 #include <ifaddrs.h>
 
 /* We only use structs from this header when we use getifaddrs.  */
-#if defined(HAVE_NET_IF_DL_H)
+#if defined (HAVE_NET_IF_DL_H)
 #include <net/if_dl.h>
 #endif
 
@@ -256,7 +256,7 @@ static void create_pty (Lisp_Object);
 
 /* If we support a window system, turn on the code to poll periodically
    to detect C-g.  It isn't actually used when doing interrupt input.  */
-#if defined(HAVE_WINDOW_SYSTEM) && !defined(USE_ASYNC_EVENTS)
+#if defined (HAVE_WINDOW_SYSTEM) && !defined (USE_ASYNC_EVENTS)
 #define POLL_FOR_INPUT
 #endif
 
@@ -2921,7 +2921,7 @@ usage: (make-network-process &rest ARGS)  */)
     {
       /* Don't support network sockets when non-blocking mode is
          not available, since a blocked Emacs is not useful.  */
-#if !defined(O_NONBLOCK) && !defined(O_NDELAY)
+#if !defined (O_NONBLOCK) && !defined (O_NDELAY)
       error ("Network servers not supported");
 #else
       is_server = 1;
@@ -2975,7 +2975,7 @@ usage: (make-network-process &rest ARGS)  */)
   tem = Fplist_get (contact, QCfamily);
   if (NILP (tem))
     {
-#if defined(HAVE_GETADDRINFO) && defined(AF_INET6)
+#if defined (HAVE_GETADDRINFO) && defined (AF_INET6)
       family = AF_UNSPEC;
 #else
       family = AF_INET;
@@ -3560,7 +3560,7 @@ usage: (make-network-process &rest ARGS)  */)
 }
 
 
-#if defined(HAVE_NET_IF_H)
+#if defined (HAVE_NET_IF_H)
 
 #ifdef SIOCGIFCONF
 DEFUN ("network-interface-list", Fnetwork_interface_list, Snetwork_interface_list, 0, 0, 0,
@@ -3631,7 +3631,7 @@ format; see the description of ADDRESS in `make-network-process'.  */)
 }
 #endif /* SIOCGIFCONF */
 
-#if defined(SIOCGIFADDR) || defined(SIOCGIFHWADDR) || defined(SIOCGIFFLAGS)
+#if defined (SIOCGIFADDR) || defined (SIOCGIFHWADDR) || defined (SIOCGIFFLAGS)
 
 struct ifflag_def {
   int flag_bit;
@@ -3738,7 +3738,7 @@ FLAGS is the current flags of the interface.  */)
     return Qnil;
 
   elt = Qnil;
-#if defined(SIOCGIFFLAGS) && defined(HAVE_STRUCT_IFREQ_IFR_FLAGS)
+#if defined (SIOCGIFFLAGS) && defined (HAVE_STRUCT_IFREQ_IFR_FLAGS)
   if (ioctl (s, SIOCGIFFLAGS, &rq) == 0)
     {
       int flags = rq.ifr_flags;
@@ -3772,7 +3772,7 @@ FLAGS is the current flags of the interface.  */)
   res = Fcons (elt, res);
 
   elt = Qnil;
-#if defined(SIOCGIFHWADDR) && defined(HAVE_STRUCT_IFREQ_IFR_HWADDR)
+#if defined (SIOCGIFHWADDR) && defined (HAVE_STRUCT_IFREQ_IFR_HWADDR)
   if (ioctl (s, SIOCGIFHWADDR, &rq) == 0)
     {
       Lisp_Object hwaddr = Fmake_vector (make_number (6), Qnil);
@@ -3784,7 +3784,7 @@ FLAGS is the current flags of the interface.  */)
         p->contents[n] = make_number (((unsigned char *)&rq.ifr_hwaddr.sa_data[0])[n]);
       elt = Fcons (make_number (rq.ifr_hwaddr.sa_family), hwaddr);
     }
-#elif defined(HAVE_GETIFADDRS) && defined(LLADDR)
+#elif defined (HAVE_GETIFADDRS) && defined (LLADDR)
   if (getifaddrs (&ifap) != -1)
     {
       Lisp_Object hwaddr = Fmake_vector (make_number (6), Qnil);
@@ -3802,7 +3802,7 @@ FLAGS is the current flags of the interface.  */)
               || sdl->sdl_alen != 6)
             continue;
 
-          memcpy (linkaddr, LLADDR(sdl), sdl->sdl_alen);
+          memcpy (linkaddr, LLADDR (sdl), sdl->sdl_alen);
           for (n = 0; n < 6; n++)
             p->contents[n] = make_number (linkaddr[n]);
 
@@ -3819,7 +3819,7 @@ FLAGS is the current flags of the interface.  */)
   res = Fcons (elt, res);
 
   elt = Qnil;
-#if defined(SIOCGIFNETMASK) && (defined(HAVE_STRUCT_IFREQ_IFR_NETMASK) || defined(HAVE_STRUCT_IFREQ_IFR_ADDR))
+#if defined (SIOCGIFNETMASK) && (defined (HAVE_STRUCT_IFREQ_IFR_NETMASK) || defined (HAVE_STRUCT_IFREQ_IFR_ADDR))
   if (ioctl (s, SIOCGIFNETMASK, &rq) == 0)
     {
       any = 1;
@@ -3833,7 +3833,7 @@ FLAGS is the current flags of the interface.  */)
   res = Fcons (elt, res);
 
   elt = Qnil;
-#if defined(SIOCGIFBRDADDR) && defined(HAVE_STRUCT_IFREQ_IFR_BROADADDR)
+#if defined (SIOCGIFBRDADDR) && defined (HAVE_STRUCT_IFREQ_IFR_BROADADDR)
   if (ioctl (s, SIOCGIFBRDADDR, &rq) == 0)
     {
       any = 1;
@@ -3843,7 +3843,7 @@ FLAGS is the current flags of the interface.  */)
   res = Fcons (elt, res);
 
   elt = Qnil;
-#if defined(SIOCGIFADDR) && defined(HAVE_STRUCT_IFREQ_IFR_ADDR)
+#if defined (SIOCGIFADDR) && defined (HAVE_STRUCT_IFREQ_IFR_ADDR)
   if (ioctl (s, SIOCGIFADDR, &rq) == 0)
     {
       any = 1;
@@ -3857,7 +3857,7 @@ FLAGS is the current flags of the interface.  */)
   return any ? res : Qnil;
 }
 #endif
-#endif  /* defined(HAVE_NET_IF_H) */
+#endif  /* defined (HAVE_NET_IF_H) */
 
 /* Turn off input and output for process PROC.  */
 
@@ -7280,7 +7280,7 @@ init_process (void)
 #ifdef HAVE_GETSOCKNAME
    ADD_SUBFEATURE (QCservice, Qt);
 #endif
-#if defined(O_NONBLOCK) || defined(O_NDELAY)
+#if defined (O_NONBLOCK) || defined (O_NDELAY)
    ADD_SUBFEATURE (QCserver, Qt);
 #endif
 
@@ -7472,14 +7472,14 @@ The variable takes effect when `start-process' is called.  */);
   defsubr (&Sset_network_process_option);
   defsubr (&Smake_network_process);
   defsubr (&Sformat_network_address);
-#if defined(HAVE_NET_IF_H)
+#if defined (HAVE_NET_IF_H)
 #ifdef SIOCGIFCONF
   defsubr (&Snetwork_interface_list);
 #endif
-#if defined(SIOCGIFADDR) || defined(SIOCGIFHWADDR) || defined(SIOCGIFFLAGS)
+#if defined (SIOCGIFADDR) || defined (SIOCGIFHWADDR) || defined (SIOCGIFFLAGS)
   defsubr (&Snetwork_interface_info);
 #endif
-#endif /* defined(HAVE_NET_IF_H) */
+#endif /* defined (HAVE_NET_IF_H) */
 #ifdef DATAGRAM_SOCKETS
   defsubr (&Sprocess_datagram_address);
   defsubr (&Sset_process_datagram_address);
diff --git a/src/ralloc.c b/src/ralloc.c
index 64a47416202..50d322523c1 100644
--- a/src/ralloc.c
+++ b/src/ralloc.c
@@ -100,7 +100,7 @@ static int extra_bytes;
                        & ~(page_size - 1))
 #define ROUND_TO_PAGE(addr) (addr & (~(page_size - 1)))
 
-#define MEM_ALIGN sizeof(double)
+#define MEM_ALIGN sizeof (double)
 #define MEM_ROUNDUP(addr) (((unsigned long int)(addr) + MEM_ALIGN - 1) \
                                    & ~(MEM_ALIGN - 1))
 
@@ -468,7 +468,7 @@ relocate_blocs (bloc_ptr bloc, heap_ptr heap, POINTER address)
 
   /* No need to ever call this if arena is frozen, bug somewhere!  */
   if (r_alloc_freeze_level)
-    abort();
+    abort ();
 
   while (b)
     {
@@ -592,7 +592,7 @@ resize_bloc (bloc_ptr bloc, SIZE size)
 
   /* No need to ever call this if arena is frozen, bug somewhere!  */
   if (r_alloc_freeze_level)
-    abort();
+    abort ();
 
   if (bloc == NIL_BLOC || size == bloc->size)
     return 1;
diff --git a/src/regex.c b/src/regex.c
index d1b835621d9..8033ab9edaa 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -67,7 +67,7 @@
 # define regexec(pr, st, nm, pm, ef) __regexec (pr, st, nm, pm, ef)
 # define regcomp(preg, pattern, cflags) __regcomp (preg, pattern, cflags)
 # define regerror(err_code, preg, errbuf, errbuf_size) \
-        __regerror(err_code, preg, errbuf, errbuf_size)
+        __regerror (err_code, preg, errbuf, errbuf_size)
 # define re_set_registers(bu, re, nu, st, en) \
         __re_set_registers (bu, re, nu, st, en)
 # define re_match_2(bufp, string1, size1, string2, size2, pos, regs, stop) \
@@ -376,12 +376,12 @@ enum syntaxcode { Swhitespace = 0, Sword = 1, Ssymbol = 2 };
 # define ISUPPER(c) isupper (c)
 # define ISXDIGIT(c) isxdigit (c)
 
-# define ISWORD(c) ISALPHA(c)
+# define ISWORD(c) ISALPHA (c)
 
 # ifdef _tolower
-#  define TOLOWER(c) _tolower(c)
+#  define TOLOWER(c) _tolower (c)
 # else
-#  define TOLOWER(c) tolower(c)
+#  define TOLOWER(c) tolower (c)
 # endif
 
 /* How many characters in the character set.  */
@@ -2112,7 +2112,7 @@ re_iswctype (int ch, re_wctype_t cc)
     case RECC_WORD: return ISWORD (ch) != 0;
     case RECC_ERROR: return false;
     default:
-      abort();
+      abort ();
     }
 }
 
@@ -2133,7 +2133,7 @@ re_wctype_to_bit (re_wctype_t cc)
     case RECC_ASCII: case RECC_DIGIT: case RECC_XDIGIT: case RECC_CNTRL:
     case RECC_BLANK: case RECC_UNIBYTE: case RECC_ERROR: return 0;
     default:
-      abort();
+      abort ();
     }
 }
 #endif
@@ -4537,10 +4537,10 @@ WEAK_ALIAS (__re_search_2, re_search_2)
 
 /* Declarations and macros for re_match_2.  */
 
-static int bcmp_translate _RE_ARGS((re_char *s1, re_char *s2,
-                                    register ssize_t len,
-                                    RE_TRANSLATE_TYPE translate,
-                                    const int multibyte));
+static int bcmp_translate _RE_ARGS ((re_char *s1, re_char *s2,
+                                     register ssize_t len,
+                                     RE_TRANSLATE_TYPE translate,
+                                     const int multibyte));
 
 /* This converts PTR, a pointer into one of the search strings `string1'
    and `string2' into an offset from the beginning of that string.  */
@@ -6276,7 +6276,7 @@ re_match_2_internal (struct re_pattern_buffer *bufp, const re_char *string1,
               goto fail;
 
             default:
-              abort();
+              abort ();
             }
 
           assert (p >= bufp->buffer && p <= pend);
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
index 178d7082f72..3d78bf695bc 100644
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -103,7 +103,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* This is needed for dispnew.c:update_frame.  */
 #ifdef emacs
 #include <stdio.h>  /* Get the definition of _IO_STDIO_H.  */
-#if defined(_IO_STDIO_H) || defined(_STDIO_USES_IOSTREAM)
+#if defined (_IO_STDIO_H) || defined (_STDIO_USES_IOSTREAM)
 /* New C libio names.  */
 #define GNU_LIBRARY_PENDING_OUTPUT_COUNT(FILE) \
   ((FILE)->_IO_write_ptr - (FILE)->_IO_write_base)
diff --git a/src/s/gnu.h b/src/s/gnu.h
index 8f6035b36a7..c40f764f8bf 100644
--- a/src/s/gnu.h
+++ b/src/s/gnu.h
@@ -37,7 +37,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifdef emacs
 #include <stdio.h>  /* Get the definition of _IO_STDIO_H.  */
-#if defined(_IO_STDIO_H) || defined(_STDIO_USES_IOSTREAM)
+#if defined (_IO_STDIO_H) || defined (_STDIO_USES_IOSTREAM)
 /* new C libio names */
 #define GNU_LIBRARY_PENDING_OUTPUT_COUNT(FILE) \
   ((FILE)->_IO_write_ptr - (FILE)->_IO_write_base)
diff --git a/src/sound.c b/src/sound.c
index 07c7dab0ada..362c04b7d40 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -1013,7 +1013,7 @@ alsa_configure (struct sound_device *sd)
 
   err = snd_pcm_hw_params_get_buffer_size (p->hwparams, &buffer_size);
   if (err < 0)
-    alsa_sound_perror("Unable to get buffer size for playback", err);
+    alsa_sound_perror ("Unable to get buffer size for playback", err);
 
   err = snd_pcm_sw_params_current (p->handle, p->swparams);
   if (err < 0)
@@ -1071,7 +1071,7 @@ alsa_configure (struct sound_device *sd)
                       snd_mixer_selem_set_playback_volume (e, chn, vol);
                   }
               }
-          snd_mixer_close(handle);
+          snd_mixer_close (handle);
         }
     }
 }
@@ -1182,7 +1182,7 @@ alsa_write (struct sound_device *sd, const char *buffer, EMACS_INT nbytes)
           else if (err == -ESTRPIPE)
             {
               while ((err = snd_pcm_resume (p->handle)) == -EAGAIN)
-                sleep(1);       /* wait until the suspend flag is released */
+                sleep (1);      /* wait until the suspend flag is released */
               if (err < 0)
                 {
                   err = snd_pcm_prepare (p->handle);
diff --git a/src/sysdep.c b/src/sysdep.c
index e20bd591da1..f97a8585253 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -300,7 +300,7 @@ wait_for_termination_1 (int pid, int interruptible)
 {
   while (1)
     {
-#if (defined (BSD_SYSTEM) || defined (HPUX)) && !defined(__GNU__)
+#if (defined (BSD_SYSTEM) || defined (HPUX)) && !defined (__GNU__)
       /* Note that kill returns -1 even if the process is just a zombie now.
          But inevitably a SIGCHLD interrupt should be generated
          and child_sig will do wait3 and make the process go away. */
@@ -1326,7 +1326,7 @@ setup_pty (int fd)
      Since the latter lossage is more benign, we may as well
      lose that way.  -- cph */
 #ifdef FIONBIO
-#if defined(UNIX98_PTYS)
+#if defined (UNIX98_PTYS)
   {
     int on = 1;
     ioctl (fd, FIONBIO, &on);
@@ -1499,7 +1499,7 @@ sys_signal (int signal_number, signal_handler_t action)
      after a signal that sets the interrupt_input_pending flag.  */
   /* Non-interactive keyboard input goes through stdio, where we always
      want restartable system calls.  */
-# if defined (BROKEN_SA_RESTART) || defined(SYNC_INPUT)
+# if defined (BROKEN_SA_RESTART) || defined (SYNC_INPUT)
   if (noninteractive)
 # endif
     new_action.sa_flags = SA_RESTART;
@@ -2040,7 +2040,7 @@ rename (const char *from, const char *to)
 #endif
 
 
-#if defined(HPUX) && !defined(HAVE_PERROR)
+#if defined (HPUX) && !defined (HAVE_PERROR)
 
 /* HPUX curses library references perror, but as far as we know
    it won't be called.  Anyway this definition will do for now.  */
diff --git a/src/termcap.c b/src/termcap.c
index 6f24817fa72..10c195eebe2 100644
--- a/src/termcap.c
+++ b/src/termcap.c
@@ -400,7 +400,7 @@ tgetent (char *bp, const char *name)
   if (termcap_name && (*termcap_name == '\\'
                        || *termcap_name == '/'
                        || termcap_name[1] == ':'))
-    dostounix_filename(termcap_name);
+    dostounix_filename (termcap_name);
 #endif
 
   filep = termcap_name && valid_filename_p (termcap_name);
diff --git a/src/termchar.h b/src/termchar.h
index 035974a8ce6..5ca3cf305c1 100644
--- a/src/termchar.h
+++ b/src/termchar.h
@@ -207,6 +207,6 @@ extern struct tty_display_info *tty_list;
   (((f)->output_method == output_termcap        \
     || (f)->output_method == output_msdos_raw)  \
    ? (f)->terminal->display_info.tty            \
-   : (abort(), (struct tty_display_info *) 0))
+   : (abort (), (struct tty_display_info *) 0))
 
 #define CURTTY() FRAME_TTY (SELECTED_FRAME())
diff --git a/src/unexaix.c b/src/unexaix.c
index df4c5b8905c..22120b0ea03 100644
--- a/src/unexaix.c
+++ b/src/unexaix.c
@@ -221,24 +221,24 @@ make_hdr (int new, int a_out,
           }
 
 #define CHECK_SCNHDR(ptr, name, flags) \
-  if (strcmp(s->s_name, name) == 0) { \
+  if (strcmp (s->s_name, name) == 0) { \
     if (s->s_flags != flags) { \
-      fprintf(stderr, "unexec: %lx flags where %x expected in %s section.\n", \
-              (unsigned long)s->s_flags, flags, name); \
+      fprintf (stderr, "unexec: %lx flags where %x expected in %s section.\n", \
+               (unsigned long)s->s_flags, flags, name);                 \
     } \
     if (ptr) { \
-      fprintf(stderr, "unexec: duplicate section header for section %s.\n", \
-              name); \
+      fprintf (stderr, "unexec: duplicate section header for section %s.\n", \
+               name);                                                   \
     } \
     ptr = s; \
   }
-        CHECK_SCNHDR(f_thdr, _TEXT, STYP_TEXT);
-        CHECK_SCNHDR(f_dhdr, _DATA, STYP_DATA);
-        CHECK_SCNHDR(f_bhdr, _BSS, STYP_BSS);
-        CHECK_SCNHDR(f_lhdr, _LOADER, STYP_LOADER);
-        CHECK_SCNHDR(f_dbhdr, _DEBUG,  STYP_DEBUG);
-        CHECK_SCNHDR(f_tchdr, _TYPCHK,  STYP_TYPCHK);
-        CHECK_SCNHDR(f_xhdr, _EXCEPT,  STYP_EXCEPT);
+        CHECK_SCNHDR (f_thdr, _TEXT, STYP_TEXT);
+        CHECK_SCNHDR (f_dhdr, _DATA, STYP_DATA);
+        CHECK_SCNHDR (f_bhdr, _BSS, STYP_BSS);
+        CHECK_SCNHDR (f_lhdr, _LOADER, STYP_LOADER);
+        CHECK_SCNHDR (f_dbhdr, _DEBUG,  STYP_DEBUG);
+        CHECK_SCNHDR (f_tchdr, _TYPCHK,  STYP_TYPCHK);
+        CHECK_SCNHDR (f_xhdr, _EXCEPT,  STYP_EXCEPT);
       }
 
       if (f_thdr == 0)
@@ -541,7 +541,7 @@ unrelocate_symbols (int new, int a_out, char *a_name, char *new_name)
 #else
   /* This worked (and was needed) before AIX 4.2.
      I have no idea why. -- Mike */
-  ulong d_reloc = (ulong) &_data - ALIGN(f_ohdr.data_start, 2);
+  ulong d_reloc = (ulong) &_data - ALIGN (f_ohdr.data_start, 2);
 #endif
   int * p;
 
diff --git a/src/unexelf.c b/src/unexelf.c
index a169ffcb5c8..979d6dce629 100644
--- a/src/unexelf.c
+++ b/src/unexelf.c
@@ -453,7 +453,7 @@ typedef struct {
         long cbRfdOffset;
         long cbExtOffset;
 } HDRR, *pHDRR;
-#define cbHDRR sizeof(HDRR)
+#define cbHDRR sizeof (HDRR)
 #define hdrNil ((pHDRR)0)
 #endif
 
@@ -549,11 +549,11 @@ typedef struct {
    */
 
 #define OLD_SECTION_H(n) \
-     (*(ElfW(Shdr) *) ((byte *) old_section_h + old_file_h->e_shentsize * (n)))
+     (*(ElfW (Shdr) *) ((byte *) old_section_h + old_file_h->e_shentsize * (n)))
 #define NEW_SECTION_H(n) \
-     (*(ElfW(Shdr) *) ((byte *) new_section_h + new_file_h->e_shentsize * (n)))
+     (*(ElfW (Shdr) *) ((byte *) new_section_h + new_file_h->e_shentsize * (n)))
 #define NEW_PROGRAM_H(n) \
-     (*(ElfW(Phdr) *) ((byte *) new_program_h + new_file_h->e_phentsize * (n)))
+     (*(ElfW (Phdr) *) ((byte *) new_program_h + new_file_h->e_phentsize * (n)))
 
 #define PATCH_INDEX(n) \
   do { \
@@ -563,8 +563,8 @@ typedef unsigned char byte;
 
 /* Round X up to a multiple of Y.  */
 
-static ElfW(Addr)
-round_up (ElfW(Addr) x, ElfW(Addr) y)
+static ElfW (Addr)
+round_up (ElfW (Addr) x, ElfW (Addr) y)
 {
   int rem = x % y;
   if (rem == 0)
@@ -581,7 +581,7 @@ round_up (ElfW(Addr) x, ElfW(Addr) y)
 
 static int
 find_section (const char *name, const char *section_names, const char *file_name,
-              ElfW(Ehdr) *old_file_h, ElfW(Shdr) *old_section_h, int noerror)
+              ElfW (Ehdr) *old_file_h, ElfW (Shdr) *old_section_h, int noerror)
 {
   int idx;
 
@@ -635,19 +635,19 @@ unexec (const char *new_name, const char *old_name)
 
   /* Pointers to the file, program and section headers for the old and
      new files.  */
-  ElfW(Ehdr) *old_file_h, *new_file_h;
-  ElfW(Phdr) *old_program_h, *new_program_h;
-  ElfW(Shdr) *old_section_h, *new_section_h;
+  ElfW (Ehdr) *old_file_h, *new_file_h;
+  ElfW (Phdr) *old_program_h, *new_program_h;
+  ElfW (Shdr) *old_section_h, *new_section_h;
 
   /* Point to the section name table in the old file.  */
   char *old_section_names;
 
-  ElfW(Addr) old_bss_addr, new_bss_addr;
-  ElfW(Word) old_bss_size, new_data2_size;
-  ElfW(Off)  new_data2_offset;
-  ElfW(Addr) new_data2_addr;
-  ElfW(Off)  old_bss_offset;
-  ElfW(Word) new_data2_incr;
+  ElfW (Addr) old_bss_addr, new_bss_addr;
+  ElfW (Word) old_bss_size, new_data2_size;
+  ElfW (Off)  new_data2_offset;
+  ElfW (Addr) new_data2_addr;
+  ElfW (Off)  old_bss_offset;
+  ElfW (Word) new_data2_incr;
 
   int n, nn;
   int old_bss_index, old_sbss_index, old_plt_index;
@@ -690,9 +690,9 @@ unexec (const char *new_name, const char *old_name)
 
   /* Get pointers to headers & section names */
 
-  old_file_h = (ElfW(Ehdr) *) old_base;
-  old_program_h = (ElfW(Phdr) *) ((byte *) old_base + old_file_h->e_phoff);
-  old_section_h = (ElfW(Shdr) *) ((byte *) old_base + old_file_h->e_shoff);
+  old_file_h = (ElfW (Ehdr) *) old_base;
+  old_program_h = (ElfW (Phdr) *) ((byte *) old_base + old_file_h->e_phoff);
+  old_section_h = (ElfW (Shdr) *) ((byte *) old_base + old_file_h->e_shoff);
   old_section_names = (char *) old_base
     + OLD_SECTION_H (old_file_h->e_shstrndx).sh_offset;
 
@@ -759,7 +759,7 @@ unexec (const char *new_name, const char *old_name)
 
 #if defined (emacs) || !defined (DEBUG)
   new_break = sbrk (0);
-  new_bss_addr = (ElfW(Addr)) new_break;
+  new_bss_addr = (ElfW (Addr)) new_break;
 #else
   new_bss_addr = old_bss_addr + old_bss_size + 0x1234;
 #endif
@@ -806,9 +806,9 @@ unexec (const char *new_name, const char *old_name)
   if (new_base == MAP_FAILED)
     fatal ("Can't allocate buffer for %s\n", old_name, 0);
 
-  new_file_h = (ElfW(Ehdr) *) new_base;
-  new_program_h = (ElfW(Phdr) *) ((byte *) new_base + old_file_h->e_phoff);
-  new_section_h = (ElfW(Shdr) *)
+  new_file_h = (ElfW (Ehdr) *) new_base;
+  new_program_h = (ElfW (Phdr) *) ((byte *) new_base + old_file_h->e_phoff);
+  new_section_h = (ElfW (Shdr) *)
     ((byte *) new_base + old_file_h->e_shoff + new_data2_incr);
 
   /* Make our new file, program and section headers as copies of the
@@ -844,7 +844,7 @@ unexec (const char *new_name, const char *old_name)
   for (n = new_file_h->e_phnum - 1; n >= 0; n--)
     {
       /* Compute maximum of all requirements for alignment of section.  */
-      ElfW(Word) alignment = (NEW_PROGRAM_H (n)).p_align;
+      ElfW (Word) alignment = (NEW_PROGRAM_H (n)).p_align;
       if ((OLD_SECTION_H (old_bss_index)).sh_addralign > alignment)
         alignment = OLD_SECTION_H (old_bss_index).sh_addralign;
 
@@ -1078,8 +1078,8 @@ temacs:
       if (NEW_SECTION_H (nn).sh_type == SHT_MIPS_DEBUG
           && old_mdebug_index != -1)
         {
-          int diff = NEW_SECTION_H(nn).sh_offset
-                - OLD_SECTION_H(old_mdebug_index).sh_offset;
+          int diff = NEW_SECTION_H (nn).sh_offset
+                - OLD_SECTION_H (old_mdebug_index).sh_offset;
           HDRR *phdr = (HDRR *)(NEW_SECTION_H (nn).sh_offset + new_base);
 
           if (diff)
@@ -1158,9 +1158,9 @@ temacs:
       if (NEW_SECTION_H (nn).sh_type == SHT_SYMTAB
           || NEW_SECTION_H (nn).sh_type == SHT_DYNSYM)
         {
-          ElfW(Shdr) *spt = &NEW_SECTION_H (nn);
+          ElfW (Shdr) *spt = &NEW_SECTION_H (nn);
           unsigned int num = spt->sh_size / spt->sh_entsize;
-          ElfW(Sym) * sym = (ElfW(Sym) *) (NEW_SECTION_H (nn).sh_offset +
+          ElfW (Sym) * sym = (ElfW (Sym) *) (NEW_SECTION_H (nn).sh_offset +
                                            new_base);
           for (; num--; sym++)
             {
@@ -1178,7 +1178,7 @@ temacs:
   for (n = new_file_h->e_shnum - 1; n; n--)
     {
       byte *symnames;
-      ElfW(Sym) *symp, *symendp;
+      ElfW (Sym) *symp, *symendp;
 
       if (NEW_SECTION_H (n).sh_type != SHT_DYNSYM
           && NEW_SECTION_H (n).sh_type != SHT_SYMTAB)
@@ -1186,8 +1186,8 @@ temacs:
 
       symnames = ((byte *) new_base
                   + NEW_SECTION_H (NEW_SECTION_H (n).sh_link).sh_offset);
-      symp = (ElfW(Sym) *) (NEW_SECTION_H (n).sh_offset + new_base);
-      symendp = (ElfW(Sym) *) ((byte *)symp + NEW_SECTION_H (n).sh_size);
+      symp = (ElfW (Sym) *) (NEW_SECTION_H (n).sh_offset + new_base);
+      symendp = (ElfW (Sym) *) ((byte *)symp + NEW_SECTION_H (n).sh_size);
 
       for (; symp < symendp; symp ++)
         {
@@ -1231,7 +1231,7 @@ temacs:
      that it can undo relocations performed by the runtime linker.  */
   for (n = new_file_h->e_shnum - 1; n; n--)
     {
-      ElfW(Shdr) section = NEW_SECTION_H (n);
+      ElfW (Shdr) section = NEW_SECTION_H (n);
 
       /* Cause a compilation error if anyone uses n instead of nn below.  */
       #define n ((void) 0);
@@ -1263,21 +1263,21 @@ temacs:
               || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
                           ".data1"))
             {
-              ElfW(Addr) offset = (NEW_SECTION_H (nn).sh_addr
+              ElfW (Addr) offset = (NEW_SECTION_H (nn).sh_addr
                                    - NEW_SECTION_H (nn).sh_offset);
               caddr_t reloc = old_base + section.sh_offset, end;
               for (end = reloc + section.sh_size; reloc < end;
                    reloc += section.sh_entsize)
                 {
-                  ElfW(Addr) addr = ((ElfW(Rel) *) reloc)->r_offset - offset;
+                  ElfW (Addr) addr = ((ElfW (Rel) *) reloc)->r_offset - offset;
 #ifdef __alpha__
                   /* The Alpha ELF binutils currently have a bug that
                      sometimes results in relocs that contain all
                      zeroes.  Work around this for now...  */
-                  if (((ElfW(Rel) *) reloc)->r_offset == 0)
+                  if (((ElfW (Rel) *) reloc)->r_offset == 0)
                     continue;
 #endif
-                  memcpy (new_base + addr, old_base + addr, sizeof(ElfW(Addr)));
+                  memcpy (new_base + addr, old_base + addr, sizeof (ElfW (Addr)));
                 }
             }
           break;
diff --git a/src/unexmacosx.c b/src/unexmacosx.c
index 0751eeacb9b..a4c2f241c9f 100644
--- a/src/unexmacosx.c
+++ b/src/unexmacosx.c
@@ -478,7 +478,7 @@ find_emacs_zone_regions (void)
 {
   num_unexec_regions = 0;
 
-  emacs_zone->introspect->enumerator (mach_task_self(), 0,
+  emacs_zone->introspect->enumerator (mach_task_self (), 0,
                                       MALLOC_PTR_REGION_RANGE_TYPE
                                       | MALLOC_ADMIN_REGION_RANGE_TYPE,
                                       (vm_address_t) emacs_zone,
diff --git a/src/unexw32.c b/src/unexw32.c
index e03fa6c9b9a..e5440c2f500 100644
--- a/src/unexw32.c
+++ b/src/unexw32.c
@@ -123,8 +123,8 @@ _start (void)
      is finished.  */
 #ifdef HAVE_NTGUI
   /* determine WinMain args like crt0.c does */
-  hinst = GetModuleHandle(NULL);
-  lpCmdLine = GetCommandLine();
+  hinst = GetModuleHandle (NULL);
+  lpCmdLine = GetCommandLine ();
   nCmdShow = SW_SHOWDEFAULT;
 #endif
   mainCRTStartup ();
@@ -326,7 +326,7 @@ relocate_offset (DWORD offset,
 #define PTR_TO_RVA(ptr) ((DWORD)(ptr) - (DWORD) GetModuleHandle (NULL))
 
 #define RVA_TO_PTR(var,section,filedata) \
-          ((void *)(RVA_TO_OFFSET(var,section) + (filedata).file_base))
+          ((void *)(RVA_TO_OFFSET (var,section) + (filedata).file_base))
 
 #define PTR_TO_OFFSET(ptr, pfile_data) \
           ((unsigned char *)(ptr) - (pfile_data)->file_base)
diff --git a/src/vm-limit.c b/src/vm-limit.c
index 846946b41c1..fc847a295dd 100644
--- a/src/vm-limit.c
+++ b/src/vm-limit.c
@@ -237,7 +237,7 @@ check_memory_limits (void)
     (*warn_function) ("Warning: memory in use exceeds lisp pointer size");
 }
 
-#if !defined(CANNOT_DUMP) || !defined(SYSTEM_MALLOC)
+#if !defined (CANNOT_DUMP) || !defined (SYSTEM_MALLOC)
 /* Some systems that cannot dump also cannot implement these.  */
 
 /*
diff --git a/src/w16select.c b/src/w16select.c
index d5aae1b2e5c..cae7a6f82dd 100644
--- a/src/w16select.c
+++ b/src/w16select.c
@@ -110,7 +110,7 @@ identify_winoldap_version (void)
                         <> 1700H: AL = Major version number
                                   AH = Minor version number */
   regs.x.ax = 0x1700;
-  __dpmi_int(0x2f, &regs);
+  __dpmi_int (0x2f, &regs);
   return regs.x.ax;
 }
 
@@ -133,7 +133,7 @@ open_clipboard (void)
      Return Values   AX == 0: Clipboard already open
                         <> 0: Clipboard opened */
   regs.x.ax = 0x1701;
-  __dpmi_int(0x2f, &regs);
+  __dpmi_int (0x2f, &regs);
   return regs.x.ax;
 }
 
@@ -147,7 +147,7 @@ empty_clipboard (void)
      Return Values   AX == 0: Error occurred
                         <> 0: OK, Clipboard emptied */
   regs.x.ax = 0x1702;
-  __dpmi_int(0x2f, &regs);
+  __dpmi_int (0x2f, &regs);
   return regs.x.ax;
 }
 
@@ -294,7 +294,7 @@ set_clipboard_data (unsigned Format, void *Data, unsigned Size, int Raw)
   regs.x.cx = truelen & 0xffff;
   regs.x.es = xbuf_addr >> 4;
   regs.x.bx = xbuf_addr & 15;
-  __dpmi_int(0x2f, &regs);
+  __dpmi_int (0x2f, &regs);
 
   free_xfer_buf ();
 
@@ -320,7 +320,7 @@ get_clipboard_data_size (unsigned Format)
                            the clipboard.  */
   regs.x.ax = 0x1704;
   regs.x.dx = Format;
-  __dpmi_int(0x2f, &regs);
+  __dpmi_int (0x2f, &regs);
   return ( (((unsigned)regs.x.dx) << 16) | regs.x.ax);
 }
 
@@ -353,7 +353,7 @@ get_clipboard_data (unsigned Format, void *Data, unsigned Size, int Raw)
   regs.x.dx = Format;
   regs.x.es = xbuf_addr >> 4;
   regs.x.bx = xbuf_addr & 15;
-  __dpmi_int(0x2f, &regs);
+  __dpmi_int (0x2f, &regs);
   if (regs.x.ax != 0)
     {
       unsigned char null_char = '\0';
@@ -415,7 +415,7 @@ close_clipboard (void)
      Return Values   AX == 0: Error occurred
                         <> 0: OK */
   regs.x.ax = 0x1708;
-  __dpmi_int(0x2f, &regs);
+  __dpmi_int (0x2f, &regs);
   return regs.x.ax;
 }
 
@@ -432,7 +432,7 @@ clipboard_compact (unsigned Size)
   regs.x.ax = 0x1709;
   regs.x.si = Size >> 16;
   regs.x.cx = Size & 0xffff;
-  __dpmi_int(0x2f, &regs);
+  __dpmi_int (0x2f, &regs);
   return ((unsigned)regs.x.dx << 16) | regs.x.ax;
 }
 
diff --git a/src/w32.c b/src/w32.c
index de72e180c62..91893ddfc61 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -95,7 +95,7 @@ typedef struct _MEMORY_STATUS_EX {
 #include <tlhelp32.h>
 #include <psapi.h>
 #include <w32api.h>
-#if !defined(__MINGW32__) || __W32API_MAJOR_VERSION < 3 || (__W32API_MAJOR_VERSION == 3 && __W32API_MINOR_VERSION < 15)
+#if !defined (__MINGW32__) || __W32API_MAJOR_VERSION < 3 || (__W32API_MAJOR_VERSION == 3 && __W32API_MINOR_VERSION < 15)
 /* This either is not in psapi.h or guarded by higher value of
    _WIN32_WINNT than what we use.  w32api supplied with MinGW 3.15
    defines it in psapi.h  */
@@ -6212,7 +6212,7 @@ emacs_gnutls_pull (gnutls_transport_ptr_t p, void* buf, size_t sz)
 
   for (;;)
     {
-      n = sys_read(fd, (char*)buf, sz);
+      n = sys_read (fd, (char*)buf, sz);
 
       if (n >= 0)
         return n;
@@ -6222,7 +6222,7 @@ emacs_gnutls_pull (gnutls_transport_ptr_t p, void* buf, size_t sz)
       if (err == EWOULDBLOCK)
         {
           /* Set a small timeout.  */
-          EMACS_SET_SECS_USECS(timeout, 1, 0);
+          EMACS_SET_SECS_USECS (timeout, 1, 0);
           FD_ZERO (&fdset);
           FD_SET ((int)fd, &fdset);
 
@@ -6252,7 +6252,7 @@ emacs_gnutls_push (gnutls_transport_ptr_t p, const void* buf, size_t sz)
 {
   struct Lisp_Process *process = (struct Lisp_Process *)p;
   int fd = process->outfd;
-  ssize_t n = sys_write(fd, buf, sz);
+  ssize_t n = sys_write (fd, buf, sz);
 
   /* 0 or more bytes written means everything went fine.  */
   if (n >= 0)
diff --git a/src/w32term.h b/src/w32term.h
index 24a2be7dca9..710394583e4 100644
--- a/src/w32term.h
+++ b/src/w32term.h
@@ -68,7 +68,7 @@ struct w32_palette_entry {
 #endif
 };
 
-extern void w32_regenerate_palette(struct frame *f);
+extern void w32_regenerate_palette (struct frame *f);
 
 
 /* For each display (currently only one on w32), we have a structure that
diff --git a/src/widget.c b/src/widget.c
index a09ec2631ad..0582718948d 100644
--- a/src/widget.c
+++ b/src/widget.c
@@ -86,12 +86,12 @@ static XtGeometryResult EmacsFrameQueryGeometry (Widget widget, XtWidgetGeometry
 #undef XtOffset
 #define XtOffset(p_type,field) \
         ((Cardinal) (((char *) (&(((p_type)0)->field))) - ((char *)0)))
-#define offset(field) XtOffset(EmacsFrame, emacs_frame.field)
+#define offset(field) XtOffset (EmacsFrame, emacs_frame.field)
 
 static XtResource resources[] = {
-  {XtNgeometry, XtCGeometry, XtRString, sizeof(String),
+  {XtNgeometry, XtCGeometry, XtRString, sizeof (String),
      offset (geometry), XtRString, (XtPointer) 0},
-  {XtNiconic, XtCIconic, XtRBoolean, sizeof(Boolean),
+  {XtNiconic, XtCIconic, XtRBoolean, sizeof (Boolean),
      offset (iconic), XtRImmediate, (XtPointer) False},
 
   {XtNemacsFrame, XtCEmacsFrame, XtRPointer, sizeof (XtPointer),
@@ -105,12 +105,12 @@ static XtResource resources[] = {
      offset (internal_border_width), XtRImmediate, (XtPointer)4},
   {XtNinterline, XtCInterline, XtRInt, sizeof (int),
      offset (interline), XtRImmediate, (XtPointer)0},
-  {XtNfont,  XtCFont, XtRFontStruct, sizeof(struct font *),
-     offset(font),XtRString, DEFAULT_FACE_FONT},
-  {XtNforeground, XtCForeground, XtRPixel, sizeof(Pixel),
-     offset(foreground_pixel), XtRString, "XtDefaultForeground"},
-  {XtNcursorColor, XtCForeground, XtRPixel, sizeof(Pixel),
-     offset(cursor_color), XtRString, "XtDefaultForeground"},
+  {XtNfont,  XtCFont, XtRFontStruct, sizeof (struct font *),
+     offset (font),XtRString, DEFAULT_FACE_FONT},
+  {XtNforeground, XtCForeground, XtRPixel, sizeof (Pixel),
+     offset (foreground_pixel), XtRString, "XtDefaultForeground"},
+  {XtNcursorColor, XtCForeground, XtRPixel, sizeof (Pixel),
+     offset (cursor_color), XtRString, "XtDefaultForeground"},
   {XtNbarCursor, XtCBarCursor, XtRBoolean, sizeof (Boolean),
      offset (bar_cursor), XtRImmediate, (XtPointer)0},
   {XtNvisualBell, XtCVisualBell, XtRBoolean, sizeof (Boolean),
@@ -141,7 +141,7 @@ static EmacsFrameClassRec emacsFrameClassRec = {
     { /* core fields */
     /* superclass               */      &widgetClassRec,
     /* class_name               */      "EmacsFrame",
-    /* widget_size              */      sizeof(EmacsFrameRec),
+    /* widget_size              */      sizeof (EmacsFrameRec),
     /* class_initialize         */      0,
     /* class_part_initialize    */      0,
     /* class_inited             */      FALSE,
@@ -151,7 +151,7 @@ static EmacsFrameClassRec emacsFrameClassRec = {
     /* actions                  */      0, /*emacsFrameActionsTable*/
     /* num_actions              */      0, /*XtNumber (emacsFrameActionsTable)*/
     /* resources                */      resources,
-    /* resource_count           */      XtNumber(resources),
+    /* resource_count           */      XtNumber (resources),
     /* xrm_class                */      NULLQUARK,
     /* compress_motion          */      TRUE,
     /* compress_exposure        */      TRUE,
@@ -574,7 +574,7 @@ setup_frame_gcs (EmacsFrame ew)
      never actually get used as a background tile!
    */
   blank_tile
-    = XCreatePixmapFromBitmapData (XtDisplay(ew),
+    = XCreatePixmapFromBitmapData (XtDisplay (ew),
                                    RootWindowOfScreen (XtScreen (ew)),
                                    setup_frame_cursor_bits, 2, 2,
                                    0, 1, ew->core.depth);
diff --git a/src/window.c b/src/window.c
index 33361b5ac1d..0f5aeb0cda9 100644
--- a/src/window.c
+++ b/src/window.c
@@ -777,7 +777,7 @@ of just the text area, use `window-inside-pixel-edges'.  */)
 }
 
 static void
-calc_absolute_offset(struct window *w, int *add_x, int *add_y)
+calc_absolute_offset (struct window *w, int *add_x, int *add_y)
 {
   struct frame *f = XFRAME (w->frame);
   *add_y = f->top_pos;
@@ -1684,7 +1684,7 @@ PREV-BUFFERS should be either nil or a list of <buffer, window-start,
 window-point> triples where buffer was previously shown in WINDOW.  */)
      (Lisp_Object window, Lisp_Object prev_buffers)
 {
-  return decode_any_window (window)->prev_buffers = prev_buffers;
+  return decode_window (window)->prev_buffers = prev_buffers;
 }
 
 DEFUN ("window-next-buffers", Fwindow_next_buffers, Swindow_next_buffers,
@@ -1706,7 +1706,7 @@ NEXT-BUFFERS should be either nil or a list of buffers that have been
 recently re-shown in WINDOW.  */)
      (Lisp_Object window, Lisp_Object next_buffers)
 {
-  return decode_any_window (window)->next_buffers = next_buffers;
+  return decode_window (window)->next_buffers = next_buffers;
 }
 
 DEFUN ("window-parameters", Fwindow_parameters, Swindow_parameters,
diff --git a/src/xdisp.c b/src/xdisp.c
index 2aa0dee02b8..241571cd9df 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -608,7 +608,7 @@ int current_mode_line_height, current_header_line_height;
     if (CACHE)                                  \
       bidi_unshelve_cache (CACHE, 1);           \
     ITCOPY = ITORIG;                            \
-    CACHE = bidi_shelve_cache();                \
+    CACHE = bidi_shelve_cache ();               \
   } while (0)
 
 #define RESTORE_IT(pITORIG,pITCOPY,CACHE)       \
@@ -1921,7 +1921,7 @@ get_phys_cursor_geometry (struct window *w, struct glyph_row *row,
      rectangle as wide as the glyph, but use a canonical character
      width instead.  */
   wd = glyph->pixel_width - 1;
-#if defined(HAVE_NTGUI) || defined(HAVE_NS)
+#if defined (HAVE_NTGUI) || defined (HAVE_NS)
   wd++; /* Why? */
 #endif
 
@@ -3137,9 +3137,9 @@ next_overlay_change (EMACS_INT pos)
 }
 
 /* How many characters forward to search for a display property or
-   display string.  Enough for a screenful of 100 lines x 50
-   characters in a line.  */
-#define MAX_DISP_SCAN 5000
+   display string.  Searching too far forward makes the bidi display
+   sluggish, especially in small windows.  */
+#define MAX_DISP_SCAN 250
 
 /* Return the character position of a display string at or after
    position specified by POSITION.  If no display string exists at or
@@ -16152,7 +16152,7 @@ try_window_reusing_current_matrix (struct window *w)
           if (row < bottom_row)
             {
               struct glyph *glyph = row->glyphs[TEXT_AREA] + w->cursor.hpos;
-              struct glyph *end = glyph + row->used[TEXT_AREA];
+              struct glyph *end = row->glyphs[TEXT_AREA] + row->used[TEXT_AREA];
 
               /* Can't use this optimization with bidi-reordered glyph
                  rows, unless cursor is already at point. */
@@ -23479,6 +23479,7 @@ produce_stretch_glyph (struct it *it)
       if (FRAME_WINDOW_P (it->f))
         {
           append_stretch_glyph (it, object, width, height, ascent);
+          it->pixel_width = width;
           it->ascent = it->phys_ascent = ascent;
           it->descent = it->phys_descent = height - it->ascent;
           it->nglyphs = width > 0 && height > 0 ? 1 : 0;
@@ -23493,7 +23494,6 @@ produce_stretch_glyph (struct it *it)
           while (n--)
             tty_append_glyph (it);
           it->object = o_object;
-          it->pixel_width = width;
         }
     }
 }
diff --git a/src/xfaces.c b/src/xfaces.c
index 47d55f4da4b..9faa7c79e0b 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -2579,7 +2579,7 @@ merge_face_ref (struct frame *f, Lisp_Object face_ref, Lisp_Object *to,
                 }
               else if (EQ (keyword, QCstipple))
                 {
-#if defined(HAVE_X_WINDOWS) || defined(HAVE_NS)
+#if defined (HAVE_X_WINDOWS) || defined (HAVE_NS)
                   Lisp_Object pixmap_p = Fbitmap_spec_p (value);
                   if (!NILP (pixmap_p))
                     to[LFACE_STIPPLE_INDEX] = value;
@@ -3095,7 +3095,7 @@ FRAME 0 means change the face on all frames, and change the default
     }
   else if (EQ (attr, QCstipple))
     {
-#if defined(HAVE_X_WINDOWS) || defined(HAVE_NS)
+#if defined (HAVE_X_WINDOWS) || defined (HAVE_NS)
       if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)
           && !NILP (value)
           && NILP (Fbitmap_spec_p (value)))
diff --git a/src/xfns.c b/src/xfns.c
index 194a8f063b7..998c803a7ad 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -105,7 +105,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "../lwlib/xlwmenu.h"
 #endif
 
-#if !defined(NO_EDITRES)
+#if !defined (NO_EDITRES)
 #define HACK_EDITRES
 extern void _XEditResCheckMessages (Widget, XtPointer, XEvent *, Boolean *);
 #endif /* not defined NO_EDITRES */
@@ -3274,7 +3274,7 @@ This function is an internal primitive--use `make-frame' instead.  */)
                        "internalBorderWidth", "internalBorderWidth",
                        RES_TYPE_NUMBER);
   x_default_parameter (f, parms, Qvertical_scroll_bars,
-#if defined(USE_GTK) && defined(USE_TOOLKIT_SCROLL_BARS)
+#if defined (USE_GTK) && defined (USE_TOOLKIT_SCROLL_BARS)
                        Qright,
 #else
                        Qleft,
@@ -3443,7 +3443,7 @@ This function is an internal primitive--use `make-frame' instead.  */)
   BLOCK_INPUT;
 
   /* Set machine name and pid for the purpose of window managers.  */
-  set_machine_and_pid_properties(f);
+  set_machine_and_pid_properties (f);
 
   /* Set the WM leader property.  GTK does this itself, so this is not
      needed when using GTK.  */
@@ -5594,7 +5594,7 @@ If FRAME is omitted or nil, it defaults to the selected frame. */)
 
   BLOCK_INPUT;
 
-  GCPRO2(font_param, font);
+  GCPRO2 (font_param, font);
 
   XSETFONT (font, FRAME_FONT (f));
   font_param = Ffont_get (font, intern (":name"));
diff --git a/src/xmenu.c b/src/xmenu.c
index b4338c1d653..cf58e85af10 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -1947,7 +1947,7 @@ create_and_show_dialog (FRAME_PTR f, widget_value *first_wv)
   LWLIB_ID dialog_id;
 
   if (!FRAME_X_P (f))
-    abort();
+    abort ();
 
   dialog_id = widget_id_tick++;
 #ifdef USE_LUCID
@@ -2095,7 +2095,7 @@ xdialog_show (FRAME_PTR f,
     /*  Frame title: 'Q' = Question, 'I' = Information.
         Can also have 'E' = Error if, one day, we want
         a popup for errors. */
-    if (NILP(header))
+    if (NILP (header))
       dialog_name[0] = 'Q';
     else
       dialog_name[0] = 'I';
diff --git a/src/xml.c b/src/xml.c
index 8b485e73649..f0422875f7e 100644
--- a/src/xml.c
+++ b/src/xml.c
@@ -124,6 +124,8 @@ parse_region (Lisp_Object start, Lisp_Object end, Lisp_Object base_url, int html
 
   if (doc != NULL)
     {
+      /* If the document is just comments, then this should get us the
+         nodes anyway. */
       xmlNode *n = doc->children->next;
       Lisp_Object r = Qnil;
 
@@ -134,9 +136,13 @@ parse_region (Lisp_Object start, Lisp_Object end, Lisp_Object base_url, int html
         n = n->next;
       }
 
-      if (NILP (result))
-        result = r;
-      else
+      if (NILP (result)) {
+        /* The document isn't just comments, so get the tree the
+           proper way. */
+        xmlNode *node = xmlDocGetRootElement (doc);
+        if (node != NULL)
+          result = make_dom (node);
+      } else
         result = Fcons (intern ("top"),
                         Fcons (Qnil, Fnreverse (Fcons (r, result))));
 
diff --git a/src/xrdb.c b/src/xrdb.c
index 63f06738b98..4237ed11c53 100644
--- a/src/xrdb.c
+++ b/src/xrdb.c
@@ -602,8 +602,8 @@ x_get_resource (XrmDatabase rdb, const char *name, const char *class,
   XrmClass classlist[100];
   XrmRepresentation type;
 
-  XrmStringToNameList(name, namelist);
-  XrmStringToClassList(class, classlist);
+  XrmStringToNameList (name, namelist);
+  XrmStringToClassList (class, classlist);
 
   if (XrmQGetResource (rdb, namelist, classlist, &type, &value) == True
       && (type == expected_type))
diff --git a/src/xselect.c b/src/xselect.c
index 77bda79007c..241622e81b3 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -592,7 +592,8 @@ static int x_reply_selection_request_cnt;
 #endif  /* TRACE_SELECTION */
 
 static void
-x_reply_selection_request (struct input_event *event, struct x_display_info *dpyinfo)
+x_reply_selection_request (struct input_event *event,
+                           struct x_display_info *dpyinfo)
 {
   XEvent reply_base;
   XSelectionEvent *reply = &(reply_base.xselection);
@@ -1079,7 +1080,8 @@ waiting_for_other_props_on_window (Display *display, Window window)
    this awaited property change.  */
 
 static struct prop_location *
-expect_property_change (Display *display, Window window, Atom property, int state)
+expect_property_change (Display *display, Window window,
+                        Atom property, int state)
 {
   struct prop_location *pl = (struct prop_location *) xmalloc (sizeof *pl);
   pl->identifier = ++prop_location_identifier;
@@ -2472,7 +2474,8 @@ FRAME is on.  If FRAME is nil, the selected frame is used.  */)
 /* Convert an XClientMessageEvent to a Lisp event of type DRAG_N_DROP_EVENT.  */
 
 int
-x_handle_dnd_message (struct frame *f, XClientMessageEvent *event, struct x_display_info *dpyinfo, struct input_event *bufp)
+x_handle_dnd_message (struct frame *f, XClientMessageEvent *event,
+                      struct x_display_info *dpyinfo, struct input_event *bufp)
 {
   Lisp_Object vec;
   Lisp_Object frame;
@@ -2550,22 +2553,24 @@ the Atom is sent.  If a value is a cons, it is converted to a 32 bit number
 with the high 16 bits from the car and the lower 16 bit from the cdr.
 If more values than fits into the event is given, the excessive values
 are ignored.  */)
-  (Lisp_Object display, Lisp_Object dest, Lisp_Object from, Lisp_Object message_type, Lisp_Object format, Lisp_Object values)
+  (Lisp_Object display, Lisp_Object dest, Lisp_Object from,
+   Lisp_Object message_type, Lisp_Object format, Lisp_Object values)
 {
   struct x_display_info *dpyinfo = check_x_display_info (display);
 
   CHECK_STRING (message_type);
-  x_send_client_event(display, dest, from,
-                      XInternAtom (dpyinfo->display,
-                                   SSDATA (message_type),
-                                   False),
-                      format, values);
+  x_send_client_event (display, dest, from,
+                       XInternAtom (dpyinfo->display,
+                                    SSDATA (message_type),
+                                    False),
+                       format, values);
 
   return Qnil;
 }
 
 void
-x_send_client_event (Lisp_Object display, Lisp_Object dest, Lisp_Object from, Atom message_type, Lisp_Object format, Lisp_Object values)
+x_send_client_event (Lisp_Object display, Lisp_Object dest, Lisp_Object from,
+                     Atom message_type, Lisp_Object format, Lisp_Object values)
 {
   struct x_display_info *dpyinfo = check_x_display_info (display);
   Window wdest;
diff --git a/src/xsettings.c b/src/xsettings.c
index dadbe68b4cb..d57f3b5be81 100644
--- a/src/xsettings.c
+++ b/src/xsettings.c
@@ -812,7 +812,7 @@ init_gsettings (void)
   g_type_init ();
 #endif
 
-  schemas = g_settings_list_schemas();
+  schemas = g_settings_list_schemas ();
   if (schemas == NULL) return;
   while (! schema_found && *schemas != NULL)
     schema_found = strcmp (*schemas++, GSETTINGS_SCHEMA) == 0;
diff --git a/src/xterm.c b/src/xterm.c
index 40dbe540903..29f1a85d2c6 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -103,7 +103,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #endif
 
 #ifdef USE_X_TOOLKIT
-#if !defined(NO_EDITRES)
+#if !defined (NO_EDITRES)
 #define HACK_EDITRES
 extern void _XEditResCheckMessages (Widget, XtPointer, XEvent *, Boolean *);
 #endif /* not NO_EDITRES */
diff --git a/src/xterm.h b/src/xterm.h
index fe86a32d09f..5c9365c1269 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -682,7 +682,7 @@ enum
 #define GDK_WINDOW_XID(w) GDK_WINDOW_XWINDOW (w)
 #define DEFAULT_GDK_DISPLAY() GDK_DISPLAY ()
 #define gtk_widget_get_preferred_size(a, ign, b) \
-  gtk_widget_size_request(a, b)
+  gtk_widget_size_request (a, b)
 #endif
 
 #define GTK_WIDGET_TO_X_WIN(w) \