merge trunk

33 files changed, 340 insertions, 394 deletions

diff --git a/ChangeLog b/ChangeLog
index fb223292cfc..af7d83a78d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-05-20  Glenn Morris  <rgm@gnu.org>
+
+        * configure.in (lisp_frag): New output file.
+
+2011-05-19  Glenn Morris  <rgm@gnu.org>
+
+        * configure.in (NS_SUPPORT, MOUSE_SUPPORT, TOOLTIP_SUPPORT)
+        (WINDOW_SUPPORT): Remove output variables that are no longer used.
+
 2011-05-17  Paul Eggert  <eggert@cs.ucla.edu>
 
         * lib/gnulib.mk:
diff --git a/autogen/Makefile.in b/autogen/Makefile.in
index b8b06d5ffd5..daff172c567 100644
--- a/autogen/Makefile.in
+++ b/autogen/Makefile.in
@@ -481,7 +481,6 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDEPDIR = @MKDEPDIR@
 MKDIR_P = @MKDIR_P@
-MOUSE_SUPPORT = @MOUSE_SUPPORT@
 M_FILE = @M_FILE@
 NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
 NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@
@@ -505,7 +504,6 @@ NEXT_TIME_H = @NEXT_TIME_H@
 NEXT_UNISTD_H = @NEXT_UNISTD_H@
 NS_OBJ = @NS_OBJ@
 NS_OBJC_OBJ = @NS_OBJC_OBJ@
-NS_SUPPORT = @NS_SUPPORT@
 OBJEXT = @OBJEXT@
 OLDXMENU = @OLDXMENU@
 OLDXMENU_DEPS = @OLDXMENU_DEPS@
@@ -632,7 +630,6 @@ TEMACS_LDFLAGS2 = @TEMACS_LDFLAGS2@
 TERMCAP_OBJ = @TERMCAP_OBJ@
 TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@
 TOOLKIT_LIBW = @TOOLKIT_LIBW@
-TOOLTIP_SUPPORT = @TOOLTIP_SUPPORT@
 UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@
 UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@
 UNEXEC_OBJ = @UNEXEC_OBJ@
@@ -642,7 +639,6 @@ VERSION = @VERSION@
 VMLIMIT_OBJ = @VMLIMIT_OBJ@
 WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
 WIDGET_OBJ = @WIDGET_OBJ@
-WINDOW_SUPPORT = @WINDOW_SUPPORT@
 WINT_T_SUFFIX = @WINT_T_SUFFIX@
 XFT_CFLAGS = @XFT_CFLAGS@
 XFT_LIBS = @XFT_LIBS@
diff --git a/autogen/configure b/autogen/configure
index b3051c9558e..dbeeb91456d 100755
--- a/autogen/configure
+++ b/autogen/configure
@@ -603,9 +603,6 @@ am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
-WINDOW_SUPPORT
-TOOLTIP_SUPPORT
-MOUSE_SUPPORT
 LIB_GCC
 LD_FIRSTFLAG
 LD_SWITCH_SYSTEM_TEMACS
@@ -1118,7 +1115,6 @@ VMLIMIT_OBJ
 GMALLOC_OBJ
 HAVE_XSERVER
 LIB_STANDARD
-NS_SUPPORT
 NS_OBJC_OBJ
 NS_OBJ
 TEMACS_LDFLAGS2
@@ -1238,6 +1234,7 @@ PACKAGE_NAME
 PATH_SEPARATOR
 SHELL'
 ac_subst_files='deps_frag
+lisp_frag
 ns_frag'
 ac_user_opts='
 enable_option_checking
@@ -9083,6 +9080,10 @@ deps_frag=$srcdir/src/$deps_frag
 
 
 
+lisp_frag=$srcdir/src/lisp.mk
+
+
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long file names" >&5
 $as_echo_n "checking for long file names... " >&6; }
 if test "${ac_cv_sys_long_file_names+set}" = set; then :
@@ -9460,7 +9461,6 @@ fi
 ns_frag=/dev/null
 NS_OBJ=
 NS_OBJC_OBJ=
-NS_SUPPORT=
 if test "${HAVE_NS}" = yes; then
   window_system=nextstep
   with_xft=no
@@ -9473,7 +9473,6 @@ if test "${HAVE_NS}" = yes; then
   ns_frag=$srcdir/src/ns.mk
   NS_OBJ="fontset.o fringe.o image.o"
   NS_OBJC_OBJ="nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o"
-  NS_SUPPORT="\${lispsource}/emacs-lisp/easymenu.elc \${lispsource}/term/ns-win.elc"
 fi
 CFLAGS="$tmp_CFLAGS"
 CPPFLAGS="$tmp_CPPFLAGS"
@@ -9482,7 +9481,6 @@ CPPFLAGS="$tmp_CPPFLAGS"
 
 
 
-
 case "${window_system}" in
   x11 )
     HAVE_X_WINDOWS=yes
@@ -12929,7 +12927,6 @@ fi
 ### Use -lgpm if available, unless `--with-gpm=no'.
 HAVE_GPM=no
 LIBGPM=
-MOUSE_SUPPORT=
 if test "${with_gpm}" != "no"; then
   ac_fn_c_check_header_mongrel "$LINENO" "gpm.h" "ac_cv_header_gpm_h" "$ac_includes_default"
 if test "x$ac_cv_header_gpm_h" = x""yes; then :
@@ -12982,8 +12979,6 @@ fi
 $as_echo "#define HAVE_GPM 1" >>confdefs.h
 
     LIBGPM=-lgpm
-    ## May be reset below.
-    MOUSE_SUPPORT="\$(GPM_MOUSE_SUPPORT)"
   fi
 fi
 
@@ -20810,8 +20805,6 @@ if test "x$GCC" = "xyes" && test "x$ORDINARY_LINK" != "xyes"; then
 fi
 
 
-TOOLTIP_SUPPORT=
-WINDOW_SUPPORT=
 ## If we're using X11/GNUstep, define some consequences.
 if test "$HAVE_X_WINDOWS" = "yes" || test "$HAVE_NS" = "yes"; then
 
@@ -20820,21 +20813,11 @@ $as_echo "#define HAVE_WINDOW_SYSTEM 1" >>confdefs.h
 
 $as_echo "#define HAVE_MOUSE 1" >>confdefs.h
 
-  MOUSE_SUPPORT="\$(REAL_MOUSE_SUPPORT)"
-  TOOLTIP_SUPPORT="\${lispsource}/mouse.elc"
-
-  WINDOW_SUPPORT="\$(BASE_WINDOW_SUPPORT)"
-  test "$HAVE_X_WINDOWS" = "yes" && \
-    WINDOW_SUPPORT="$WINDOW_SUPPORT \$(X_WINDOW_SUPPORT)"
-
 fi
 
 
 
 
-
-
-
 #### Report on what we decided to do.
 #### Report GTK as a toolkit, even if it doesn't use Xt.
 #### It makes printing result more understandable as using GTK sets
diff --git a/configure.in b/configure.in
index 5d2992539f0..dd895f3f06f 100644
--- a/configure.in
+++ b/configure.in
@@ -1370,6 +1370,10 @@ AC_SUBST(DEPFLAGS)
 AC_SUBST_FILE(deps_frag)
 
 
+lisp_frag=$srcdir/src/lisp.mk
+AC_SUBST_FILE(lisp_frag)
+
+
 dnl checks for operating system services
 AC_SYS_LONG_FILE_NAMES
 
@@ -1503,7 +1507,6 @@ AC_SUBST(TEMACS_LDFLAGS2)
 ns_frag=/dev/null
 NS_OBJ=
 NS_OBJC_OBJ=
-NS_SUPPORT=
 if test "${HAVE_NS}" = yes; then
   window_system=nextstep
   with_xft=no
@@ -1516,13 +1519,11 @@ if test "${HAVE_NS}" = yes; then
   ns_frag=$srcdir/src/ns.mk
   NS_OBJ="fontset.o fringe.o image.o"
   NS_OBJC_OBJ="nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o"
-  NS_SUPPORT="\${lispsource}/emacs-lisp/easymenu.elc \${lispsource}/term/ns-win.elc"
 fi
 CFLAGS="$tmp_CFLAGS"
 CPPFLAGS="$tmp_CPPFLAGS"
 AC_SUBST(NS_OBJ)
 AC_SUBST(NS_OBJC_OBJ)
-AC_SUBST(NS_SUPPORT)
 AC_SUBST(LIB_STANDARD)
 AC_SUBST_FILE(ns_frag)
 
@@ -2476,7 +2477,6 @@ fi
 ### Use -lgpm if available, unless `--with-gpm=no'.
 HAVE_GPM=no
 LIBGPM=
-MOUSE_SUPPORT=
 if test "${with_gpm}" != "no"; then
   AC_CHECK_HEADER(gpm.h,
     [AC_CHECK_LIB(gpm, Gpm_Open, HAVE_GPM=yes)])
@@ -2484,8 +2484,6 @@ if test "${with_gpm}" != "no"; then
   if test "${HAVE_GPM}" = "yes"; then
     AC_DEFINE(HAVE_GPM, 1, [Define to 1 if you have the gpm library (-lgpm).])
     LIBGPM=-lgpm
-    ## May be reset below.
-    MOUSE_SUPPORT="\$(GPM_MOUSE_SUPPORT)"
   fi
 fi
 AC_SUBST(LIBGPM)
@@ -3421,23 +3419,11 @@ fi                              dnl if $GCC
 AC_SUBST(LIB_GCC)
 
 
-TOOLTIP_SUPPORT=
-WINDOW_SUPPORT=
 ## If we're using X11/GNUstep, define some consequences.
 if test "$HAVE_X_WINDOWS" = "yes" || test "$HAVE_NS" = "yes"; then
   AC_DEFINE(HAVE_WINDOW_SYSTEM, 1, [Define if you have a window system.])
   AC_DEFINE(HAVE_MOUSE, 1, [Define if you have mouse support.])
-  MOUSE_SUPPORT="\$(REAL_MOUSE_SUPPORT)"
-  TOOLTIP_SUPPORT="\${lispsource}/mouse.elc"
-
-  WINDOW_SUPPORT="\$(BASE_WINDOW_SUPPORT)"
-  test "$HAVE_X_WINDOWS" = "yes" && \
-    WINDOW_SUPPORT="$WINDOW_SUPPORT \$(X_WINDOW_SUPPORT)"
-
 fi
-AC_SUBST(MOUSE_SUPPORT)
-AC_SUBST(TOOLTIP_SUPPORT)
-AC_SUBST(WINDOW_SUPPORT)
 
 
 AH_TOP([/* GNU Emacs site configuration template file.
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 593b54d088b..7d1ce7bff80 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,28 @@
+2011-05-19  Glenn Morris  <rgm@gnu.org>
+
+        * lists.texi (Sets And Lists): Mention cl provides union etc.
+
+2011-05-19  Nix  <nix@esperi.org.uk>
+
+        * windows.texi (Displaying Buffers): pop-to-buffer is not a command.
+
+        * text.texi (Parsing HTML): Update for function name changes.
+
+        * syntax.texi (Syntax Flags): Small fix.
+
+        * keymaps.texi (Active Keymaps): Typo fix.
+        (Changing Key Bindings): Grammar fix.
+
+        * frames.texi (Minibuffers and Frames): Grammar fix.
+        (Window System Selections): x-select-enable-clipboard now defaults to t.
+
+        * customize.texi (Common Keywords):
+        * display.texi (Abstract Display):
+        * modes.texi (Auto-Indentation):
+        * nonascii.texi (Converting Representations): Typo fixes.
+
+        * control.texi (Examples of Catch): Call it "goto" not "go to".
+
 2011-05-14  Eli Zaretskii  <eliz@gnu.org>
 
         * nonascii.texi (Character Properties): Fix inconsistencies with
diff --git a/doc/lispref/control.texi b/doc/lispref/control.texi
index b6fdb9dbcbd..875c23658b9 100644
--- a/doc/lispref/control.texi
+++ b/doc/lispref/control.texi
@@ -623,7 +623,7 @@ error is signaled with data @code{(@var{tag} @var{value})}.
 @subsection Examples of @code{catch} and @code{throw}
 
   One way to use @code{catch} and @code{throw} is to exit from a doubly
-nested loop.  (In most languages, this would be done with a ``go to.'')
+nested loop.  (In most languages, this would be done with a ``goto.'')
 Here we compute @code{(foo @var{i} @var{j})} for @var{i} and @var{j}
 varying from 0 to 9:
 
diff --git a/doc/lispref/customize.texi b/doc/lispref/customize.texi
index 2f1ea055f82..e58c8c298c9 100644
--- a/doc/lispref/customize.texi
+++ b/doc/lispref/customize.texi
@@ -174,7 +174,7 @@ For example, the MH-E package updates this alist with the following:
 
 The value of @var{package} needs to be unique and it needs to match
 the @var{package} value appearing in the @code{:package-version}
-keyword.  Since the user might see the value in a error message, a good
+keyword.  Since the user might see the value in an error message, a good
 choice is the official name of the package, such as MH-E or Gnus.
 @end defvar
 
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 130f097a85f..338fd421994 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -5201,7 +5201,7 @@ element value into the current buffer.
   Typically, you define an ewoc with @code{ewoc-create}, and then pass
 the resulting ewoc structure to other functions in the Ewoc package to
 build nodes within it, and display it in the buffer.  Once it is
-displayed in the buffer, other functions determine the correspondance
+displayed in the buffer, other functions determine the correspondence
 between buffer positions and nodes, move point from one node's textual
 representation to another, and so forth.  @xref{Abstract Display
 Functions}.
diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
index 06c120cc09d..c5136456177 100644
--- a/doc/lispref/frames.texi
+++ b/doc/lispref/frames.texi
@@ -1368,7 +1368,7 @@ minibuffer-window}).
 
 However, you can also create a frame with no minibuffer.  Such a frame
 must use the minibuffer window of some other frame.  When you create the
-frame, you can specify explicitly the minibuffer window to use (in some
+frame, you can explicitly specify the minibuffer window to use (in some
 other frame).  If you don't, then the minibuffer is found in the frame
 which is the value of the variable @code{default-minibuffer-frame}.  Its
 value should be a frame that does have a minibuffer.
@@ -2018,8 +2018,8 @@ clipboard as empty.
 If this is non-@code{nil}, the Emacs yank functions consult the
 clipboard before the primary selection, and the kill functions store in
 the clipboard as well as the primary selection.  Otherwise they do not
-access the clipboard at all.  The default is @code{nil} on most systems,
-but @code{t} on MS-Windows.
+access the clipboard at all.  The default is @code{t} on systems with
+clipboards.
 @end defopt
 
 @node Drag and Drop
diff --git a/doc/lispref/keymaps.texi b/doc/lispref/keymaps.texi
index 2648c22ca01..2ebce284fd3 100644
--- a/doc/lispref/keymaps.texi
+++ b/doc/lispref/keymaps.texi
@@ -686,7 +686,7 @@ bindings, as in @code{lookup-key} (@pxref{Functions for Key Lookup}).
 
 When commands are remapped (@pxref{Remapping Commands}),
 @code{key-binding} normally processes command remappings so as to
-returns the remapped command that will actually be executed.  However,
+return the remapped command that will actually be executed.  However,
 if @var{no-remap} is non-@code{nil}, @code{key-binding} ignores
 remappings and returns the binding directly specified for @var{key}.
 
@@ -1239,7 +1239,7 @@ local map, that usually affects all buffers using the same major mode.
 The @code{global-set-key} and @code{local-set-key} functions are
 convenient interfaces for these operations (@pxref{Key Binding
 Commands}).  You can also use @code{define-key}, a more general
-function; then you must specify explicitly the map to change.
+function; then you must explicitly specify the map to change.
 
   When choosing the key sequences for Lisp programs to rebind, please
 follow the Emacs conventions for use of various keys (@pxref{Key
diff --git a/doc/lispref/lists.texi b/doc/lispref/lists.texi
index fa3fac814c1..d27c609dc83 100644
--- a/doc/lispref/lists.texi
+++ b/doc/lispref/lists.texi
@@ -1266,9 +1266,9 @@ functions for sets include @code{memq} and @code{delq}, and their
 @cindex CL note---lack @code{union}, @code{intersection}
 @quotation
 @b{Common Lisp note:} Common Lisp has functions @code{union} (which
-avoids duplicate elements) and @code{intersection} for set operations,
-but GNU Emacs Lisp does not have them.  You can write them in Lisp if
-you wish.
+avoids duplicate elements) and @code{intersection} for set operations.
+Although standard GNU Emacs Lisp does not have them, the @file{cl}
+library provides versions.  @inforef{Top, Overview, cl}.
 @end quotation
 
 @defun memq object list
diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index 02f89f93207..609c713194a 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -3256,7 +3256,7 @@ reasonably fast.
 @end defvar
 
 @node Auto-Indentation
-@section Auto-indention of code
+@section Auto-indentation of code
 
 For programming languages, an important feature of a major mode is to
 provide automatic indentation.  This is controlled in Emacs by
diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi
index a3f25af4719..0328dae9e7b 100644
--- a/doc/lispref/nonascii.texi
+++ b/doc/lispref/nonascii.texi
@@ -201,7 +201,7 @@ characters.
 @defun byte-to-string byte
 @cindex byte to string
 This function returns a unibyte string containing a single byte of
-character data, @var{character}.  It signals a error if
+character data, @var{character}.  It signals an error if
 @var{character} is not an integer between 0 and 255.
 @end defun
 
diff --git a/doc/lispref/syntax.texi b/doc/lispref/syntax.texi
index 55ee2dec4a4..6582a8dfb0c 100644
--- a/doc/lispref/syntax.texi
+++ b/doc/lispref/syntax.texi
@@ -374,7 +374,7 @@ character, @samp{/}, does not have the @samp{b} flag.
 
 @item @samp{*/}
 This is a comment-end sequence for ``b'' style because the first
-character, @samp{*}, does have the @samp{b} flag.
+character, @samp{*}, has the @samp{b} flag.
 
 @item newline
 This is a comment-end sequence for ``a'' style, because the newline
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index 6cb271eec88..8205c5fa169 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -4099,17 +4099,16 @@ coding instead.
 @node Parsing HTML
 @section Parsing HTML
 @cindex parsing html
-@cindex parsing xml
 
-Emacs provides an interface to the @code{libxml2} library via two
-functions: @code{html-parse-buffer} and @code{xml-parse-buffer}.  The
-HTML function will parse ``real world'' HTML and try to return a
-sensible parse tree, while the XML function is somewhat stricter about
-syntax.
+@defun libxml-parse-html-region start end &optional base-url
+This function provides HTML parsing via the @code{libxml2} library.
+It parses ``real world'' HTML and tries to return a sensible parse tree
+regardless.
 
-They both take a two optional parameter.  The first is a buffer, and
-the second is a base URL to be used to expand relative URLs in the
-document, if any.
+In addition to @var{start} and @var{end} (specifying the start and end
+of the region to act on), it takes an optional parameter,
+@var{base-url}, which is used to expand relative URLs in the document,
+if any.
 
 Here's an example demonstrating the structure of the parsed data you
 get out.  Given this HTML document:
@@ -4138,12 +4137,21 @@ values.
 
 Attributes are coded the same way as child nodes, but with @samp{:} as
 the first character.
+@end defun
+
+@cindex parsing xml
+@defun libxml-parse-xml-region start end &optional base-url
+
+This is much the same as @code{libxml-parse-html-region} above, but
+operates on XML instead of HTML, and is correspondingly stricter about
+syntax.
+@end defun
 
 @node Atomic Changes
 @section Atomic Change Groups
 @cindex atomic changes
 
-  In data base terminology, an @dfn{atomic} change is an indivisible
+  In database terminology, an @dfn{atomic} change is an indivisible
 change---it can succeed entirely or it can fail entirely, but it
 cannot partly succeed.  A Lisp program can make a series of changes to
 one or several buffers as an @dfn{atomic change group}, meaning that
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index 9ce00de4abc..93f2035eca6 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -826,8 +826,8 @@ This function updates the buffer list just like @code{switch-to-buffer}
 unless @var{norecord} is non-@code{nil}.
 @end deffn
 
-@deffn Command pop-to-buffer buffer-or-name &optional other-window norecord
-This command makes @var{buffer-or-name} the current buffer and switches
+@defun pop-to-buffer buffer-or-name &optional other-window norecord
+This function makes @var{buffer-or-name} the current buffer and switches
 to it in some window, preferably not the window previously selected.
 The ``popped-to'' window becomes the selected window.  Its frame is
 given the X server's focus, if possible; see @ref{Input Focus}.  The
@@ -866,7 +866,7 @@ All the variables that affect @code{display-buffer} affect
 
 This function updates the buffer list just like @code{switch-to-buffer}
 unless @var{norecord} is non-@code{nil}.
-@end deffn
+@end defun
 
 @deffn Command replace-buffer-in-windows &optional buffer-or-name
 This function replaces @var{buffer-or-name} in all windows displaying
diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index 450199a33c5..28a949f81e2 100644
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -28,7 +28,7 @@ srcdir=@srcdir@
 # Note the other doc Makefiles do not use VPATH anymore, instead
 # they set infodir to an absolute path.  Not doing that here in
 # case INFO_TARGETS gets too long for some feeble shells.
-# (cf src/Makefile.in's shortlisp)
+# (cf src/Makefile.in's passing of $lisp to make-docfile)
 VPATH=@srcdir@
 
 ## Where the output files go.
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 27dc3a14d48..33778c1f0ae 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-19  Glenn Morris  <rgm@gnu.org>
+
+        * makefile.w32-in (echolisp): Remove rule that is no longer needed.
+        (clean): No more echolisp.tmp.
+
 2011-05-18  Glenn Morris  <rgm@gnu.org>
 
         * fakemail.c: Remove file.
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 0e203d18bd2..07f6170afe4 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -269,11 +269,6 @@ lisp2 = \
         $(lispsource)window.elc \
         $(lispsource)version.el
 
-# Used by batch-update-autoloads.
-echolisp:
-        @echo $(lisp1)
-        @echo $(lisp2)
-
 # This is needed the first time we build the tree, since temacs.exe
 # does not exist yet, and the DOC rule needs it to rebuild DOC whenever
 # Emacs is rebuilt.
@@ -330,7 +325,6 @@ clean:
                 - $(DEL) ctags.c
                 - $(DEL_TREE) $(OBJDIR)
                 - $(DEL) stamp_BLD
-                - $(DEL) echolisp.tmp
 
 distclean: cleanall
         - $(DEL) TAGS
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 15bd4b190b2..d1ec662bac8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,21 @@
+2011-05-20  Nix  <nix@esperi.org.uk>
+
+        * files.el (basic-save-buffer-2):
+        Fix handling of break-hardlink-on-save with non-existent files.
+
+2011-05-19  Deniz Dogan  <deniz@dogan.se>
+
+        * net/rcirc.el (rcirc-mode): Initialize rcirc-urls to nil.
+        (rcirc-markup-urls): Check if rcirc-url-regexp is nil.
+
+2011-05-19  Glenn Morris  <rgm@gnu.org>
+
+        * progmodes/f90.el (f90-type-def-re):
+        Handle "type, bind(c)".  (Bug#8691)
+
+        * emacs-lisp/autoload.el (batch-update-autoloads):
+        Set autoload-excludes by parsing loadup.el rather than Makefiles.
+
 2011-05-18  Michael Albinus  <michael.albinus@gmx.de>
 
         * net/tramp.el (tramp-process-actions): Set "first-password-request"
diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el
index f8f8d9b00f2..6d5067151d3 100644
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@ -769,52 +769,21 @@ Calls `update-directory-autoloads' on the command line arguments.
 Definitions are written to `generated-autoload-file' (which
 should be non-nil)."
   ;; For use during the Emacs build process only.
+  ;; Exclude those files that are preloaded on ALL platforms.
+  ;; These are the ones in loadup.el where "(load" is at the start
+  ;; of the line (crude, but it works).
   (unless autoload-excludes
-    (let* ((ldir (file-name-directory generated-autoload-file))
-           (default-directory
-             (file-name-as-directory
-              (expand-file-name (if (eq system-type 'windows-nt)
-                                    "../lib-src"
-                                  "../src") ldir)))
-           (mfile "Makefile")
-           (tmpfile "echolisp.tmp")
-           lim)
-      ;; Windows uses the 'echolisp' approach because:
-      ;; i) It does not have $lisp as a single simple definition, so
-      ;; it would be harder to parse the Makefile.
-      ;; ii) It can, since it already has $lisp broken up into pieces
-      ;; that the command-line can handle.
-      ;; Non-Windows builds do not use the 'echolisp' approach because
-      ;; no-one knows (?) the maximum safe command-line length on all
-      ;; supported systems.  $lisp is much longer there since it uses
-      ;; absolute paths, and it would seem a shame to split it just for this.
-      (when (file-readable-p mfile)
-        (if (eq system-type 'windows-nt)
-            (when (ignore-errors
-                   (if (file-exists-p tmpfile) (delete-file tmpfile))
-                   ;; FIXME call-process is better, if it works.
-                   (shell-command (format "%s echolisp > %s"
-                                          autoload-make-program tmpfile))
-                   (file-readable-p tmpfile))
-              (with-temp-buffer
-                (insert-file-contents tmpfile)
-                ;; FIXME could be a single while loop.
-                (while (not (eobp))
-                  (setq lim (line-end-position))
-                  (while (re-search-forward "\\([^ ]+\\.el\\)c?\\>" lim t)
-                    (push (expand-file-name (match-string 1))
-                          autoload-excludes))
-                  (forward-line 1))))
-          (with-temp-buffer
-            (insert-file-contents mfile)
-            (when (re-search-forward "^shortlisp= " nil t)
-              (while (and (not lim)
-                          (re-search-forward "\\.\\./lisp/\\([^ ]+\\.el\\)c?\\>"
-                                             nil t))
-                (push (expand-file-name (match-string 1) ldir)
-                      autoload-excludes)
-                (skip-chars-forward " \t")
-                (if (eolp) (setq lim t)))))))))
+    (let ((default-directory (file-name-directory generated-autoload-file))
+          file)
+      (when (file-readable-p "loadup.el")
+        (with-temp-buffer
+          (insert-file-contents "loadup.el")
+          (while (re-search-forward "^(load \"\\([^\"]+\\)\"" nil t)
+            (setq file (match-string 1))
+            (or (string-match "\\.el\\'" file)
+                (setq file (format "%s.el" file)))
+            (or (string-match "\\`site-" file)
+                (push (expand-file-name file) autoload-excludes)))))))
   (let ((args command-line-args-left))
     (setq command-line-args-left nil)
     (apply 'update-directory-autoloads args)))
diff --git a/lisp/files.el b/lisp/files.el
index 336a0a436f9..200b9b1d303 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -4517,6 +4517,7 @@ Before and after saving the buffer, this function runs
            (dir-writable (file-writable-p dir)))
       (if (or (and file-precious-flag dir-writable)
               (and break-hardlink-on-save
+                   (file-exists-p buffer-file-name)
                    (> (file-nlinks buffer-file-name) 1)
                    (or dir-writable
                        (error (concat (format
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 66f30f03eff..2b51637e3d1 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-19  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * mm-bodies.el (mm-decode-content-transfer-encoding): Allow leading
+        whitespace in base64 data lines.
+
 2011-05-18  Teodor Zlatanov  <tzz@lifelogs.com>
 
         * gnus-registry.el (gnus-registry-user-format-function-M):
diff --git a/lisp/gnus/mm-bodies.el b/lisp/gnus/mm-bodies.el
index 9952f410f0d..695451ddc45 100644
--- a/lisp/gnus/mm-bodies.el
+++ b/lisp/gnus/mm-bodies.el
@@ -197,7 +197,8 @@ If TYPE is `text/plain' CRLF->LF translation may occur."
                (while (re-search-forward "^[\t ]*\r?\n" nil t)
                  (delete-region (match-beginning 0) (match-end 0)))
                (goto-char (point-max))
-               (when (re-search-backward "^[A-Za-z0-9+/]+=*[\t ]*$" nil t)
+               (when (re-search-backward "^[\t ]*[A-Za-z0-9+/]+=*[\t ]*$"
+                                         nil t)
                  (forward-line))
                (point))))
            ((memq encoding '(nil 7bit 8bit binary))
diff --git a/lisp/loadup.el b/lisp/loadup.el
index d348456ae32..525b8d27b8d 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -29,21 +29,15 @@
 ;; If you add/remove Lisp files to be loaded here, consider the
 ;; following issues:
 
-;; i) Any file loaded on all platforms should appear in $lisp
-;; and $shortlisp in src/Makefile.in.  Use the .el or .elc version as
-;; appropriate.
+;; i) Any file loaded on any platform should appear in $lisp in src/lisp.mk.
+;; Use the .el or .elc version as appropriate.
 
-;; ii) Any file that is only loaded on some platforms should appear
-;; in the version of $lisp in the generated Makefile on that platform.
-;; At the present time, this is achieved by use of #ifdefs.
-;; It should also appear in $SOME_MACHINE_LISP on all platforms.
+;; This ensures both that the Lisp files are compiled (if necessary)
+;; before the emacs executable is dumped, and that they are passed to
+;; make-docfile.  (Any that are not processed for DOC will not have
+;; doc strings in the dumped Emacs.)  Because of this:
 
-;; The above steps ensure both that the Lisp files are compiled (if
-;; necessary) before the emacs executable is dumped, and that they are
-;; passed to make-docfile.  (Any that are not processed for DOC will
-;; not have doc strings in the dumped Emacs.)  Because of this:
-
-;; iii) If the file is loaded uncompiled, it should (where possible)
+;; ii) If the file is loaded uncompiled, it should (where possible)
 ;; obey the doc-string conventions expected by make-docfile.
 
 ;;; Code:
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 206ebc8997c..0d02688beed 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -971,7 +971,7 @@ This number is independent of the number of lines in the buffer.")
   (set (make-local-variable 'rcirc-current-line) 0)
 
   (set (make-local-variable 'rcirc-short-buffer-name) nil)
-  (set (make-local-variable 'rcirc-urls) t)
+  (set (make-local-variable 'rcirc-urls) nil)
 
   ;; setup for omitting responses
   (setq buffer-invisibility-spec '())
@@ -2394,7 +2394,8 @@ keywords when no KEYWORD is given."
         (rcirc-record-activity (current-buffer) 'nick)))))
 
 (defun rcirc-markup-urls (sender response)
-  (while (re-search-forward rcirc-url-regexp nil t)
+  (while (and rcirc-url-regexp ;; nil means disable URL catching
+              (re-search-forward rcirc-url-regexp nil t))
     (let ((start (match-beginning 0))
           (end (match-end 0)))
       (rcirc-add-face start end 'rcirc-url)
diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el
index 53aa95498da..e9bb43c4d6d 100644
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -809,8 +809,10 @@ Can be overridden by the value of `font-lock-maximum-decoration'.")
   ;; type word
   ;; type :: word
   ;; type, stuff :: word
+  ;; type, bind(c) :: word
   ;; NOT "type ("
-  "\\<\\(type\\)\\>\\(?:[^()\n]*::\\)?[ \t]*\\(\\sw+\\)"
+  "\\<\\(type\\)\\>\\(?:\\(?:[^()\n]*\\|\
+.*,[ \t]*bind[ \t]*([ \t]*c[ \t]*)[ \t]*\\)::\\)?[ \t]*\\(\\sw+\\)"
   "Regexp matching the definition of a derived type.")
 
 (defconst f90-typeis-re
diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 12fd7675d67..6c07c76d1bf 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-19  Glenn Morris  <rgm@gnu.org>
+
+        * sed1x.inp (TOOLTIP_SUPPORT, WINDOW_SUPPORT):
+        * sed1v2.inp (MSDOS_SUPPORT, NS_SUPPORT, MOUSE_SUPPORT)
+        (TOOLTIP_SUPPORT, WINDOW_SUPPORT): No need to edit these any more.
+
 2011-05-07  Eli Zaretskii  <eliz@gnu.org>
 
         * inttypes.h: Include stdint.h.
diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp
index 44ee53a5c34..34c4588f96a 100644
--- a/msdos/sed1v2.inp
+++ b/msdos/sed1v2.inp
@@ -94,13 +94,11 @@ s/\.h\.in/.h-in/
 /^WIDGET_OBJ *=/s/@WIDGET_OBJ@//
 /^CYGWIN_OBJ *=/s/@CYGWIN_OBJ@//
 /^MSDOS_OBJ *=/s/= */= dosfns.o msdos.o w16select.o/
-/^MSDOS_SUPPORT *=/s/= */= $(MSDOS_SUPPORT_REAL)/
 /^ns_appdir *=/s/@ns_appdir@//
 /^ns_appbindir *=/s/@ns_appbindir@//
 /^ns_appsrc *=/s/@ns_appsrc@//
 /^NS_OBJ *=/s/@NS_OBJ@//
 /^NS_OBJC_OBJ *=/s/@NS_OBJC_OBJ@//
-/^NS_SUPPORT *=/s/@NS_SUPPORT@//
 /^GNU_OBJC_CFLAGS*=/s/@GNU_OBJC_CFLAGS@//
 /^LIBRESOLV *=/s/@LIBRESOLV@//
 /^LIBSELINUX_LIBS *=/s/@LIBSELINUX_LIBS@//
@@ -111,9 +109,6 @@ s/\.h\.in/.h-in/
 /^OTHER_FILES *=/s/@OTHER_FILES@//
 /^XMENU_OBJ *=/s/@XMENU_OBJ@/xmenu.o/
 /^FONT_OBJ *=/s/@FONT_OBJ@//
-/^MOUSE_SUPPORT *=/s/@MOUSE_SUPPORT@/$(REAL_MOUSE_SUPPORT)/
-/^TOOLTIP_SUPPORT *=/s/@TOOLTIP_SUPPORT@//
-/^WINDOW_SUPPORT *=/s/@WINDOW_SUPPORT@//
 /^LIBGPM *=/s/@LIBGPM@//
 /^EXEEXT *=/s/@EXEEXT@/.exe/
 /^OLDXMENU *=/s/@OLDXMENU@/nothing/
diff --git a/msdos/sed1x.inp b/msdos/sed1x.inp
index dff76fda27b..d0a37807d9e 100644
--- a/msdos/sed1x.inp
+++ b/msdos/sed1x.inp
@@ -26,7 +26,5 @@ s/DOC/DOC-X/g
 /^LIBS_SYSTEM *=/s!= *!= -lxext -lsys!
 /^MSDOS_X_OBJ *=/s!= *!= w16select.o termcap.o!
 /^FONT_OBJ *=/s!= *!= xfont.o!
-/^TOOLTIP_SUPPORT *=/s!= *!= ${lispsource}tooltip.elc!
-/^WINDOW_SUPPORT *=/s!= *!= $(BASE_WINDOW_SUPPORT) $(X_WINDOW_SUPPORT)!
 /^temacs *:/s!OLDXMENU!LIBXMENU!
 
diff --git a/src/ChangeLog b/src/ChangeLog
index 79e5bf677f6..989ecce9d2a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,7 +1,25 @@
-2011-05-20  handa  <handa@m17n.org>
+2011-05-20 Kenichi Handa  <handa@m17n.org>
 
         * composite.c (find_automatic_composition): Fix previous change.
 
+2011-05-20  Glenn Morris  <rgm@gnu.org>
+
+        * lisp.mk: New file, split from Makefile.in.
+        * Makefile.in (lisp): Move to separate file, inserted by @lisp_frag@.
+        (shortlisp): Remove.
+        ($(etc)/DOC): Edit lisp.mk rather than using $shortlisp.
+
+2011-05-19  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (MSDOS_SUPPORT_REAL, MSDOS_SUPPORT, NS_SUPPORT)
+        (REAL_MOUSE_SUPPORT, GPM_MOUSE_SUPPORT, MOUSE_SUPPORT, TOOLTIP_SUPPORT)
+        (BASE_WINDOW_SUPPORT, X_WINDOW_SUPPORT, WINDOW_SUPPORT): Remove.
+        (lisp): Set the order to that of loadup.el.
+        (shortlisp): Make it a copy of $lisp.
+        (SOME_MACHINE_LISP): Remove.
+        ($(etc)/DOC): Depend just on $lisp, not $SOME_MACHINE_LISP too.
+        Use just $shortlisp, not $SOME_MACHINE_LISP too.
+
 2011-05-18  Kenichi Handa  <handa@m17n.org>
 
         * composite.c (CHAR_COMPOSABLE_P): Add more check for efficiency.
diff --git a/src/Makefile.in b/src/Makefile.in
index 8b596430cf5..557a6f54748 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -237,18 +237,12 @@ CYGWIN_OBJ=@CYGWIN_OBJ@
 MSDOS_OBJ =
 ## w16select.o termcap.o if MSDOS && HAVE_X_WINDOWS.
 MSDOS_X_OBJ =
-MSDOS_SUPPORT_REAL = $(lispsource)/ls-lisp.elc $(lispsource)/disp-table.elc \
- $(lispsource)/dos-fns.elc $(lispsource)/dos-w32.elc $(lispsource)/dos-vars.elc \
- $(lispsource)/term/internal.elc $(lispsource)/term/pc-win.elc
-## $MSDOS_SUPPORT_REAL if MSDOS.
-MSDOS_SUPPORT =
 
 ns_appdir=@ns_appdir@
 ns_appbindir=@ns_appbindir@
 ns_appsrc=@ns_appsrc@
 NS_OBJ=@NS_OBJ@
 NS_OBJC_OBJ=@NS_OBJC_OBJ@
-NS_SUPPORT=@NS_SUPPORT@
 ## Only set if NS_IMPL_GNUSTEP.
 GNU_OBJC_CFLAGS=@GNU_OBJC_CFLAGS@
 
@@ -258,28 +252,7 @@ GNU_OBJC_CFLAGS=@GNU_OBJC_CFLAGS@
 ## else xfont.o
 FONT_OBJ=@FONT_OBJ@
 
-## Used if HAVE_MOUSE.
-REAL_MOUSE_SUPPORT=$(lispsource)/mouse.elc $(lispsource)/select.elc \
-  $(lispsource)/scroll-bar.elc
-## Used if HAVE_GPM && !HAVE_MOUSE
-GPM_MOUSE_SUPPORT=$(lispsource)/mouse.elc
 LIBGPM = @LIBGPM@
-## Either of the two preceding options, or empty.
-MOUSE_SUPPORT=@MOUSE_SUPPORT@
-
-## $(lispsource)/tooltip.elc if HAVE_WINDOW_SYSTEM, else empty.
-TOOLTIP_SUPPORT=@TOOLTIP_SUPPORT@
-
-BASE_WINDOW_SUPPORT=$(lispsource)/fringe.elc $(lispsource)/image.elc \
-  $(lispsource)/international/fontset.elc $(lispsource)/dnd.elc \
-  $(lispsource)/tool-bar.elc $(lispsource)/mwheel.elc
-
-X_WINDOW_SUPPORT=$(lispsource)/x-dnd.elc $(lispsource)/term/common-win.elc \
-  $(lispsource)/term/x-win.elc $(lispsource)/dynamic-setting.elc
-
-## If HAVE_X_WINDOWS, both the above
-## else if HAVE_WINDOW_SYSTEM (ie, HAVE_NS) just the former; else empty.
-WINDOW_SUPPORT=@WINDOW_SUPPORT@
 
 ## -lresolv, or empty.
 LIBRESOLV = @LIBRESOLV@
@@ -385,215 +358,10 @@ POST_ALLOC_OBJ=@POST_ALLOC_OBJ@
 otherobj= $(TERMCAP_OBJ) $(PRE_ALLOC_OBJ) $(GMALLOC_OBJ) $(RALLOC_OBJ) \
   $(POST_ALLOC_OBJ) $(VMLIMIT_OBJ) $(WIDGET_OBJ) $(LIBOBJS)
 
-## This is the platform-specific list of Lisp files loaded into the
-## dumped Emacs.  It is arranged like this because it is easier to generate
-## it semi-mechanically from loadup.el this way.
-##
-## Note that this list should not include lisp files which might not
-## be present, like site-load.el and site-init.el; this makefile
-## expects them all to be either present or buildable.
-##
-## Files which are loaded unconditionally (i.e., on all platforms) should
-## also be in shortlisp.  Files which are loaded conditionally (i.e., only
-## on some platforms) should instead be in SOME_MACHINE_LISP.
-##
-## Place loaddefs.el first, so it gets generated first, since it is on
-## the critical path (relevant in parallel compilations).
-lisp= \
-        $(lispsource)/loaddefs.el \
-        $(lispsource)/abbrev.elc \
-        $(lispsource)/buff-menu.elc \
-        $(lispsource)/button.elc \
-        $(lispsource)/emacs-lisp/byte-run.elc \
-        $(lispsource)/composite.elc \
-        $(lispsource)/cus-face.elc \
-        $(lispsource)/cus-start.elc \
-        $(lispsource)/custom.elc \
-        $(lispsource)/emacs-lisp/backquote.elc \
-        $(lispsource)/emacs-lisp/lisp-mode.elc \
-        $(lispsource)/emacs-lisp/lisp.elc \
-        $(lispsource)/env.elc \
-        $(lispsource)/faces.elc \
-        $(lispsource)/files.elc \
-        $(lispsource)/format.elc \
-        $(lispsource)/facemenu.elc \
-        $(MOUSE_SUPPORT) \
-        $(lispsource)/emacs-lisp/float-sup.elc \
-        $(lispsource)/frame.elc \
-        $(lispsource)/help.elc \
-        $(lispsource)/indent.elc \
-        $(lispsource)/isearch.elc \
-        $(lispsource)/rfn-eshadow.elc \
-        $(lispsource)/loadup.el \
-        $(lispsource)/bindings.elc \
-        $(lispsource)/emacs-lisp/map-ynp.elc \
-        $(lispsource)/menu-bar.elc \
-        $(lispsource)/international/mule.elc \
-        $(lispsource)/international/mule-conf.elc \
-        $(lispsource)/international/mule-cmds.elc \
-        $(lispsource)/international/characters.elc \
-        $(lispsource)/international/charprop.el \
-        $(lispsource)/case-table.elc \
-        $(lispsource)/language/chinese.elc \
-        $(lispsource)/language/cyrillic.elc \
-        $(lispsource)/language/indian.elc \
-        $(lispsource)/language/sinhala.el \
-        $(lispsource)/language/english.el \
-        $(lispsource)/language/ethiopic.elc \
-        $(lispsource)/language/european.elc \
-        $(lispsource)/language/czech.el \
-        $(lispsource)/language/slovak.el \
-        $(lispsource)/language/romanian.el \
-        $(lispsource)/language/greek.el \
-        $(lispsource)/language/hebrew.elc \
-        $(lispsource)/language/japanese.el \
-        $(lispsource)/language/korean.el \
-        $(lispsource)/language/lao.el \
-        $(lispsource)/language/cham.el \
-        $(lispsource)/language/tai-viet.el \
-        $(lispsource)/language/thai.el \
-        $(lispsource)/language/tibetan.elc \
-        $(lispsource)/language/vietnamese.elc \
-        $(lispsource)/language/misc-lang.el \
-        $(lispsource)/language/utf-8-lang.el \
-        $(lispsource)/language/georgian.el \
-        $(lispsource)/language/khmer.el \
-        $(lispsource)/language/burmese.el \
-        $(lispsource)/paths.el \
-        $(lispsource)/register.elc \
-        $(lispsource)/replace.elc \
-        $(lispsource)/simple.elc \
-        $(lispsource)/minibuffer.elc \
-        $(lispsource)/startup.elc \
-        $(lispsource)/subr.elc \
-        $(lispsource)/term/tty-colors.elc \
-        $(lispsource)/font-core.elc \
-        $(lispsource)/emacs-lisp/syntax.elc \
-        $(lispsource)/font-lock.elc \
-        $(lispsource)/jit-lock.elc \
-        $(lispsource)/textmodes/fill.elc \
-        $(lispsource)/textmodes/page.elc \
-        $(lispsource)/textmodes/paragraphs.elc \
-        $(lispsource)/textmodes/text-mode.elc \
-        $(lispsource)/emacs-lisp/timer.elc \
-        $(lispsource)/jka-cmpr-hook.elc \
-        $(lispsource)/vc/vc-hooks.elc \
-        $(lispsource)/vc/ediff-hook.elc \
-        $(lispsource)/epa-hook.elc \
-        $(TOOLTIP_SUPPORT) \
-        $(MSDOS_SUPPORT) \
-        $(WINDOW_SUPPORT) \
-        $(NS_SUPPORT) \
-        $(lispsource)/widget.elc \
-        $(lispsource)/window.elc \
-        $(lispsource)/version.el
-
-## List of relative names for those files from $lisp that are loaded
-## unconditionally (i.e. on all platforms).  Files from $lisp that
-## are only loaded on some platforms should instead be placed in
-## SOME_MACHINE_LISP.  The only reason this variable exists is to prevent
-## the make-docfile command-line getting too long for some systems.
-shortlisp= \
-        ../lisp/loaddefs.el \
-        ../lisp/abbrev.elc \
-        ../lisp/buff-menu.elc \
-        ../lisp/button.elc \
-        ../lisp/emacs-lisp/byte-run.elc \
-        ../lisp/composite.elc \
-        ../lisp/cus-face.elc \
-        ../lisp/cus-start.elc \
-        ../lisp/custom.elc \
-        ../lisp/emacs-lisp/backquote.elc \
-        ../lisp/emacs-lisp/lisp-mode.elc \
-        ../lisp/emacs-lisp/lisp.elc \
-        ../lisp/facemenu.elc \
-        ../lisp/faces.elc \
-        ../lisp/files.elc \
-        ../lisp/emacs-lisp/float-sup.elc \
-        ../lisp/format.elc \
-        ../lisp/frame.elc \
-        ../lisp/help.elc \
-        ../lisp/indent.elc \
-        ../lisp/isearch.elc \
-        ../lisp/rfn-eshadow.elc \
-        ../lisp/loadup.el \
-        ../lisp/bindings.elc \
-        ../lisp/emacs-lisp/map-ynp.elc \
-        ../lisp/env.elc \
-        ../lisp/international/mule.elc \
-        ../lisp/international/mule-conf.elc \
-        ../lisp/international/mule-cmds.elc \
-        ../lisp/international/characters.elc \
-        ../lisp/case-table.elc \
-        ../lisp/language/chinese.elc \
-        ../lisp/language/cyrillic.elc \
-        ../lisp/language/indian.elc \
-        ../lisp/language/sinhala.el \
-        ../lisp/language/english.el \
-        ../lisp/language/ethiopic.elc \
-        ../lisp/language/european.elc \
-        ../lisp/language/czech.el \
-        ../lisp/language/slovak.el \
-        ../lisp/language/romanian.el \
-        ../lisp/language/greek.el \
-        ../lisp/language/hebrew.elc \
-        ../lisp/language/japanese.el \
-        ../lisp/language/korean.el \
-        ../lisp/language/lao.el \
-        ../lisp/language/cham.el \
-        ../lisp/language/tai-viet.el \
-        ../lisp/language/thai.el \
-        ../lisp/language/tibetan.elc \
-        ../lisp/language/vietnamese.elc \
-        ../lisp/language/misc-lang.el \
-        ../lisp/language/utf-8-lang.el \
-        ../lisp/language/georgian.el \
-        ../lisp/language/khmer.el \
-        ../lisp/language/burmese.el \
-        ../lisp/menu-bar.elc \
-        ../lisp/paths.el \
-        ../lisp/register.elc \
-        ../lisp/replace.elc \
-        ../lisp/simple.elc \
-        ../lisp/minibuffer.elc \
-        ../lisp/startup.elc \
-        ../lisp/subr.elc \
-        ../lisp/term/tty-colors.elc \
-        ../lisp/font-core.elc \
-        ../lisp/emacs-lisp/syntax.elc \
-        ../lisp/font-lock.elc \
-        ../lisp/jit-lock.elc \
-        ../lisp/textmodes/fill.elc \
-        ../lisp/textmodes/page.elc \
-        ../lisp/textmodes/paragraphs.elc \
-        ../lisp/textmodes/text-mode.elc \
-        ../lisp/emacs-lisp/timer.elc \
-        ../lisp/vc/vc-hooks.elc \
-        ../lisp/vc/ediff-hook.elc \
-        ../lisp/jka-cmpr-hook.elc \
-        ../lisp/epa-hook.elc \
-        ../lisp/widget.elc \
-        ../lisp/window.elc \
-        ../lisp/version.el
-
-## Like $shortlisp, but includes only those files from $lisp that are loaded
-## conditionally (i.e., only on some platforms).
-## Confusingly, term/internal is not in loadup, but is unconditionally
-## loaded by pc-win, which is.
-SOME_MACHINE_LISP = ../lisp/mouse.elc \
-  ../lisp/select.elc ../lisp/scroll-bar.elc \
-  ../lisp/ls-lisp.elc ../lisp/dos-fns.elc \
-  ../lisp/w32-fns.elc ../lisp/dos-w32.elc \
-  ../lisp/disp-table.elc ../lisp/dos-vars.elc ../lisp/w32-vars.elc \
-  ../lisp/tooltip.elc ../lisp/image.elc \
-  ../lisp/fringe.elc ../lisp/dnd.elc \
-  ../lisp/mwheel.elc ../lisp/tool-bar.elc \
-  ../lisp/x-dnd.elc ../lisp/dynamic-setting.elc \
-  ../lisp/international/fontset.elc \
-  ../lisp/term/common-win.elc \
-  ../lisp/term/x-win.elc \
-  ../lisp/term/pc-win.elc ../lisp/term/internal.elc \
-  ../lisp/term/ns-win.elc ../lisp/term/w32-win.elc
+
+## Configure inserts the file lisp.mk at this point, defining $lisp.
+@lisp_frag@
+
 
 ## Construct full set of libraries to be linked.
 ## Note that SunOS needs -lm to come before -lc; otherwise, you get
@@ -612,6 +380,9 @@ all: emacs$(EXEEXT) $(OTHER_FILES)
 ## Does anyone ever pay attention to the load-path-shadows output here?
 ## The dumped Emacs is as functional and more efficient than
 ## bootstrap-emacs, so we replace the latter with the former.
+## Strictly speaking, emacs does not depend directly on all of $lisp,
+## since not all pieces are used on all platforms.  But DOC depends
+## on all of $lisp, and emacs depends on DOC, so it is ok to use $lisp here.
 emacs$(EXEEXT): temacs$(EXEEXT) $(etc)/DOC $(lisp)
         if test "$(CANNOT_DUMP)" = "yes"; then \
           ln -f temacs$(EXEEXT) emacs$(EXEEXT); \
@@ -624,22 +395,23 @@ emacs$(EXEEXT): temacs$(EXEEXT) $(etc)/DOC $(lisp)
         fi
 
 ## We run make-docfile twice because the command line may get too long
-## on some systems.
+## on some systems.  The sed command operating on lisp.mk also reduces
+## the length of the command line.  Unfortunately, no-one has any idea
+## exactly how long the maximum safe command line length is on all the
+## various systems that Emacs supports.  Obviously, the length depends
+## on what your value of $srcdir is.  If the length restriction goes
+## away, lisp.mk can be merged back into this file.
+##
 ## $(SOME_MACHINE_OBJECTS) comes before $(obj) because some files may
 ## or may not be included in $(obj), but they are always included in
 ## $(SOME_MACHINE_OBJECTS).  Since a file is processed when it is mentioned
 ## for the first time, this prevents any variation between configurations
 ## in the contents of the DOC file.
-## Likewise for $(SOME_MACHINE_LISP).
-## Most of this Makefile refers to Lisp files via $(lispsource), so
-## we also use $(lisp) rather than $(shortlisp) for the dependency since
-## the Makefile uses string equality to decide when we talk about identical
-## files.  Apparently we pass $(shortlisp) rather than $(lisp) to make-docfile
-## only in order to reduce the command line length.  --Stef
-$(etc)/DOC: $(libsrc)/make-docfile$(EXEEXT) $(obj) $(lisp) $(SOME_MACHINE_LISP)
+##
+$(etc)/DOC: $(libsrc)/make-docfile$(EXEEXT) $(obj) $(lisp)
         -rm -f $(etc)/DOC
         $(libsrc)/make-docfile -d $(srcdir) $(SOME_MACHINE_OBJECTS) $(obj) > $(etc)/DOC
-        $(libsrc)/make-docfile -a $(etc)/DOC -d $(srcdir) $(SOME_MACHINE_LISP) $(shortlisp)
+        $(libsrc)/make-docfile -a $(etc)/DOC -d $(srcdir) `sed -n -e 's| \\\\||' -e 's|^[       ]*$$(lispsource)|../lisp|p' $(srcdir)/lisp.mk`
 
 $(libsrc)/make-docfile$(EXEEXT):
         cd $(libsrc); $(MAKE) $(MFLAGS) make-docfile$(EXEEXT)
@@ -797,7 +569,7 @@ tags: TAGS TAGS-LISP $(lwlibdir)/TAGS
                              THEFILE=$< EMACS=$(bootstrap_exe)
 
 ## Since the .el.elc rule cannot specify an extra dependency, we do it here.
-$(lisp) $(SOME_MACHINE_LISP): $(BOOTSTRAPEMACS)
+$(lisp): $(BOOTSTRAPEMACS)
 
 ## VCSWITNESS points to the file that holds info about the current checkout.
 ## We use it as a heuristic to decide when to rebuild loaddefs.el.
diff --git a/src/lisp.mk b/src/lisp.mk
new file mode 100644
index 00000000000..68748b27f28
--- /dev/null
+++ b/src/lisp.mk
@@ -0,0 +1,160 @@
+### lisp.mk --- src/Makefile fragment for GNU Emacs
+
+## Copyright (C) 1985, 1987-1988, 1993-1995, 1999-2011
+##   Free Software Foundation, Inc.
+
+## 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/>.
+
+### Commentary:
+
+## This is the list of all Lisp files that might be loaded into the
+## dumped Emacs.  Some of them are not loaded on all platforms, but
+## the DOC file on every platform uses them (because the DOC file is
+## supposed to be platform-independent).
+## It is arranged like this because it is easier to generate it
+## semi-mechanically from loadup.el this way.
+## Eg something like:
+##   sed -e 's/"[ )].*//' -n -e '/(load "/ s/.*load "//p' loadup.el | \
+##   grep -vE 'site-|ldefs-boot'
+## minus any duplicates.
+## Note that you cannot just add a ".elc" extension to every file,
+## since some of them are no-byte-compile (eg some language/ ones).
+
+## Confusingly, term/internal is not in loadup, but is unconditionally
+## loaded by pc-win, which is.
+
+## Note that this list should not include lisp files which might not
+## be present, like site-load.el and site-init.el; this makefile
+## expects them all to be either present or buildable.
+
+## Place loaddefs.el first, so it gets generated first, since it is on
+## the critical path (relevant in parallel compilations).
+
+### Code:
+
+## NB: This list is parsed by sed in the main src/Makefile.
+## Do not change the formatting.
+lisp = \
+        $(lispsource)/loaddefs.el \
+        $(lispsource)/loadup.el \
+        $(lispsource)/emacs-lisp/byte-run.elc \
+        $(lispsource)/emacs-lisp/backquote.elc \
+        $(lispsource)/subr.elc \
+        $(lispsource)/version.el \
+        $(lispsource)/widget.elc \
+        $(lispsource)/custom.elc \
+        $(lispsource)/emacs-lisp/map-ynp.elc \
+        $(lispsource)/cus-start.elc \
+        $(lispsource)/international/mule.elc \
+        $(lispsource)/international/mule-conf.elc \
+        $(lispsource)/env.elc \
+        $(lispsource)/format.elc \
+        $(lispsource)/bindings.elc \
+        $(lispsource)/files.elc \
+        $(lispsource)/cus-face.elc \
+        $(lispsource)/faces.elc \
+        $(lispsource)/button.elc \
+        $(lispsource)/startup.elc \
+        $(lispsource)/minibuffer.elc \
+        $(lispsource)/abbrev.elc \
+        $(lispsource)/simple.elc \
+        $(lispsource)/help.elc \
+        $(lispsource)/jka-cmpr-hook.elc \
+        $(lispsource)/epa-hook.elc \
+        $(lispsource)/international/mule-cmds.elc \
+        $(lispsource)/case-table.elc \
+        $(lispsource)/international/characters.elc \
+        $(lispsource)/composite.elc \
+        $(lispsource)/international/charprop.el \
+        $(lispsource)/language/chinese.elc \
+        $(lispsource)/language/cyrillic.elc \
+        $(lispsource)/language/indian.elc \
+        $(lispsource)/language/sinhala.el \
+        $(lispsource)/language/english.el \
+        $(lispsource)/language/ethiopic.elc \
+        $(lispsource)/language/european.elc \
+        $(lispsource)/language/czech.el \
+        $(lispsource)/language/slovak.el \
+        $(lispsource)/language/romanian.el \
+        $(lispsource)/language/greek.el \
+        $(lispsource)/language/hebrew.elc \
+        $(lispsource)/language/japanese.el \
+        $(lispsource)/language/korean.el \
+        $(lispsource)/language/lao.el \
+        $(lispsource)/language/tai-viet.el \
+        $(lispsource)/language/thai.el \
+        $(lispsource)/language/tibetan.elc \
+        $(lispsource)/language/vietnamese.elc \
+        $(lispsource)/language/misc-lang.el \
+        $(lispsource)/language/utf-8-lang.el \
+        $(lispsource)/language/georgian.el \
+        $(lispsource)/language/khmer.el \
+        $(lispsource)/language/burmese.el \
+        $(lispsource)/language/cham.el \
+        $(lispsource)/indent.elc \
+        $(lispsource)/window.elc \
+        $(lispsource)/frame.elc \
+        $(lispsource)/term/tty-colors.elc \
+        $(lispsource)/font-core.elc \
+        $(lispsource)/facemenu.elc \
+        $(lispsource)/emacs-lisp/syntax.elc \
+        $(lispsource)/font-lock.elc \
+        $(lispsource)/jit-lock.elc \
+        $(lispsource)/mouse.elc \
+        $(lispsource)/scroll-bar.elc \
+        $(lispsource)/select.elc \
+        $(lispsource)/emacs-lisp/timer.elc \
+        $(lispsource)/isearch.elc \
+        $(lispsource)/rfn-eshadow.elc \
+        $(lispsource)/menu-bar.elc \
+        $(lispsource)/paths.el \
+        $(lispsource)/emacs-lisp/lisp.elc \
+        $(lispsource)/textmodes/page.elc \
+        $(lispsource)/register.elc \
+        $(lispsource)/textmodes/paragraphs.elc \
+        $(lispsource)/emacs-lisp/lisp-mode.elc \
+        $(lispsource)/textmodes/text-mode.elc \
+        $(lispsource)/textmodes/fill.elc \
+        $(lispsource)/replace.elc \
+        $(lispsource)/buff-menu.elc \
+        $(lispsource)/fringe.elc \
+        $(lispsource)/image.elc \
+        $(lispsource)/international/fontset.elc \
+        $(lispsource)/dnd.elc \
+        $(lispsource)/tool-bar.elc \
+        $(lispsource)/dynamic-setting.elc \
+        $(lispsource)/x-dnd.elc \
+        $(lispsource)/term/common-win.elc \
+        $(lispsource)/term/x-win.elc \
+        $(lispsource)/w32-vars.elc \
+        $(lispsource)/term/w32-win.elc \
+        $(lispsource)/ls-lisp.elc \
+        $(lispsource)/disp-table.elc \
+        $(lispsource)/dos-w32.elc \
+        $(lispsource)/w32-fns.elc \
+        $(lispsource)/dos-fns.elc \
+        $(lispsource)/dos-vars.elc \
+        $(lispsource)/term/pc-win.elc \
+        $(lispsource)/term/internal.elc \
+        $(lispsource)/term/ns-win.elc \
+        $(lispsource)/mwheel.elc \
+        $(lispsource)/emacs-lisp/float-sup.elc \
+        $(lispsource)/vc/vc-hooks.elc \
+        $(lispsource)/vc/ediff-hook.elc \
+        $(lispsource)/tooltip.elc
+
+
+### lisp.mk ends here