Mercurial > emacs

--- a/.dir-locals.el	Thu Mar 18 12:56:23 2010 +0100
+++ b/.dir-locals.el	Mon Mar 22 08:34:25 2010 +0100
@@ -4,6 +4,7 @@
  (change-log-mode . ((add-log-time-zone-rule . t)
 		     (fill-column . 74)
 		     (bug-reference-url-format . "http://debbugs.gnu.org/%s")
-		     (mode . bug-reference))))
+		     (mode . bug-reference)))
+ (diff-mode . ((mode . whitespace))))

 ;; arch-tag: fb93c160-e9fe-4184-aad1-e4f5daa11cbd
--- a/ChangeLog	Thu Mar 18 12:56:23 2010 +0100
+++ b/ChangeLog	Mon Mar 22 08:34:25 2010 +0100
@@ -1,3 +1,26 @@
+2010-03-20  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* configure.in: Remove support for old UNIX System V systems and
+	for Unixware on non-x86 machines.
+
+	* configure.in:	Remove support for Solaris on PPC and for old versions.
+
+	* configure.in: Remove non-working lynxos port.
+
+2010-03-19  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* .dir-locals.el (c-mode): Turn on whitespace-mode for diff-mode.
+
+2010-03-19  Glenn Morris  <rgm@gnu.org>
+
+	* configure.in (HAVE_LIBNCURSES): Add a description to make autoheader
+	happy.
+
+2010-03-18  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* configure.in: Check for tputs and friends, abort if not
+	found (bug#5735).
+
 2010-03-18  Glenn Morris  <rgm@gnu.org>

 	* configure.in (--with-x-toolkit): In the help text, say which options
--- a/admin/CPP-DEFINES	Thu Mar 18 12:56:23 2010 +0100
+++ b/admin/CPP-DEFINES	Mon Mar 22 08:34:25 2010 +0100
@@ -75,9 +75,6 @@
 VIRT_ADDR_VARIES
 WORDS_BIG_ENDIAN

-** Not used anymore by any port, can be cleaned up
-NO_SOCK_SIGIO
-
 ** Misc macros
 USER_FULL_NAME   If defined, overrides the default pw->pw_gecos for getting at the full user name.  Only MSDOS overrides the default.

@@ -299,7 +296,7 @@
 PURESIZE
 RUN_TIME_REMAP
 SA_RESTART
-SECTION_ALIGNMENT
+SECTION_ALIGNMENT  -- was only used by s/lynxos.h, maybe all code depending on it can be removed.
 SEGMENT_MASK
 SETPGRP_RELEASES_CTTY
 SETUP_SLAVE_PTY
--- a/configure.in	Thu Mar 18 12:56:23 2010 +0100
+++ b/configure.in	Mon Mar 22 08:34:25 2010 +0100
@@ -458,15 +458,6 @@
     esac
   ;;

-  ## LynxOS ports
-  *-*-lynxos* )
-    opsys=lynxos
-    case "${canonical}" in
-      i[3456]86-*-lynxos*) machine=intel386 ;;
-      powerpc-*-lynxos*) machine=powerpc ;;
-    esac
-  ;;
-
   alpha*-*-linux-gnu* )
     machine=alpha opsys=gnu-linux
   ;;
@@ -550,30 +541,14 @@

   *-sun-solaris* \
     | i[3456]86-*-solaris2* | i[3456]86-*-sunos5* \
-    | x86_64-*-solaris2*    | x86_64-*-sunos5*    \
-    | powerpc*-*-solaris2*  | rs6000-*-solaris2*)
+    | x86_64-*-solaris2*    | x86_64-*-sunos5*)
     case "${canonical}" in
       i[3456]86-*-* )     machine=intel386 ;;
       amd64-*-*|x86_64-*-*)	machine=amdx86-64 ;;
-      powerpc* | rs6000* )  machine=ibmrs6000 ;;
       sparc* )		machine=sparc ;;
       * )		unported=yes ;;
     esac
     case "${canonical}" in
-      *-sunos5.3* | *-solaris2.3* )
-		opsys=sol2-3
-		NON_GNU_CPP=/usr/ccs/lib/cpp
-		;;
-      *-sunos5.4* | *-solaris2.4* )
-		opsys=sol2-4
-		NON_GNU_CPP=/usr/ccs/lib/cpp
-		RANLIB="ar -ts"
-		;;
-      *-sunos5.5* | *-solaris2.5* )
-		opsys=sol2-5
-		NON_GNU_CPP=/usr/ccs/lib/cpp
-		RANLIB="ar -ts"
-		;;
       *-sunos5.6* | *-solaris2.6* )
 		opsys=sol2-6
 		NON_GNU_CPP=/usr/ccs/lib/cpp
@@ -664,22 +639,6 @@
 if test x"${opsys}" = x; then
   case "${canonical}" in
     *-gnu* )				opsys=gnu ;;
-    *-sysv4.2uw* )			opsys=unixware ;;
-    *-sysv5uw* )			opsys=unixware ;;
-    *-sysv5OpenUNIX* )			opsys=unixware ;;
-    *-sysv4.1* | *-sysvr4.1* )
-	NON_GNU_CPP=/usr/lib/cpp
-	opsys=usg5-4 ;;
-    *-sysv4.[2-9]* | *-sysvr4.[2-9]* )
-	if [ x$NON_GNU_CPP = x ]; then
-	  if [ -f /usr/ccs/lib/cpp ]; then
-	    NON_GNU_CPP=/usr/ccs/lib/cpp
-	  else
-	    NON_GNU_CPP=/lib/cpp
-	  fi
-	fi
-	opsys=usg5-4-2 ;;
-    *-sysv4* | *-sysvr4* )		opsys=usg5-4 ;;
     * )
       unported=yes
     ;;
@@ -2402,7 +2361,8 @@
 libncurses-dev(el), libterminfo-dev(el) or similar.])
 fi
 # Must define this when any termcap library is found.
-AC_DEFINE(HAVE_LIBNCURSES)
+AC_DEFINE(HAVE_LIBNCURSES, 1,
+          [Define to 1 if you have the `ncurses' library (-lncurses).])

 # Do we have res_init, for detecting changes in /etc/resolv.conf?
--- a/doc/lispref/ChangeLog	Thu Mar 18 12:56:23 2010 +0100
+++ b/doc/lispref/ChangeLog	Mon Mar 22 08:34:25 2010 +0100
@@ -1,3 +1,7 @@
+2010-03-20  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* os.texi (System Environment): Do not mention lynxos.
+
 2010-03-10  Chong Yidong  <cyd@stupidchicken.com>

 	* Branch for 23.2.
--- a/doc/lispref/os.texi	Thu Mar 18 12:56:23 2010 +0100
+++ b/doc/lispref/os.texi	Mon Mar 22 08:34:25 2010 +0100
@@ -786,9 +786,6 @@
 @item irix
 Silicon Graphics Irix system.

-@item lynxos 3.0.1
-LynxOS-3.0.1.
-
 @item ms-dos
 Microsoft MS-DOS ``operating system.''  Emacs compiled with DJGPP for
 MS-DOS binds @code{system-type} to @code{ms-dos} even when you run it on
--- a/etc/NEWS	Thu Mar 18 12:56:23 2010 +0100
+++ b/etc/NEWS	Mon Mar 22 08:34:25 2010 +0100
@@ -63,11 +63,24 @@

 *** vc-dir for Bzr supports viewing shelve contents and shelving snapshots.

+*** Special markup can be added to log-edit buffers.
+
+**** For Bzr, adding an
+Author: NAME
+line will add "--author NAME" to the "bzr commit" command.
+
+**** For Hg, adding an
+Author: NAME
+line will add "--user NAME" to the "hg commit" command.
+
 ** Directory local variables can apply to file-less buffers.
 For example, adding "(diff-mode . ((mode . whitespace)))" to your
 .dir-locals.el file, will turn on `whitespace-mode' for *vc-diff*
 buffers.

+** s-region.el is now declared obsolete, superceded by shift-select-mode
+enabled by default in 23.1.
+

 * New Modes and Packages in Emacs 24.1
--- a/lib-src/ChangeLog	Thu Mar 18 12:56:23 2010 +0100
+++ b/lib-src/ChangeLog	Mon Mar 22 08:34:25 2010 +0100
@@ -1,3 +1,11 @@
+2010-03-20  Glenn Morris  <rgm@gnu.org>
+
+	* Makefile.in (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB)
+	(LIBHESIOD, LIBRESOLV): Make previous change a bit more friendly by
+	defining these as Makefile variables.
+	(LIBS_MOVE): Add LIBS_MAIL into this.
+	(movemail${EXEEXT}): Just use LIBS_MOVE, not LIBS_MAIL as well.
+
 2010-03-18  Glenn Morris  <rgm@gnu.org>

 	* Makefile.in (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB)
--- a/lib-src/Makefile.in	Thu Mar 18 12:56:23 2010 +0100
+++ b/lib-src/Makefile.in	Mon Mar 22 08:34:25 2010 +0100
@@ -130,6 +130,27 @@
 # If neither flag is set, blessmail is used.
 MOVE_FLAGS=

+## -lkrb if HAVE_LIBKRB or -lkrb4 if HAVE_LIBKRB4
+KRB4LIB=@KRB4LIB@
+## -ldes if HAVE_LIBDES or -ldes425 if HAVE_LIBDES425
+DESLIB=@DESLIB@
+## -lkrb5 if HAVE_LIBKRB5
+KRB5LIB=@KRB5LIB@
+## -lk5crypto if HAVE_LIBK5CRYPTO or -lcrypto if HAVE_LIBCRYPTO
+CRYPTOLIB=@CRYPTOLIB@
+## -lcom_err if HAVE_LIBCOM_ERR
+COM_ERRLIB=@COM_ERRLIB@
+## -lhesiod if HAVE_LIBHESIOD
+LIBHESIOD=@LIBHESIOD@
+## -lresolv if HAVE_LIBRESOLV
+LIBRESOLV=@LIBRESOLV@
+## -llockfile if HAVE_LIBLOCKFILE or -lmail if HAVE_LIBMAIL
+LIBS_MAIL=@LIBS_MAIL@
+
+## Extra libraries to use when linking movemail.
+LIBS_MOVE = $(LIBS_MAIL) $(KRB4LIB) $(DESLIB) $(KRB5LIB) $(CRYPTOLIB) $(COM_ERRLIB) $(LIBHESIOD) $(LIBRESOLV)
+
+
 # ========================== start of cpp stuff =======================
 /* From here on, comments must be done in C syntax.  */

@@ -168,10 +189,6 @@
 #define BLESSMAIL
 #endif

-LIBS_MOVE=@KRB4LIB@ @DESLIB@ @KRB5LIB@ @CRYPTOLIB@ @COM_ERRLIB@ @LIBHESIOD@ @LIBRESOLV@
-
-LIBS_MAIL=@LIBS_MAIL@
-
 LOADLIBES=LIBS_SYSTEM LIBS_MACHINE

 /* Those files shared with other GNU utilities need HAVE_CONFIG_H
@@ -365,7 +382,7 @@
 	   $(GETOPTOBJS) $(LOADLIBES) -o b2m

 movemail${EXEEXT}: movemail.o pop.o $(GETOPTDEPS)
-	$(CC) ${LINK_CFLAGS} ${MOVE_FLAGS} movemail.o pop.o $(GETOPTOBJS) $(LOADLIBES) $(LIBS_MAIL) $(LIBS_MOVE) -o movemail
+	$(CC) ${LINK_CFLAGS} ${MOVE_FLAGS} movemail.o pop.o $(GETOPTOBJS) $(LOADLIBES) $(LIBS_MOVE) -o movemail

 /*  We need to define emacs to get the right version of something (what?).  */
 movemail.o: ${srcdir}/movemail.c ../src/config.h $(GETOPT_H)
--- a/lisp/ChangeLog	Thu Mar 18 12:56:23 2010 +0100
+++ b/lisp/ChangeLog	Mon Mar 22 08:34:25 2010 +0100
@@ -1,3 +1,122 @@
+2010-03-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	Get rid of the ELCFILES abomination, again.
+	* Makefile.in (update-elclist, ELCFILES, compile-last): Remove.
+	(all, compile): Don't call compile-last.
+	(compile-main): Build the "elcfiles" list dynamically.
+	(compile-targets): New (internal) target.
+
+2010-03-21  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* Makefile.in (top_srcdir): Define.
+	(abs_top_builddir): Define.
+	(srcdir): Don't append `/..'.
+	(EMACS): Use ${abs_top_builddir}.
+	(all, compile, compile-always, compile-last): Don't set emacswd.
+	(update-subdirs, update-authors): Use $(top_srcdir) instead of $(srcdir).
+	(lisp): Use $(srcdir) instead of @srcdir@.
+
+2010-03-21  Juri Linkov  <juri@jurta.org>
+
+	Fix message of multi-line occur regexps and multi-buffer header lines.
+	http://lists.gnu.org/archive/html/emacs-devel/2010-03/msg00457.html
+
+	* replace.el (occur-1): Don't display regexp if it is longer
+	than window-width.  Use `query-replace-descr' to display regexp.
+	(occur-engine): Don't display regexp in the buffer header for
+	multi-buffer occur.  Display a separate header line with total
+	match count and regexp for multi-buffer occur.
+	Use `query-replace-descr' to display regexp.
+
+2010-03-20  Teodor Zlatanov  <tzz@lifelogs.com>
+
+	* net/secrets.el: Fix parenthesis.
+	(secrets-enabled): Fix parenthesis.
+
+2010-03-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	Use more relative file and directory names.
+	* Makefile.in (EMACS): Arrange for it to work when we chdir.
+	(setwins, setwins_almost, setwins_for_subdirs):
+	Don't `cd'; output relative names.
+	(all, compile, compile-always, compile-last): Set emacswd.
+	(custom-deps, finder-data, autoloads, update-subdirs, compile-last):
+	Just cd to the lisp source dir so we can use relative file names.
+
+	* outline.el (hide-sublevels): Unfix the paren non-typo! (bug#5738).
+
+2010-03-20  Glenn Morris  <rgm@gnu.org>
+
+	* textmodes/rst.el: Use faces for font-lock customization, and make the
+	old -face variables obsolete.
+	(rst-block, rst-external, rst-definition, rst-directive, rst-comment)
+	(rst-emphasis1, rst-emphasis2, rst-literal, rst-reference): New faces.
+	(rst-block-face, rst-external-face, rst-definition-face)
+	(rst-directive-face, rst-comment-face, rst-emphasis1-face)
+	(rst-emphasis2-face, rst-literal-face, rst-reference-face):
+	Make obsolete.
+	(rst-font-lock-keywords-function): Update for above changes.
+
+2010-03-20  Juri Linkov  <juri@jurta.org>
+
+	* s-region.el:
+	* obsolete/s-region.el: Move to obsolete.
+
+2010-03-19  Juanma Barranquero  <lekktu@gmail.com>
+
+	* vc-dispatcher.el (vc-do-command): Remove reference to `vc-path'.
+
+2010-03-19  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* vc-hooks.el (vc-path): Remove variable and obsolete declaration.
+
+2010-03-19  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	Add special markup processing for commit logs.
+	* log-edit.el (log-edit-extra-flags): New variable.
+	(log-edit): Add new argument MODE.  Use that mode when non-nil
+	instead of the log-view-mode.
+	(log-view-process-buffer): New function.
+
+	* vc.el: Document that the checkin method takes optional
+	arguments.  Document new backend specific method: log-view-mode.
+	(vc-default-log-edit-mode): New function.
+	(vc-checkin): Use a backend specific log-view-mode.
+	Pass extra arguments to the checkin method.
+	(vc-modify-change-comment): Pass a dummy extra argument.
+
+	* vc-dispatcher.el (vc-log-edit): Add a mode argument, pass it to
+	log-edit.
+	(vc-start-logentry): Add a mode argument, pass it to vc-log-edit.
+	(vc-finish-logentry): Process the log buffer before passing it
+	down.  Pass log-edit-extra-flags.
+
+	* vc-bzr.el (vc-bzr-checkin): Pass extra arguments to the commit
+	command.
+	(log-edit-extra-flags, log-edit-before-checkin-process): New declarations.
+
+	* vc-hg.el (vc-hg-checkin): Pass extra arguments to the commit
+	command.
+	(log-edit-extra-flags, log-edit-before-checkin-process): New declarations.
+	(vc-hg-log-edit-mode): New derived mode.
+
+	* vc-arch.el (vc-arch-checkin):
+	* vc-cvs.el (vc-cvs-checkin):
+	* vc-git.el (vc-git-checkin):
+	* vc-mtn.el (vc-mtn-checkin):
+	* vc-rcs.el (vc-rcs-checkin):
+	* vc-sccs.el (vc-sccs-checkin):
+	* vc-svn.el (vc-svn-checkin): Add an optional ignored argument.
+
+2010-03-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* outline.el (hide-sublevels): Don't hide trailing newline (and fix
+	parent typo).
+
+2010-03-19  Glenn Morris  <rgm@gnu.org>
+
+	* password-cache.el (password-cache, password-cache-expiry): Autoload.
+
 2010-03-18  Glenn Morris  <rgm@gnu.org>

 	* emacs-lisp/autoload.el (autoload-rubric): Doc fix.
@@ -32,8 +151,8 @@
 2010-03-15  Michael Albinus  <michael.albinus@gmx.de>

 	* net/secrets.el (top): Register the D-Bus signals only when the
-	service "org.freedesktop.secrets" can be pinged.  Provide
-	subfeature 'enabled.
+	service "org.freedesktop.secrets" can be pinged.
+	Provide subfeature `enabled'.

 2010-03-14  Juri Linkov  <juri@jurta.org>
--- a/lisp/Makefile.in	Thu Mar 18 12:56:23 2010 +0100
+++ b/lisp/Makefile.in	Mon Mar 22 08:34:25 2010 +0100
@@ -19,14 +19,19 @@

 SHELL = /bin/sh

-lisp=@srcdir@
-VPATH=@srcdir@
-srcdir=@srcdir@/..
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+abs_top_builddir = @abs_top_builddir@
+lisp = $(srcdir)
+VPATH = $(srcdir)

 # You can specify a different executable on the make command line,
 # e.g. "make EMACS=../src/emacs ...".

-EMACS = ../src/emacs
+# We sometimes change directory before running Emacs (typically when
+# building out-of-tree, we chdir to the source directory), so we need
+# to use an aboluste file name.
+EMACS = ${abs_top_builddir}/src/emacs

 # Command line flags for Emacs.  This must include --multibyte,
 # otherwise some files will not compile.
@@ -80,28 +85,28 @@

 # Common command to find subdirectories

-setwins=subdirs=`(cd $$wd; find . -type d -print)`; \
+setwins=subdirs=`(find . -type d -print)`; \
 	for file in $$subdirs; do \
 	   case $$file in */Old | */RCS | */CVS | */CVS/* | */.* | */.*/* | */=* ) ;; \
-		*) wins="$$wins $$wd/$$file" ;; \
+		*) wins="$$wins $$file" ;; \
 	   esac; \
         done

 # Find all subdirectories except `obsolete' and `term'.

-setwins_almost=subdirs=`(cd $$wd; find . -type d -print)`; \
+setwins_almost=subdirs=`(find . -type d -print)`; \
 	for file in $$subdirs; do \
 	   case $$file in */Old | */RCS | */CVS | */CVS/* | */.* | */.*/* | */=* | */obsolete | */term ) ;; \
-		*) wins="$$wins $$wd/$$file" ;; \
+		*) wins="$$wins $$file" ;; \
 	   esac; \
         done

 # Find all subdirectories in which we might want to create subdirs.el

-setwins_for_subdirs=subdirs=`(cd $$wd; find . -type d -print)`; \
+setwins_for_subdirs=subdirs=`(find . -type d -print)`; \
 	for file in $$subdirs; do \
 	   case $$file in */Old | */RCS | */CVS | */CVS/* | */.* | */.*/* | */=* | */cedet* ) ;; \
-		*) wins="$$wins $$wd/$$file" ;; \
+		*) wins="$$wins $$file" ;; \
 	   esac; \
         done

@@ -110,8 +115,6 @@
 # cus-load and finder-inf are not explicitly requested by anything, so
 # we add them here to make sure they get built.
 all: compile-main $(lisp)/cus-load.el $(lisp)/finder-inf.el
-	@: Let us check that we byte-compiled all the files.
-	$(MAKE) $(MFLAGS) compile-last EMACS=$(EMACS)

 doit:

@@ -132,14 +135,14 @@
 $(lisp)/cus-load.el:
 	$(MAKE) $(MFLAGS) custom-deps
 custom-deps: doit
-	wd=$(lisp); $(setwins_almost); \
+	cd $(lisp); $(setwins_almost); \
 	echo Directories: $$wins; \
 	$(emacs) -l cus-dep --eval '(setq generated-custom-dependencies-file "$(lisp)/cus-load.el")' -f custom-make-dependencies $$wins

 $(lisp)/finder-inf.el:
 	$(MAKE) $(MFLAGS) finder-data
 finder-data: doit
-	wd=$(lisp); $(setwins_almost); \
+	cd $(lisp); $(setwins_almost); \
 	echo Directories: $$wins; \
 	$(emacs) -l finder --eval '(setq generated-finder-keywords-file "$(lisp)/finder-inf.el")' -f finder-compile-keywords-make-dist $$wins

@@ -149,7 +152,7 @@
 	chmod +w $(lisp)/ps-print.el $(lisp)/emulation/tpu-edt.el \
 	  $(lisp)/emacs-lisp/cl-loaddefs.el $(lisp)/mail/rmail.el \
 	  $(lisp)/dired.el $(lisp)/ibuffer.el
-	wd=$(lisp); $(setwins_almost); \
+	cd $(lisp); $(setwins_almost); \
 	echo Directories: $$wins; \
 	$(emacs) -l autoload --eval '(setq generated-autoload-file "$(lisp)/loaddefs.el")' -f batch-update-autoloads $$wins

@@ -158,9 +161,9 @@
 $(lisp)/subdirs.el:
 	$(MAKE) $(MFLAGS) update-subdirs
 update-subdirs: doit
-	wd=$(lisp); $(setwins_for_subdirs); \
+	cd $(lisp); $(setwins_for_subdirs); \
 	for file in $$wins; do \
-	   $(srcdir)/update-subdirs $$file; \
+	   $(top_srcdir)/update-subdirs $$file; \
 	done;

 updates: update-subdirs autoloads finder-data custom-deps
@@ -174,1290 +177,12 @@
 # Update the AUTHORS file.

 update-authors:
-	$(emacs) -l authors -f batch-update-authors $(srcdir)/etc/AUTHORS $(srcdir)
+	$(emacs) -l authors -f batch-update-authors $(top_srcdir)/etc/AUTHORS $(top_srcdir)

 TAGS TAGS-LISP: $(lisptagsfiles1) $(lisptagsfiles2) $(lisptagsfiles3) $(lisptagsfiles4)
 	els=`echo $(lisptagsfiles1) $(lisptagsfiles2) $(lisptagsfiles3) $(lisptagsfiles4) | sed -e "s,$(lisp)/[^ ]*loaddefs[^ ]*,," -e "s,$(lisp)/ldefs-boot[^ ]*,,"`; \
 	${ETAGS} -o $@ $$els

-.PHONY: update-elclist
-
-## Post-bootstrap, find the list of .elc files and use sed to update
-## ELCFILES in Makefile.in.
-## Errors in the final sed are non-fatal, since they have no effect on
-## building Emacs.  chmod +w is for CVSREAD=1.
-## "echo" is non-portable with regards to backslashes, eg between zsh
-## and bash.  Hence the use of sed on line 2 below (line 1 seems to be OK).
-## http://lists.gnu.org/archive/html/emacs-devel/2008-05/msg01535.html
-update-elclist:
-	echo "/^ELCFILES/,/^$$/c\\" > temp.sed
-	echo "ELCFILES =" | sed -e 's/$$/ \\\\\\/' >> temp.sed
-	LC_COLLATE=C ls $(lisp)/*.elc $(lisp)/*/*.elc $(lisp)/*/*/*.elc $(lisp)/*/*/*/*.elc | sed -e "s|^$(lisp)|	\$$(lisp)|" -e 's/$$/ \\\\\\/' -e '$$ s/ \\\\//' >> temp.sed
-	echo "" >> temp.sed
-	-sed -f temp.sed $(lisp)/Makefile.in > temp-elcfiles || rm temp-elcfiles
-	rm temp.sed
-	@test -f temp-elcfiles || echo "Maintainer warning: failed to update Makefile.in.  You can ignore this if you are not an Emacs developer."
-	if test -f temp-elcfiles; then \
-	  chmod +w $(lisp)/Makefile.in; \
-	  mv -f temp-elcfiles $(lisp)/Makefile.in; \
-	fi
-	-(LC_COLLATE=C ls $(lisp)/*.elc $(lisp)/*/*.elc $(lisp)/*/*/*.elc $(lisp)/*/*/*/*.elc | sed 's/elc$$/el/';  \
-	  LC_COLLATE=C ls $(lisp)/*.el $(lisp)/*/*.el $(lisp)/*/*/*.el $(lisp)/*/*/*/*.el; \
-	  LC_COLLATE=C ls $(lisp)/*.el $(lisp)/*/*.el $(lisp)/*/*/*.el $(lisp)/*/*/*/*.el) |	   \
-	     sort | uniq -u | while read extra; do 			   \
-	         echo "Found left over byte-compiled file: $${extra}c !!" ;\
-	     done
-
-## Explicitly list the .elc files, for the sake of parallel builds.
-## http://lists.gnu.org/archive/html/bug-gnu-emacs/2008-05/msg00016.html
-## This can probably be done more elegantly, but needs to be portable.
-ELCFILES = \
-	$(lisp)/abbrev.elc \
-	$(lisp)/abbrevlist.elc \
-	$(lisp)/add-log.elc \
-	$(lisp)/align.elc \
-	$(lisp)/allout.elc \
-	$(lisp)/ansi-color.elc \
-	$(lisp)/apropos.elc \
-	$(lisp)/arc-mode.elc \
-	$(lisp)/array.elc \
-	$(lisp)/autoarg.elc \
-	$(lisp)/autoinsert.elc \
-	$(lisp)/autorevert.elc \
-	$(lisp)/avoid.elc \
-	$(lisp)/battery.elc \
-	$(lisp)/bindings.elc \
-	$(lisp)/bookmark.elc \
-	$(lisp)/bs.elc \
-	$(lisp)/buff-menu.elc \
-	$(lisp)/button.elc \
-	$(lisp)/calc/calc-aent.elc \
-	$(lisp)/calc/calc-alg.elc \
-	$(lisp)/calc/calc-arith.elc \
-	$(lisp)/calc/calc-bin.elc \
-	$(lisp)/calc/calc-comb.elc \
-	$(lisp)/calc/calc-cplx.elc \
-	$(lisp)/calc/calc-embed.elc \
-	$(lisp)/calc/calc-ext.elc \
-	$(lisp)/calc/calc-fin.elc \
-	$(lisp)/calc/calc-forms.elc \
-	$(lisp)/calc/calc-frac.elc \
-	$(lisp)/calc/calc-funcs.elc \
-	$(lisp)/calc/calc-graph.elc \
-	$(lisp)/calc/calc-help.elc \
-	$(lisp)/calc/calc-incom.elc \
-	$(lisp)/calc/calc-keypd.elc \
-	$(lisp)/calc/calc-lang.elc \
-	$(lisp)/calc/calc-macs.elc \
-	$(lisp)/calc/calc-map.elc \
-	$(lisp)/calc/calc-math.elc \
-	$(lisp)/calc/calc-menu.elc \
-	$(lisp)/calc/calc-misc.elc \
-	$(lisp)/calc/calc-mode.elc \
-	$(lisp)/calc/calc-mtx.elc \
-	$(lisp)/calc/calc-nlfit.elc \
-	$(lisp)/calc/calc-poly.elc \
-	$(lisp)/calc/calc-prog.elc \
-	$(lisp)/calc/calc-rewr.elc \
-	$(lisp)/calc/calc-rules.elc \
-	$(lisp)/calc/calc-sel.elc \
-	$(lisp)/calc/calc-stat.elc \
-	$(lisp)/calc/calc-store.elc \
-	$(lisp)/calc/calc-stuff.elc \
-	$(lisp)/calc/calc-trail.elc \
-	$(lisp)/calc/calc-undo.elc \
-	$(lisp)/calc/calc-units.elc \
-	$(lisp)/calc/calc-vec.elc \
-	$(lisp)/calc/calc-yank.elc \
-	$(lisp)/calc/calc.elc \
-	$(lisp)/calc/calcalg2.elc \
-	$(lisp)/calc/calcalg3.elc \
-	$(lisp)/calc/calccomp.elc \
-	$(lisp)/calc/calcsel2.elc \
-	$(lisp)/calculator.elc \
-	$(lisp)/calendar/appt.elc \
-	$(lisp)/calendar/cal-bahai.elc \
-	$(lisp)/calendar/cal-china.elc \
-	$(lisp)/calendar/cal-coptic.elc \
-	$(lisp)/calendar/cal-dst.elc \
-	$(lisp)/calendar/cal-french.elc \
-	$(lisp)/calendar/cal-hebrew.elc \
-	$(lisp)/calendar/cal-html.elc \
-	$(lisp)/calendar/cal-islam.elc \
-	$(lisp)/calendar/cal-iso.elc \
-	$(lisp)/calendar/cal-julian.elc \
-	$(lisp)/calendar/cal-mayan.elc \
-	$(lisp)/calendar/cal-menu.elc \
-	$(lisp)/calendar/cal-move.elc \
-	$(lisp)/calendar/cal-persia.elc \
-	$(lisp)/calendar/cal-tex.elc \
-	$(lisp)/calendar/cal-x.elc \
-	$(lisp)/calendar/calendar.elc \
-	$(lisp)/calendar/diary-lib.elc \
-	$(lisp)/calendar/holidays.elc \
-	$(lisp)/calendar/icalendar.elc \
-	$(lisp)/calendar/lunar.elc \
-	$(lisp)/calendar/parse-time.elc \
-	$(lisp)/calendar/solar.elc \
-	$(lisp)/calendar/time-date.elc \
-	$(lisp)/calendar/timeclock.elc \
-	$(lisp)/calendar/todo-mode.elc \
-	$(lisp)/case-table.elc \
-	$(lisp)/cdl.elc \
-	$(lisp)/cedet/cedet-cscope.elc \
-	$(lisp)/cedet/cedet-files.elc \
-	$(lisp)/cedet/cedet-global.elc \
-	$(lisp)/cedet/cedet-idutils.elc \
-	$(lisp)/cedet/cedet.elc \
-	$(lisp)/cedet/data-debug.elc \
-	$(lisp)/cedet/ede.elc \
-	$(lisp)/cedet/ede/autoconf-edit.elc \
-	$(lisp)/cedet/ede/cpp-root.elc \
-	$(lisp)/cedet/ede/dired.elc \
-	$(lisp)/cedet/ede/emacs.elc \
-	$(lisp)/cedet/ede/files.elc \
-	$(lisp)/cedet/ede/linux.elc \
-	$(lisp)/cedet/ede/locate.elc \
-	$(lisp)/cedet/ede/make.elc \
-	$(lisp)/cedet/ede/makefile-edit.elc \
-	$(lisp)/cedet/ede/pconf.elc \
-	$(lisp)/cedet/ede/pmake.elc \
-	$(lisp)/cedet/ede/proj-archive.elc \
-	$(lisp)/cedet/ede/proj-aux.elc \
-	$(lisp)/cedet/ede/proj-comp.elc \
-	$(lisp)/cedet/ede/proj-elisp.elc \
-	$(lisp)/cedet/ede/proj-info.elc \
-	$(lisp)/cedet/ede/proj-misc.elc \
-	$(lisp)/cedet/ede/proj-obj.elc \
-	$(lisp)/cedet/ede/proj-prog.elc \
-	$(lisp)/cedet/ede/proj-scheme.elc \
-	$(lisp)/cedet/ede/proj-shared.elc \
-	$(lisp)/cedet/ede/proj.elc \
-	$(lisp)/cedet/ede/project-am.elc \
-	$(lisp)/cedet/ede/shell.elc \
-	$(lisp)/cedet/ede/simple.elc \
-	$(lisp)/cedet/ede/source.elc \
-	$(lisp)/cedet/ede/speedbar.elc \
-	$(lisp)/cedet/ede/srecode.elc \
-	$(lisp)/cedet/ede/system.elc \
-	$(lisp)/cedet/ede/util.elc \
-	$(lisp)/cedet/inversion.elc \
-	$(lisp)/cedet/mode-local.elc \
-	$(lisp)/cedet/pulse.elc \
-	$(lisp)/cedet/semantic.elc \
-	$(lisp)/cedet/semantic/analyze.elc \
-	$(lisp)/cedet/semantic/analyze/complete.elc \
-	$(lisp)/cedet/semantic/analyze/debug.elc \
-	$(lisp)/cedet/semantic/analyze/fcn.elc \
-	$(lisp)/cedet/semantic/analyze/refs.elc \
-	$(lisp)/cedet/semantic/bovine.elc \
-	$(lisp)/cedet/semantic/bovine/c-by.elc \
-	$(lisp)/cedet/semantic/bovine/c.elc \
-	$(lisp)/cedet/semantic/bovine/debug.elc \
-	$(lisp)/cedet/semantic/bovine/el.elc \
-	$(lisp)/cedet/semantic/bovine/gcc.elc \
-	$(lisp)/cedet/semantic/bovine/make-by.elc \
-	$(lisp)/cedet/semantic/bovine/make.elc \
-	$(lisp)/cedet/semantic/bovine/scm-by.elc \
-	$(lisp)/cedet/semantic/bovine/scm.elc \
-	$(lisp)/cedet/semantic/chart.elc \
-	$(lisp)/cedet/semantic/complete.elc \
-	$(lisp)/cedet/semantic/ctxt.elc \
-	$(lisp)/cedet/semantic/db-debug.elc \
-	$(lisp)/cedet/semantic/db-ebrowse.elc \
-	$(lisp)/cedet/semantic/db-el.elc \
-	$(lisp)/cedet/semantic/db-file.elc \
-	$(lisp)/cedet/semantic/db-find.elc \
-	$(lisp)/cedet/semantic/db-global.elc \
-	$(lisp)/cedet/semantic/db-javascript.elc \
-	$(lisp)/cedet/semantic/db-mode.elc \
-	$(lisp)/cedet/semantic/db-ref.elc \
-	$(lisp)/cedet/semantic/db-typecache.elc \
-	$(lisp)/cedet/semantic/db.elc \
-	$(lisp)/cedet/semantic/debug.elc \
-	$(lisp)/cedet/semantic/decorate.elc \
-	$(lisp)/cedet/semantic/decorate/include.elc \
-	$(lisp)/cedet/semantic/decorate/mode.elc \
-	$(lisp)/cedet/semantic/dep.elc \
-	$(lisp)/cedet/semantic/doc.elc \
-	$(lisp)/cedet/semantic/ede-grammar.elc \
-	$(lisp)/cedet/semantic/edit.elc \
-	$(lisp)/cedet/semantic/find.elc \
-	$(lisp)/cedet/semantic/format.elc \
-	$(lisp)/cedet/semantic/fw.elc \
-	$(lisp)/cedet/semantic/grammar-wy.elc \
-	$(lisp)/cedet/semantic/grammar.elc \
-	$(lisp)/cedet/semantic/html.elc \
-	$(lisp)/cedet/semantic/ia-sb.elc \
-	$(lisp)/cedet/semantic/ia.elc \
-	$(lisp)/cedet/semantic/idle.elc \
-	$(lisp)/cedet/semantic/java.elc \
-	$(lisp)/cedet/semantic/lex-spp.elc \
-	$(lisp)/cedet/semantic/lex.elc \
-	$(lisp)/cedet/semantic/mru-bookmark.elc \
-	$(lisp)/cedet/semantic/sb.elc \
-	$(lisp)/cedet/semantic/scope.elc \
-	$(lisp)/cedet/semantic/senator.elc \
-	$(lisp)/cedet/semantic/sort.elc \
-	$(lisp)/cedet/semantic/symref.elc \
-	$(lisp)/cedet/semantic/symref/cscope.elc \
-	$(lisp)/cedet/semantic/symref/filter.elc \
-	$(lisp)/cedet/semantic/symref/global.elc \
-	$(lisp)/cedet/semantic/symref/grep.elc \
-	$(lisp)/cedet/semantic/symref/idutils.elc \
-	$(lisp)/cedet/semantic/symref/list.elc \
-	$(lisp)/cedet/semantic/tag-file.elc \
-	$(lisp)/cedet/semantic/tag-ls.elc \
-	$(lisp)/cedet/semantic/tag-write.elc \
-	$(lisp)/cedet/semantic/tag.elc \
-	$(lisp)/cedet/semantic/texi.elc \
-	$(lisp)/cedet/semantic/util-modes.elc \
-	$(lisp)/cedet/semantic/util.elc \
-	$(lisp)/cedet/semantic/wisent.elc \
-	$(lisp)/cedet/semantic/wisent/comp.elc \
-	$(lisp)/cedet/semantic/wisent/java-tags.elc \
-	$(lisp)/cedet/semantic/wisent/javascript.elc \
-	$(lisp)/cedet/semantic/wisent/javat-wy.elc \
-	$(lisp)/cedet/semantic/wisent/js-wy.elc \
-	$(lisp)/cedet/semantic/wisent/python-wy.elc \
-	$(lisp)/cedet/semantic/wisent/python.elc \
-	$(lisp)/cedet/semantic/wisent/wisent.elc \
-	$(lisp)/cedet/srecode.elc \
-	$(lisp)/cedet/srecode/args.elc \
-	$(lisp)/cedet/srecode/compile.elc \
-	$(lisp)/cedet/srecode/cpp.elc \
-	$(lisp)/cedet/srecode/ctxt.elc \
-	$(lisp)/cedet/srecode/dictionary.elc \
-	$(lisp)/cedet/srecode/document.elc \
-	$(lisp)/cedet/srecode/el.elc \
-	$(lisp)/cedet/srecode/expandproto.elc \
-	$(lisp)/cedet/srecode/extract.elc \
-	$(lisp)/cedet/srecode/fields.elc \
-	$(lisp)/cedet/srecode/filters.elc \
-	$(lisp)/cedet/srecode/find.elc \
-	$(lisp)/cedet/srecode/getset.elc \
-	$(lisp)/cedet/srecode/insert.elc \
-	$(lisp)/cedet/srecode/java.elc \
-	$(lisp)/cedet/srecode/map.elc \
-	$(lisp)/cedet/srecode/mode.elc \
-	$(lisp)/cedet/srecode/semantic.elc \
-	$(lisp)/cedet/srecode/srt-mode.elc \
-	$(lisp)/cedet/srecode/srt-wy.elc \
-	$(lisp)/cedet/srecode/srt.elc \
-	$(lisp)/cedet/srecode/table.elc \
-	$(lisp)/cedet/srecode/template.elc \
-	$(lisp)/cedet/srecode/texi.elc \
-	$(lisp)/chistory.elc \
-	$(lisp)/cmuscheme.elc \
-	$(lisp)/comint.elc \
-	$(lisp)/compare-w.elc \
-	$(lisp)/complete.elc \
-	$(lisp)/completion.elc \
-	$(lisp)/composite.elc \
-	$(lisp)/cus-dep.elc \
-	$(lisp)/cus-edit.elc \
-	$(lisp)/cus-face.elc \
-	$(lisp)/cus-start.elc \
-	$(lisp)/cus-theme.elc \
-	$(lisp)/custom.elc \
-	$(lisp)/cvs-status.elc \
-	$(lisp)/dabbrev.elc \
-	$(lisp)/delim-col.elc \
-	$(lisp)/delsel.elc \
-	$(lisp)/descr-text.elc \
-	$(lisp)/desktop.elc \
-	$(lisp)/dframe.elc \
-	$(lisp)/diff-mode.elc \
-	$(lisp)/diff.elc \
-	$(lisp)/dired-aux.elc \
-	$(lisp)/dired-x.elc \
-	$(lisp)/dired.elc \
-	$(lisp)/dirtrack.elc \
-	$(lisp)/disp-table.elc \
-	$(lisp)/dnd.elc \
-	$(lisp)/doc-view.elc \
-	$(lisp)/dos-fns.elc \
-	$(lisp)/dos-vars.elc \
-	$(lisp)/dos-w32.elc \
-	$(lisp)/double.elc \
-	$(lisp)/ebuff-menu.elc \
-	$(lisp)/echistory.elc \
-	$(lisp)/ediff-diff.elc \
-	$(lisp)/ediff-help.elc \
-	$(lisp)/ediff-hook.elc \
-	$(lisp)/ediff-init.elc \
-	$(lisp)/ediff-merg.elc \
-	$(lisp)/ediff-mult.elc \
-	$(lisp)/ediff-ptch.elc \
-	$(lisp)/ediff-util.elc \
-	$(lisp)/ediff-vers.elc \
-	$(lisp)/ediff-wind.elc \
-	$(lisp)/ediff.elc \
-	$(lisp)/edmacro.elc \
-	$(lisp)/ehelp.elc \
-	$(lisp)/electric.elc \
-	$(lisp)/elide-head.elc \
-	$(lisp)/emacs-lisp/advice.elc \
-	$(lisp)/emacs-lisp/assoc.elc \
-	$(lisp)/emacs-lisp/authors.elc \
-	$(lisp)/emacs-lisp/autoload.elc \
-	$(lisp)/emacs-lisp/avl-tree.elc \
-	$(lisp)/emacs-lisp/backquote.elc \
-	$(lisp)/emacs-lisp/benchmark.elc \
-	$(lisp)/emacs-lisp/bindat.elc \
-	$(lisp)/emacs-lisp/byte-opt.elc \
-	$(lisp)/emacs-lisp/byte-run.elc \
-	$(lisp)/emacs-lisp/bytecomp.elc \
-	$(lisp)/emacs-lisp/chart.elc \
-	$(lisp)/emacs-lisp/check-declare.elc \
-	$(lisp)/emacs-lisp/checkdoc.elc \
-	$(lisp)/emacs-lisp/cl-compat.elc \
-	$(lisp)/emacs-lisp/cl-extra.elc \
-	$(lisp)/emacs-lisp/cl-indent.elc \
-	$(lisp)/emacs-lisp/cl-macs.elc \
-	$(lisp)/emacs-lisp/cl-seq.elc \
-	$(lisp)/emacs-lisp/cl.elc \
-	$(lisp)/emacs-lisp/copyright.elc \
-	$(lisp)/emacs-lisp/crm.elc \
-	$(lisp)/emacs-lisp/cust-print.elc \
-	$(lisp)/emacs-lisp/debug.elc \
-	$(lisp)/emacs-lisp/derived.elc \
-	$(lisp)/emacs-lisp/disass.elc \
-	$(lisp)/emacs-lisp/easy-mmode.elc \
-	$(lisp)/emacs-lisp/easymenu.elc \
-	$(lisp)/emacs-lisp/edebug.elc \
-	$(lisp)/emacs-lisp/eieio-base.elc \
-	$(lisp)/emacs-lisp/eieio-comp.elc \
-	$(lisp)/emacs-lisp/eieio-custom.elc \
-	$(lisp)/emacs-lisp/eieio-datadebug.elc \
-	$(lisp)/emacs-lisp/eieio-opt.elc \
-	$(lisp)/emacs-lisp/eieio-speedbar.elc \
-	$(lisp)/emacs-lisp/eieio.elc \
-	$(lisp)/emacs-lisp/eldoc.elc \
-	$(lisp)/emacs-lisp/elint.elc \
-	$(lisp)/emacs-lisp/elp.elc \
-	$(lisp)/emacs-lisp/ewoc.elc \
-	$(lisp)/emacs-lisp/find-func.elc \
-	$(lisp)/emacs-lisp/find-gc.elc \
-	$(lisp)/emacs-lisp/float-sup.elc \
-	$(lisp)/emacs-lisp/generic.elc \
-	$(lisp)/emacs-lisp/gulp.elc \
-	$(lisp)/emacs-lisp/helper.elc \
-	$(lisp)/emacs-lisp/lisp-mnt.elc \
-	$(lisp)/emacs-lisp/lisp-mode.elc \
-	$(lisp)/emacs-lisp/lisp.elc \
-	$(lisp)/emacs-lisp/lmenu.elc \
-	$(lisp)/emacs-lisp/macroexp.elc \
-	$(lisp)/emacs-lisp/map-ynp.elc \
-	$(lisp)/emacs-lisp/pp.elc \
-	$(lisp)/emacs-lisp/re-builder.elc \
-	$(lisp)/emacs-lisp/regexp-opt.elc \
-	$(lisp)/emacs-lisp/regi.elc \
-	$(lisp)/emacs-lisp/ring.elc \
-	$(lisp)/emacs-lisp/rx.elc \
-	$(lisp)/emacs-lisp/shadow.elc \
-	$(lisp)/emacs-lisp/sregex.elc \
-	$(lisp)/emacs-lisp/syntax.elc \
-	$(lisp)/emacs-lisp/tcover-ses.elc \
-	$(lisp)/emacs-lisp/tcover-unsafep.elc \
-	$(lisp)/emacs-lisp/testcover.elc \
-	$(lisp)/emacs-lisp/timer.elc \
-	$(lisp)/emacs-lisp/tq.elc \
-	$(lisp)/emacs-lisp/trace.elc \
-	$(lisp)/emacs-lisp/unsafep.elc \
-	$(lisp)/emacs-lisp/warnings.elc \
-	$(lisp)/emacs-lock.elc \
-	$(lisp)/emerge.elc \
-	$(lisp)/emulation/crisp.elc \
-	$(lisp)/emulation/cua-base.elc \
-	$(lisp)/emulation/cua-gmrk.elc \
-	$(lisp)/emulation/cua-rect.elc \
-	$(lisp)/emulation/edt-lk201.elc \
-	$(lisp)/emulation/edt-mapper.elc \
-	$(lisp)/emulation/edt-pc.elc \
-	$(lisp)/emulation/edt-vt100.elc \
-	$(lisp)/emulation/edt.elc \
-	$(lisp)/emulation/keypad.elc \
-	$(lisp)/emulation/pc-mode.elc \
-	$(lisp)/emulation/pc-select.elc \
-	$(lisp)/emulation/tpu-edt.elc \
-	$(lisp)/emulation/tpu-extras.elc \
-	$(lisp)/emulation/tpu-mapper.elc \
-	$(lisp)/emulation/vi.elc \
-	$(lisp)/emulation/vip.elc \
-	$(lisp)/emulation/viper-cmd.elc \
-	$(lisp)/emulation/viper-ex.elc \
-	$(lisp)/emulation/viper-init.elc \
-	$(lisp)/emulation/viper-keym.elc \
-	$(lisp)/emulation/viper-macs.elc \
-	$(lisp)/emulation/viper-mous.elc \
-	$(lisp)/emulation/viper-util.elc \
-	$(lisp)/emulation/viper.elc \
-	$(lisp)/emulation/ws-mode.elc \
-	$(lisp)/env.elc \
-	$(lisp)/epa-dired.elc \
-	$(lisp)/epa-file.elc \
-	$(lisp)/epa-hook.elc \
-	$(lisp)/epa-mail.elc \
-	$(lisp)/epa.elc \
-	$(lisp)/epg-config.elc \
-	$(lisp)/epg.elc \
-	$(lisp)/erc/erc-autoaway.elc \
-	$(lisp)/erc/erc-backend.elc \
-	$(lisp)/erc/erc-button.elc \
-	$(lisp)/erc/erc-capab.elc \
-	$(lisp)/erc/erc-compat.elc \
-	$(lisp)/erc/erc-dcc.elc \
-	$(lisp)/erc/erc-ezbounce.elc \
-	$(lisp)/erc/erc-fill.elc \
-	$(lisp)/erc/erc-goodies.elc \
-	$(lisp)/erc/erc-hecomplete.elc \
-	$(lisp)/erc/erc-ibuffer.elc \
-	$(lisp)/erc/erc-identd.elc \
-	$(lisp)/erc/erc-imenu.elc \
-	$(lisp)/erc/erc-join.elc \
-	$(lisp)/erc/erc-lang.elc \
-	$(lisp)/erc/erc-list.elc \
-	$(lisp)/erc/erc-log.elc \
-	$(lisp)/erc/erc-match.elc \
-	$(lisp)/erc/erc-menu.elc \
-	$(lisp)/erc/erc-netsplit.elc \
-	$(lisp)/erc/erc-networks.elc \
-	$(lisp)/erc/erc-notify.elc \
-	$(lisp)/erc/erc-page.elc \
-	$(lisp)/erc/erc-pcomplete.elc \
-	$(lisp)/erc/erc-replace.elc \
-	$(lisp)/erc/erc-ring.elc \
-	$(lisp)/erc/erc-services.elc \
-	$(lisp)/erc/erc-sound.elc \
-	$(lisp)/erc/erc-speedbar.elc \
-	$(lisp)/erc/erc-spelling.elc \
-	$(lisp)/erc/erc-stamp.elc \
-	$(lisp)/erc/erc-track.elc \
-	$(lisp)/erc/erc-truncate.elc \
-	$(lisp)/erc/erc-xdcc.elc \
-	$(lisp)/erc/erc.elc \
-	$(lisp)/eshell/em-alias.elc \
-	$(lisp)/eshell/em-banner.elc \
-	$(lisp)/eshell/em-basic.elc \
-	$(lisp)/eshell/em-cmpl.elc \
-	$(lisp)/eshell/em-dirs.elc \
-	$(lisp)/eshell/em-glob.elc \
-	$(lisp)/eshell/em-hist.elc \
-	$(lisp)/eshell/em-ls.elc \
-	$(lisp)/eshell/em-pred.elc \
-	$(lisp)/eshell/em-prompt.elc \
-	$(lisp)/eshell/em-rebind.elc \
-	$(lisp)/eshell/em-script.elc \
-	$(lisp)/eshell/em-smart.elc \
-	$(lisp)/eshell/em-term.elc \
-	$(lisp)/eshell/em-unix.elc \
-	$(lisp)/eshell/em-xtra.elc \
-	$(lisp)/eshell/esh-arg.elc \
-	$(lisp)/eshell/esh-cmd.elc \
-	$(lisp)/eshell/esh-ext.elc \
-	$(lisp)/eshell/esh-io.elc \
-	$(lisp)/eshell/esh-mode.elc \
-	$(lisp)/eshell/esh-module.elc \
-	$(lisp)/eshell/esh-opt.elc \
-	$(lisp)/eshell/esh-proc.elc \
-	$(lisp)/eshell/esh-test.elc \
-	$(lisp)/eshell/esh-util.elc \
-	$(lisp)/eshell/esh-var.elc \
-	$(lisp)/eshell/eshell.elc \
-	$(lisp)/expand.elc \
-	$(lisp)/ezimage.elc \
-	$(lisp)/face-remap.elc \
-	$(lisp)/facemenu.elc \
-	$(lisp)/faces.elc \
-	$(lisp)/ffap.elc \
-	$(lisp)/filecache.elc \
-	$(lisp)/files-x.elc \
-	$(lisp)/files.elc \
-	$(lisp)/filesets.elc \
-	$(lisp)/find-cmd.elc \
-	$(lisp)/find-dired.elc \
-	$(lisp)/find-file.elc \
-	$(lisp)/find-lisp.elc \
-	$(lisp)/finder.elc \
-	$(lisp)/flow-ctrl.elc \
-	$(lisp)/foldout.elc \
-	$(lisp)/follow.elc \
-	$(lisp)/font-core.elc \
-	$(lisp)/font-lock.elc \
-	$(lisp)/font-setting.elc \
-	$(lisp)/format-spec.elc \
-	$(lisp)/format.elc \
-	$(lisp)/forms.elc \
-	$(lisp)/frame.elc \
-	$(lisp)/fringe.elc \
-	$(lisp)/generic-x.elc \
-	$(lisp)/gnus/auth-source.elc \
-	$(lisp)/gnus/canlock.elc \
-	$(lisp)/gnus/compface.elc \
-	$(lisp)/gnus/deuglify.elc \
-	$(lisp)/gnus/earcon.elc \
-	$(lisp)/gnus/ecomplete.elc \
-	$(lisp)/gnus/flow-fill.elc \
-	$(lisp)/gnus/gmm-utils.elc \
-	$(lisp)/gnus/gnus-agent.elc \
-	$(lisp)/gnus/gnus-art.elc \
-	$(lisp)/gnus/gnus-async.elc \
-	$(lisp)/gnus/gnus-audio.elc \
-	$(lisp)/gnus/gnus-bcklg.elc \
-	$(lisp)/gnus/gnus-bookmark.elc \
-	$(lisp)/gnus/gnus-cache.elc \
-	$(lisp)/gnus/gnus-cite.elc \
-	$(lisp)/gnus/gnus-cus.elc \
-	$(lisp)/gnus/gnus-delay.elc \
-	$(lisp)/gnus/gnus-demon.elc \
-	$(lisp)/gnus/gnus-diary.elc \
-	$(lisp)/gnus/gnus-dired.elc \
-	$(lisp)/gnus/gnus-draft.elc \
-	$(lisp)/gnus/gnus-dup.elc \
-	$(lisp)/gnus/gnus-eform.elc \
-	$(lisp)/gnus/gnus-ems.elc \
-	$(lisp)/gnus/gnus-fun.elc \
-	$(lisp)/gnus/gnus-group.elc \
-	$(lisp)/gnus/gnus-int.elc \
-	$(lisp)/gnus/gnus-kill.elc \
-	$(lisp)/gnus/gnus-logic.elc \
-	$(lisp)/gnus/gnus-mh.elc \
-	$(lisp)/gnus/gnus-ml.elc \
-	$(lisp)/gnus/gnus-mlspl.elc \
-	$(lisp)/gnus/gnus-move.elc \
-	$(lisp)/gnus/gnus-msg.elc \
-	$(lisp)/gnus/gnus-nocem.elc \
-	$(lisp)/gnus/gnus-picon.elc \
-	$(lisp)/gnus/gnus-range.elc \
-	$(lisp)/gnus/gnus-registry.elc \
-	$(lisp)/gnus/gnus-salt.elc \
-	$(lisp)/gnus/gnus-score.elc \
-	$(lisp)/gnus/gnus-setup.elc \
-	$(lisp)/gnus/gnus-sieve.elc \
-	$(lisp)/gnus/gnus-soup.elc \
-	$(lisp)/gnus/gnus-spec.elc \
-	$(lisp)/gnus/gnus-srvr.elc \
-	$(lisp)/gnus/gnus-start.elc \
-	$(lisp)/gnus/gnus-sum.elc \
-	$(lisp)/gnus/gnus-topic.elc \
-	$(lisp)/gnus/gnus-undo.elc \
-	$(lisp)/gnus/gnus-util.elc \
-	$(lisp)/gnus/gnus-uu.elc \
-	$(lisp)/gnus/gnus-vm.elc \
-	$(lisp)/gnus/gnus-win.elc \
-	$(lisp)/gnus/gnus.elc \
-	$(lisp)/gnus/html2text.elc \
-	$(lisp)/gnus/ietf-drums.elc \
-	$(lisp)/gnus/legacy-gnus-agent.elc \
-	$(lisp)/gnus/mail-parse.elc \
-	$(lisp)/gnus/mail-prsvr.elc \
-	$(lisp)/gnus/mail-source.elc \
-	$(lisp)/gnus/mailcap.elc \
-	$(lisp)/gnus/message.elc \
-	$(lisp)/gnus/messcompat.elc \
-	$(lisp)/gnus/mm-bodies.elc \
-	$(lisp)/gnus/mm-decode.elc \
-	$(lisp)/gnus/mm-encode.elc \
-	$(lisp)/gnus/mm-extern.elc \
-	$(lisp)/gnus/mm-partial.elc \
-	$(lisp)/gnus/mm-url.elc \
-	$(lisp)/gnus/mm-util.elc \
-	$(lisp)/gnus/mm-uu.elc \
-	$(lisp)/gnus/mm-view.elc \
-	$(lisp)/gnus/mml-sec.elc \
-	$(lisp)/gnus/mml-smime.elc \
-	$(lisp)/gnus/mml.elc \
-	$(lisp)/gnus/mml1991.elc \
-	$(lisp)/gnus/mml2015.elc \
-	$(lisp)/gnus/nnagent.elc \
-	$(lisp)/gnus/nnbabyl.elc \
-	$(lisp)/gnus/nndb.elc \
-	$(lisp)/gnus/nndiary.elc \
-	$(lisp)/gnus/nndir.elc \
-	$(lisp)/gnus/nndoc.elc \
-	$(lisp)/gnus/nndraft.elc \
-	$(lisp)/gnus/nneething.elc \
-	$(lisp)/gnus/nnfolder.elc \
-	$(lisp)/gnus/nngateway.elc \
-	$(lisp)/gnus/nnheader.elc \
-	$(lisp)/gnus/nnimap.elc \
-	$(lisp)/gnus/nnir.elc \
-	$(lisp)/gnus/nnkiboze.elc \
-	$(lisp)/gnus/nnlistserv.elc \
-	$(lisp)/gnus/nnmail.elc \
-	$(lisp)/gnus/nnmaildir.elc \
-	$(lisp)/gnus/nnmairix.elc \
-	$(lisp)/gnus/nnmbox.elc \
-	$(lisp)/gnus/nnmh.elc \
-	$(lisp)/gnus/nnml.elc \
-	$(lisp)/gnus/nnnil.elc \
-	$(lisp)/gnus/nnoo.elc \
-	$(lisp)/gnus/nnrss.elc \
-	$(lisp)/gnus/nnslashdot.elc \
-	$(lisp)/gnus/nnsoup.elc \
-	$(lisp)/gnus/nnspool.elc \
-	$(lisp)/gnus/nntp.elc \
-	$(lisp)/gnus/nnultimate.elc \
-	$(lisp)/gnus/nnvirtual.elc \
-	$(lisp)/gnus/nnwarchive.elc \
-	$(lisp)/gnus/nnweb.elc \
-	$(lisp)/gnus/nnwfm.elc \
-	$(lisp)/gnus/pop3.elc \
-	$(lisp)/gnus/qp.elc \
-	$(lisp)/gnus/rfc1843.elc \
-	$(lisp)/gnus/rfc2045.elc \
-	$(lisp)/gnus/rfc2047.elc \
-	$(lisp)/gnus/rfc2104.elc \
-	$(lisp)/gnus/rfc2231.elc \
-	$(lisp)/gnus/score-mode.elc \
-	$(lisp)/gnus/sieve-manage.elc \
-	$(lisp)/gnus/sieve-mode.elc \
-	$(lisp)/gnus/sieve.elc \
-	$(lisp)/gnus/smiley.elc \
-	$(lisp)/gnus/smime.elc \
-	$(lisp)/gnus/spam-report.elc \
-	$(lisp)/gnus/spam-stat.elc \
-	$(lisp)/gnus/spam-wash.elc \
-	$(lisp)/gnus/spam.elc \
-	$(lisp)/gnus/starttls.elc \
-	$(lisp)/gnus/utf7.elc \
-	$(lisp)/gnus/webmail.elc \
-	$(lisp)/gnus/yenc.elc \
-	$(lisp)/gs.elc \
-	$(lisp)/help-at-pt.elc \
-	$(lisp)/help-fns.elc \
-	$(lisp)/help-macro.elc \
-	$(lisp)/help-mode.elc \
-	$(lisp)/help.elc \
-	$(lisp)/hex-util.elc \
-	$(lisp)/hexl.elc \
-	$(lisp)/hfy-cmap.elc \
-	$(lisp)/hi-lock.elc \
-	$(lisp)/hilit-chg.elc \
-	$(lisp)/hippie-exp.elc \
-	$(lisp)/hl-line.elc \
-	$(lisp)/htmlfontify.elc \
-	$(lisp)/ibuf-ext.elc \
-	$(lisp)/ibuf-macs.elc \
-	$(lisp)/ibuffer.elc \
-	$(lisp)/icomplete.elc \
-	$(lisp)/ido.elc \
-	$(lisp)/ielm.elc \
-	$(lisp)/iimage.elc \
-	$(lisp)/image-dired.elc \
-	$(lisp)/image-file.elc \
-	$(lisp)/image-mode.elc \
-	$(lisp)/image.elc \
-	$(lisp)/imenu.elc \
-	$(lisp)/indent.elc \
-	$(lisp)/info-look.elc \
-	$(lisp)/info-xref.elc \
-	$(lisp)/info.elc \
-	$(lisp)/informat.elc \
-	$(lisp)/international/ccl.elc \
-	$(lisp)/international/characters.elc \
-	$(lisp)/international/fontset.elc \
-	$(lisp)/international/isearch-x.elc \
-	$(lisp)/international/iso-ascii.elc \
-	$(lisp)/international/iso-cvt.elc \
-	$(lisp)/international/iso-transl.elc \
-	$(lisp)/international/ja-dic-cnv.elc \
-	$(lisp)/international/ja-dic-utl.elc \
-	$(lisp)/international/kinsoku.elc \
-	$(lisp)/international/kkc.elc \
-	$(lisp)/international/latexenc.elc \
-	$(lisp)/international/latin1-disp.elc \
-	$(lisp)/international/mule-cmds.elc \
-	$(lisp)/international/mule-conf.elc \
-	$(lisp)/international/mule-diag.elc \
-	$(lisp)/international/mule-util.elc \
-	$(lisp)/international/mule.elc \
-	$(lisp)/international/ogonek.elc \
-	$(lisp)/international/quail.elc \
-	$(lisp)/international/robin.elc \
-	$(lisp)/international/titdic-cnv.elc \
-	$(lisp)/international/ucs-normalize.elc \
-	$(lisp)/international/utf-7.elc \
-	$(lisp)/isearch.elc \
-	$(lisp)/isearchb.elc \
-	$(lisp)/iswitchb.elc \
-	$(lisp)/jit-lock.elc \
-	$(lisp)/jka-cmpr-hook.elc \
-	$(lisp)/jka-compr.elc \
-	$(lisp)/json.elc \
-	$(lisp)/kermit.elc \
-	$(lisp)/kmacro.elc \
-	$(lisp)/language/china-util.elc \
-	$(lisp)/language/chinese.elc \
-	$(lisp)/language/cyril-util.elc \
-	$(lisp)/language/cyrillic.elc \
-	$(lisp)/language/ethio-util.elc \
-	$(lisp)/language/ethiopic.elc \
-	$(lisp)/language/european.elc \
-	$(lisp)/language/hanja-util.elc \
-	$(lisp)/language/ind-util.elc \
-	$(lisp)/language/indian.elc \
-	$(lisp)/language/japan-util.elc \
-	$(lisp)/language/korea-util.elc \
-	$(lisp)/language/lao-util.elc \
-	$(lisp)/language/thai-util.elc \
-	$(lisp)/language/thai-word.elc \
-	$(lisp)/language/tibet-util.elc \
-	$(lisp)/language/tibetan.elc \
-	$(lisp)/language/tv-util.elc \
-	$(lisp)/language/viet-util.elc \
-	$(lisp)/language/vietnamese.elc \
-	$(lisp)/ledit.elc \
-	$(lisp)/linum.elc \
-	$(lisp)/loadhist.elc \
-	$(lisp)/locate.elc \
-	$(lisp)/log-edit.elc \
-	$(lisp)/log-view.elc \
-	$(lisp)/longlines.elc \
-	$(lisp)/lpr.elc \
-	$(lisp)/ls-lisp.elc \
-	$(lisp)/macros.elc \
-	$(lisp)/mail/binhex.elc \
-	$(lisp)/mail/emacsbug.elc \
-	$(lisp)/mail/feedmail.elc \
-	$(lisp)/mail/footnote.elc \
-	$(lisp)/mail/hashcash.elc \
-	$(lisp)/mail/mail-extr.elc \
-	$(lisp)/mail/mail-hist.elc \
-	$(lisp)/mail/mail-utils.elc \
-	$(lisp)/mail/mailabbrev.elc \
-	$(lisp)/mail/mailalias.elc \
-	$(lisp)/mail/mailclient.elc \
-	$(lisp)/mail/mailheader.elc \
-	$(lisp)/mail/mailpost.elc \
-	$(lisp)/mail/metamail.elc \
-	$(lisp)/mail/mspools.elc \
-	$(lisp)/mail/reporter.elc \
-	$(lisp)/mail/rfc2368.elc \
-	$(lisp)/mail/rfc822.elc \
-	$(lisp)/mail/rmail-spam-filter.elc \
-	$(lisp)/mail/rmail.elc \
-	$(lisp)/mail/rmailedit.elc \
-	$(lisp)/mail/rmailkwd.elc \
-	$(lisp)/mail/rmailmm.elc \
-	$(lisp)/mail/rmailmsc.elc \
-	$(lisp)/mail/rmailout.elc \
-	$(lisp)/mail/rmailsort.elc \
-	$(lisp)/mail/rmailsum.elc \
-	$(lisp)/mail/sendmail.elc \
-	$(lisp)/mail/smtpmail.elc \
-	$(lisp)/mail/supercite.elc \
-	$(lisp)/mail/uce.elc \
-	$(lisp)/mail/undigest.elc \
-	$(lisp)/mail/unrmail.elc \
-	$(lisp)/mail/uudecode.elc \
-	$(lisp)/makesum.elc \
-	$(lisp)/man.elc \
-	$(lisp)/master.elc \
-	$(lisp)/mb-depth.elc \
-	$(lisp)/md4.elc \
-	$(lisp)/menu-bar.elc \
-	$(lisp)/mh-e/mh-alias.elc \
-	$(lisp)/mh-e/mh-buffers.elc \
-	$(lisp)/mh-e/mh-comp.elc \
-	$(lisp)/mh-e/mh-e.elc \
-	$(lisp)/mh-e/mh-folder.elc \
-	$(lisp)/mh-e/mh-funcs.elc \
-	$(lisp)/mh-e/mh-identity.elc \
-	$(lisp)/mh-e/mh-inc.elc \
-	$(lisp)/mh-e/mh-junk.elc \
-	$(lisp)/mh-e/mh-letter.elc \
-	$(lisp)/mh-e/mh-limit.elc \
-	$(lisp)/mh-e/mh-mime.elc \
-	$(lisp)/mh-e/mh-print.elc \
-	$(lisp)/mh-e/mh-scan.elc \
-	$(lisp)/mh-e/mh-search.elc \
-	$(lisp)/mh-e/mh-seq.elc \
-	$(lisp)/mh-e/mh-show.elc \
-	$(lisp)/mh-e/mh-speed.elc \
-	$(lisp)/mh-e/mh-thread.elc \
-	$(lisp)/mh-e/mh-tool-bar.elc \
-	$(lisp)/mh-e/mh-utils.elc \
-	$(lisp)/mh-e/mh-xface.elc \
-	$(lisp)/midnight.elc \
-	$(lisp)/minibuf-eldef.elc \
-	$(lisp)/minibuffer.elc \
-	$(lisp)/misc.elc \
-	$(lisp)/misearch.elc \
-	$(lisp)/mouse-copy.elc \
-	$(lisp)/mouse-drag.elc \
-	$(lisp)/mouse-sel.elc \
-	$(lisp)/mouse.elc \
-	$(lisp)/mpc.elc \
-	$(lisp)/msb.elc \
-	$(lisp)/mwheel.elc \
-	$(lisp)/net/ange-ftp.elc \
-	$(lisp)/net/browse-url.elc \
-	$(lisp)/net/dbus.elc \
-	$(lisp)/net/dig.elc \
-	$(lisp)/net/dns.elc \
-	$(lisp)/net/eudc-bob.elc \
-	$(lisp)/net/eudc-export.elc \
-	$(lisp)/net/eudc-hotlist.elc \
-	$(lisp)/net/eudc-vars.elc \
-	$(lisp)/net/eudc.elc \
-	$(lisp)/net/eudcb-bbdb.elc \
-	$(lisp)/net/eudcb-ldap.elc \
-	$(lisp)/net/eudcb-mab.elc \
-	$(lisp)/net/eudcb-ph.elc \
-	$(lisp)/net/goto-addr.elc \
-	$(lisp)/net/hmac-def.elc \
-	$(lisp)/net/hmac-md5.elc \
-	$(lisp)/net/imap-hash.elc \
-	$(lisp)/net/imap.elc \
-	$(lisp)/net/ldap.elc \
-	$(lisp)/net/mairix.elc \
-	$(lisp)/net/net-utils.elc \
-	$(lisp)/net/netrc.elc \
-	$(lisp)/net/newst-backend.elc \
-	$(lisp)/net/newst-plainview.elc \
-	$(lisp)/net/newst-reader.elc \
-	$(lisp)/net/newst-ticker.elc \
-	$(lisp)/net/newst-treeview.elc \
-	$(lisp)/net/newsticker.elc \
-	$(lisp)/net/ntlm.elc \
-	$(lisp)/net/quickurl.elc \
-	$(lisp)/net/rcirc.elc \
-	$(lisp)/net/rcompile.elc \
-	$(lisp)/net/rlogin.elc \
-	$(lisp)/net/sasl-cram.elc \
-	$(lisp)/net/sasl-digest.elc \
-	$(lisp)/net/sasl-ntlm.elc \
-	$(lisp)/net/sasl.elc \
-	$(lisp)/net/secrets.elc \
-	$(lisp)/net/snmp-mode.elc \
-	$(lisp)/net/socks.elc \
-	$(lisp)/net/telnet.elc \
-	$(lisp)/net/tls.elc \
-	$(lisp)/net/tramp-cache.elc \
-	$(lisp)/net/tramp-cmds.elc \
-	$(lisp)/net/tramp-compat.elc \
-	$(lisp)/net/tramp-fish.elc \
-	$(lisp)/net/tramp-ftp.elc \
-	$(lisp)/net/tramp-gvfs.elc \
-	$(lisp)/net/tramp-gw.elc \
-	$(lisp)/net/tramp-imap.elc \
-	$(lisp)/net/tramp-smb.elc \
-	$(lisp)/net/tramp-uu.elc \
-	$(lisp)/net/tramp.elc \
-	$(lisp)/net/trampver.elc \
-	$(lisp)/net/webjump.elc \
-	$(lisp)/net/xesam.elc \
-	$(lisp)/net/zeroconf.elc \
-	$(lisp)/newcomment.elc \
-	$(lisp)/novice.elc \
-	$(lisp)/nxml/nxml-enc.elc \
-	$(lisp)/nxml/nxml-glyph.elc \
-	$(lisp)/nxml/nxml-maint.elc \
-	$(lisp)/nxml/nxml-mode.elc \
-	$(lisp)/nxml/nxml-ns.elc \
-	$(lisp)/nxml/nxml-outln.elc \
-	$(lisp)/nxml/nxml-parse.elc \
-	$(lisp)/nxml/nxml-rap.elc \
-	$(lisp)/nxml/nxml-uchnm.elc \
-	$(lisp)/nxml/nxml-util.elc \
-	$(lisp)/nxml/rng-cmpct.elc \
-	$(lisp)/nxml/rng-dt.elc \
-	$(lisp)/nxml/rng-loc.elc \
-	$(lisp)/nxml/rng-maint.elc \
-	$(lisp)/nxml/rng-match.elc \
-	$(lisp)/nxml/rng-nxml.elc \
-	$(lisp)/nxml/rng-parse.elc \
-	$(lisp)/nxml/rng-pttrn.elc \
-	$(lisp)/nxml/rng-uri.elc \
-	$(lisp)/nxml/rng-util.elc \
-	$(lisp)/nxml/rng-valid.elc \
-	$(lisp)/nxml/rng-xsd.elc \
-	$(lisp)/nxml/xmltok.elc \
-	$(lisp)/nxml/xsd-regexp.elc \
-	$(lisp)/obsolete/awk-mode.elc \
-	$(lisp)/obsolete/fast-lock.elc \
-	$(lisp)/obsolete/iso-acc.elc \
-	$(lisp)/obsolete/iso-insert.elc \
-	$(lisp)/obsolete/iso-swed.elc \
-	$(lisp)/obsolete/lazy-lock.elc \
-	$(lisp)/obsolete/levents.elc \
-	$(lisp)/obsolete/lucid.elc \
-	$(lisp)/obsolete/old-whitespace.elc \
-	$(lisp)/obsolete/options.elc \
-	$(lisp)/obsolete/resume.elc \
-	$(lisp)/obsolete/rnews.elc \
-	$(lisp)/obsolete/rnewspost.elc \
-	$(lisp)/obsolete/sc.elc \
-	$(lisp)/obsolete/scribe.elc \
-	$(lisp)/obsolete/swedish.elc \
-	$(lisp)/obsolete/sym-comp.elc \
-	$(lisp)/obsolete/vc-mcvs.elc \
-	$(lisp)/obsolete/x-menu.elc \
-	$(lisp)/org/org-agenda.elc \
-	$(lisp)/org/org-archive.elc \
-	$(lisp)/org/org-ascii.elc \
-	$(lisp)/org/org-attach.elc \
-	$(lisp)/org/org-bbdb.elc \
-	$(lisp)/org/org-bibtex.elc \
-	$(lisp)/org/org-clock.elc \
-	$(lisp)/org/org-colview.elc \
-	$(lisp)/org/org-compat.elc \
-	$(lisp)/org/org-crypt.elc \
-	$(lisp)/org/org-datetree.elc \
-	$(lisp)/org/org-docbook.elc \
-	$(lisp)/org/org-exp-blocks.elc \
-	$(lisp)/org/org-exp.elc \
-	$(lisp)/org/org-faces.elc \
-	$(lisp)/org/org-feed.elc \
-	$(lisp)/org/org-footnote.elc \
-	$(lisp)/org/org-freemind.elc \
-	$(lisp)/org/org-gnus.elc \
-	$(lisp)/org/org-habit.elc \
-	$(lisp)/org/org-html.elc \
-	$(lisp)/org/org-icalendar.elc \
-	$(lisp)/org/org-id.elc \
-	$(lisp)/org/org-indent.elc \
-	$(lisp)/org/org-info.elc \
-	$(lisp)/org/org-inlinetask.elc \
-	$(lisp)/org/org-install.elc \
-	$(lisp)/org/org-irc.elc \
-	$(lisp)/org/org-jsinfo.elc \
-	$(lisp)/org/org-latex.elc \
-	$(lisp)/org/org-list.elc \
-	$(lisp)/org/org-mac-message.elc \
-	$(lisp)/org/org-macs.elc \
-	$(lisp)/org/org-mew.elc \
-	$(lisp)/org/org-mhe.elc \
-	$(lisp)/org/org-mobile.elc \
-	$(lisp)/org/org-mouse.elc \
-	$(lisp)/org/org-plot.elc \
-	$(lisp)/org/org-protocol.elc \
-	$(lisp)/org/org-publish.elc \
-	$(lisp)/org/org-remember.elc \
-	$(lisp)/org/org-rmail.elc \
-	$(lisp)/org/org-src.elc \
-	$(lisp)/org/org-table.elc \
-	$(lisp)/org/org-timer.elc \
-	$(lisp)/org/org-vm.elc \
-	$(lisp)/org/org-w3m.elc \
-	$(lisp)/org/org-wl.elc \
-	$(lisp)/org/org-xoxo.elc \
-	$(lisp)/org/org.elc \
-	$(lisp)/outline.elc \
-	$(lisp)/paren.elc \
-	$(lisp)/password-cache.elc \
-	$(lisp)/pcmpl-cvs.elc \
-	$(lisp)/pcmpl-gnu.elc \
-	$(lisp)/pcmpl-linux.elc \
-	$(lisp)/pcmpl-rpm.elc \
-	$(lisp)/pcmpl-unix.elc \
-	$(lisp)/pcomplete.elc \
-	$(lisp)/pcvs-defs.elc \
-	$(lisp)/pcvs-info.elc \
-	$(lisp)/pcvs-parse.elc \
-	$(lisp)/pcvs-util.elc \
-	$(lisp)/pcvs.elc \
-	$(lisp)/pgg-def.elc \
-	$(lisp)/pgg-gpg.elc \
-	$(lisp)/pgg-parse.elc \
-	$(lisp)/pgg-pgp.elc \
-	$(lisp)/pgg-pgp5.elc \
-	$(lisp)/pgg.elc \
-	$(lisp)/play/5x5.elc \
-	$(lisp)/play/animate.elc \
-	$(lisp)/play/blackbox.elc \
-	$(lisp)/play/bubbles.elc \
-	$(lisp)/play/cookie1.elc \
-	$(lisp)/play/decipher.elc \
-	$(lisp)/play/dissociate.elc \
-	$(lisp)/play/doctor.elc \
-	$(lisp)/play/dunnet.elc \
-	$(lisp)/play/fortune.elc \
-	$(lisp)/play/gamegrid.elc \
-	$(lisp)/play/gametree.elc \
-	$(lisp)/play/gomoku.elc \
-	$(lisp)/play/handwrite.elc \
-	$(lisp)/play/hanoi.elc \
-	$(lisp)/play/landmark.elc \
-	$(lisp)/play/life.elc \
-	$(lisp)/play/meese.elc \
-	$(lisp)/play/morse.elc \
-	$(lisp)/play/mpuz.elc \
-	$(lisp)/play/pong.elc \
-	$(lisp)/play/snake.elc \
-	$(lisp)/play/solitaire.elc \
-	$(lisp)/play/spook.elc \
-	$(lisp)/play/studly.elc \
-	$(lisp)/play/tetris.elc \
-	$(lisp)/play/yow.elc \
-	$(lisp)/play/zone.elc \
-	$(lisp)/printing.elc \
-	$(lisp)/proced.elc \
-	$(lisp)/progmodes/ada-mode.elc \
-	$(lisp)/progmodes/ada-prj.elc \
-	$(lisp)/progmodes/ada-stmt.elc \
-	$(lisp)/progmodes/ada-xref.elc \
-	$(lisp)/progmodes/antlr-mode.elc \
-	$(lisp)/progmodes/asm-mode.elc \
-	$(lisp)/progmodes/autoconf.elc \
-	$(lisp)/progmodes/bug-reference.elc \
-	$(lisp)/progmodes/cap-words.elc \
-	$(lisp)/progmodes/cc-align.elc \
-	$(lisp)/progmodes/cc-awk.elc \
-	$(lisp)/progmodes/cc-bytecomp.elc \
-	$(lisp)/progmodes/cc-cmds.elc \
-	$(lisp)/progmodes/cc-compat.elc \
-	$(lisp)/progmodes/cc-defs.elc \
-	$(lisp)/progmodes/cc-engine.elc \
-	$(lisp)/progmodes/cc-fonts.elc \
-	$(lisp)/progmodes/cc-langs.elc \
-	$(lisp)/progmodes/cc-menus.elc \
-	$(lisp)/progmodes/cc-mode.elc \
-	$(lisp)/progmodes/cc-styles.elc \
-	$(lisp)/progmodes/cc-vars.elc \
-	$(lisp)/progmodes/cfengine.elc \
-	$(lisp)/progmodes/cmacexp.elc \
-	$(lisp)/progmodes/compile.elc \
-	$(lisp)/progmodes/cperl-mode.elc \
-	$(lisp)/progmodes/cpp.elc \
-	$(lisp)/progmodes/cwarn.elc \
-	$(lisp)/progmodes/dcl-mode.elc \
-	$(lisp)/progmodes/delphi.elc \
-	$(lisp)/progmodes/ebnf-abn.elc \
-	$(lisp)/progmodes/ebnf-bnf.elc \
-	$(lisp)/progmodes/ebnf-dtd.elc \
-	$(lisp)/progmodes/ebnf-ebx.elc \
-	$(lisp)/progmodes/ebnf-iso.elc \
-	$(lisp)/progmodes/ebnf-otz.elc \
-	$(lisp)/progmodes/ebnf-yac.elc \
-	$(lisp)/progmodes/ebnf2ps.elc \
-	$(lisp)/progmodes/ebrowse.elc \
-	$(lisp)/progmodes/etags.elc \
-	$(lisp)/progmodes/executable.elc \
-	$(lisp)/progmodes/f90.elc \
-	$(lisp)/progmodes/flymake.elc \
-	$(lisp)/progmodes/fortran.elc \
-	$(lisp)/progmodes/gdb-ui.elc \
-	$(lisp)/progmodes/glasses.elc \
-	$(lisp)/progmodes/grep.elc \
-	$(lisp)/progmodes/gud.elc \
-	$(lisp)/progmodes/hideif.elc \
-	$(lisp)/progmodes/hideshow.elc \
-	$(lisp)/progmodes/icon.elc \
-	$(lisp)/progmodes/idlw-complete-structtag.elc \
-	$(lisp)/progmodes/idlw-help.elc \
-	$(lisp)/progmodes/idlw-shell.elc \
-	$(lisp)/progmodes/idlw-toolbar.elc \
-	$(lisp)/progmodes/idlwave.elc \
-	$(lisp)/progmodes/inf-lisp.elc \
-	$(lisp)/progmodes/js.elc \
-	$(lisp)/progmodes/ld-script.elc \
-	$(lisp)/progmodes/m4-mode.elc \
-	$(lisp)/progmodes/make-mode.elc \
-	$(lisp)/progmodes/mantemp.elc \
-	$(lisp)/progmodes/meta-mode.elc \
-	$(lisp)/progmodes/mixal-mode.elc \
-	$(lisp)/progmodes/modula2.elc \
-	$(lisp)/progmodes/octave-inf.elc \
-	$(lisp)/progmodes/octave-mod.elc \
-	$(lisp)/progmodes/pascal.elc \
-	$(lisp)/progmodes/perl-mode.elc \
-	$(lisp)/progmodes/prolog.elc \
-	$(lisp)/progmodes/ps-mode.elc \
-	$(lisp)/progmodes/python.elc \
-	$(lisp)/progmodes/ruby-mode.elc \
-	$(lisp)/progmodes/scheme.elc \
-	$(lisp)/progmodes/sh-script.elc \
-	$(lisp)/progmodes/simula.elc \
-	$(lisp)/progmodes/sql.elc \
-	$(lisp)/progmodes/subword.elc \
-	$(lisp)/progmodes/tcl.elc \
-	$(lisp)/progmodes/vera-mode.elc \
-	$(lisp)/progmodes/verilog-mode.elc \
-	$(lisp)/progmodes/vhdl-mode.elc \
-	$(lisp)/progmodes/which-func.elc \
-	$(lisp)/progmodes/xscheme.elc \
-	$(lisp)/ps-bdf.elc \
-	$(lisp)/ps-def.elc \
-	$(lisp)/ps-mule.elc \
-	$(lisp)/ps-print.elc \
-	$(lisp)/ps-samp.elc \
-	$(lisp)/recentf.elc \
-	$(lisp)/rect.elc \
-	$(lisp)/register.elc \
-	$(lisp)/repeat.elc \
-	$(lisp)/replace.elc \
-	$(lisp)/reposition.elc \
-	$(lisp)/reveal.elc \
-	$(lisp)/rfn-eshadow.elc \
-	$(lisp)/rot13.elc \
-	$(lisp)/ruler-mode.elc \
-	$(lisp)/s-region.elc \
-	$(lisp)/savehist.elc \
-	$(lisp)/saveplace.elc \
-	$(lisp)/sb-image.elc \
-	$(lisp)/scroll-all.elc \
-	$(lisp)/scroll-bar.elc \
-	$(lisp)/scroll-lock.elc \
-	$(lisp)/select.elc \
-	$(lisp)/server.elc \
-	$(lisp)/ses.elc \
-	$(lisp)/sha1.elc \
-	$(lisp)/shadowfile.elc \
-	$(lisp)/shell.elc \
-	$(lisp)/simple.elc \
-	$(lisp)/skeleton.elc \
-	$(lisp)/smerge-mode.elc \
-	$(lisp)/sort.elc \
-	$(lisp)/soundex.elc \
-	$(lisp)/speedbar.elc \
-	$(lisp)/startup.elc \
-	$(lisp)/strokes.elc \
-	$(lisp)/subr.elc \
-	$(lisp)/t-mouse.elc \
-	$(lisp)/tabify.elc \
-	$(lisp)/talk.elc \
-	$(lisp)/tar-mode.elc \
-	$(lisp)/tempo.elc \
-	$(lisp)/term.elc \
-	$(lisp)/term/common-win.elc \
-	$(lisp)/term/internal.elc \
-	$(lisp)/term/ns-win.elc \
-	$(lisp)/term/pc-win.elc \
-	$(lisp)/term/rxvt.elc \
-	$(lisp)/term/sun.elc \
-	$(lisp)/term/sup-mouse.elc \
-	$(lisp)/term/tty-colors.elc \
-	$(lisp)/term/tvi970.elc \
-	$(lisp)/term/vt100.elc \
-	$(lisp)/term/w32-win.elc \
-	$(lisp)/term/w32console.elc \
-	$(lisp)/term/x-win.elc \
-	$(lisp)/term/xterm.elc \
-	$(lisp)/terminal.elc \
-	$(lisp)/textmodes/artist.elc \
-	$(lisp)/textmodes/bib-mode.elc \
-	$(lisp)/textmodes/bibtex-style.elc \
-	$(lisp)/textmodes/bibtex.elc \
-	$(lisp)/textmodes/conf-mode.elc \
-	$(lisp)/textmodes/css-mode.elc \
-	$(lisp)/textmodes/dns-mode.elc \
-	$(lisp)/textmodes/enriched.elc \
-	$(lisp)/textmodes/fill.elc \
-	$(lisp)/textmodes/flyspell.elc \
-	$(lisp)/textmodes/ispell.elc \
-	$(lisp)/textmodes/makeinfo.elc \
-	$(lisp)/textmodes/nroff-mode.elc \
-	$(lisp)/textmodes/page-ext.elc \
-	$(lisp)/textmodes/page.elc \
-	$(lisp)/textmodes/paragraphs.elc \
-	$(lisp)/textmodes/picture.elc \
-	$(lisp)/textmodes/po.elc \
-	$(lisp)/textmodes/refbib.elc \
-	$(lisp)/textmodes/refer.elc \
-	$(lisp)/textmodes/refill.elc \
-	$(lisp)/textmodes/reftex-auc.elc \
-	$(lisp)/textmodes/reftex-cite.elc \
-	$(lisp)/textmodes/reftex-dcr.elc \
-	$(lisp)/textmodes/reftex-global.elc \
-	$(lisp)/textmodes/reftex-index.elc \
-	$(lisp)/textmodes/reftex-parse.elc \
-	$(lisp)/textmodes/reftex-ref.elc \
-	$(lisp)/textmodes/reftex-sel.elc \
-	$(lisp)/textmodes/reftex-toc.elc \
-	$(lisp)/textmodes/reftex-vars.elc \
-	$(lisp)/textmodes/reftex.elc \
-	$(lisp)/textmodes/remember.elc \
-	$(lisp)/textmodes/rst.elc \
-	$(lisp)/textmodes/sgml-mode.elc \
-	$(lisp)/textmodes/spell.elc \
-	$(lisp)/textmodes/table.elc \
-	$(lisp)/textmodes/tex-mode.elc \
-	$(lisp)/textmodes/texinfmt.elc \
-	$(lisp)/textmodes/texinfo.elc \
-	$(lisp)/textmodes/texnfo-upd.elc \
-	$(lisp)/textmodes/text-mode.elc \
-	$(lisp)/textmodes/tildify.elc \
-	$(lisp)/textmodes/two-column.elc \
-	$(lisp)/textmodes/underline.elc \
-	$(lisp)/thingatpt.elc \
-	$(lisp)/thumbs.elc \
-	$(lisp)/time-stamp.elc \
-	$(lisp)/time.elc \
-	$(lisp)/timezone.elc \
-	$(lisp)/tmm.elc \
-	$(lisp)/tool-bar.elc \
-	$(lisp)/tooltip.elc \
-	$(lisp)/tree-widget.elc \
-	$(lisp)/tutorial.elc \
-	$(lisp)/type-break.elc \
-	$(lisp)/uniquify.elc \
-	$(lisp)/url/url-about.elc \
-	$(lisp)/url/url-auth.elc \
-	$(lisp)/url/url-cache.elc \
-	$(lisp)/url/url-cid.elc \
-	$(lisp)/url/url-cookie.elc \
-	$(lisp)/url/url-dav.elc \
-	$(lisp)/url/url-dired.elc \
-	$(lisp)/url/url-expand.elc \
-	$(lisp)/url/url-file.elc \
-	$(lisp)/url/url-ftp.elc \
-	$(lisp)/url/url-gw.elc \
-	$(lisp)/url/url-handlers.elc \
-	$(lisp)/url/url-history.elc \
-	$(lisp)/url/url-http.elc \
-	$(lisp)/url/url-imap.elc \
-	$(lisp)/url/url-irc.elc \
-	$(lisp)/url/url-ldap.elc \
-	$(lisp)/url/url-mailto.elc \
-	$(lisp)/url/url-methods.elc \
-	$(lisp)/url/url-misc.elc \
-	$(lisp)/url/url-news.elc \
-	$(lisp)/url/url-nfs.elc \
-	$(lisp)/url/url-ns.elc \
-	$(lisp)/url/url-parse.elc \
-	$(lisp)/url/url-privacy.elc \
-	$(lisp)/url/url-proxy.elc \
-	$(lisp)/url/url-util.elc \
-	$(lisp)/url/url-vars.elc \
-	$(lisp)/url/url.elc \
-	$(lisp)/userlock.elc \
-	$(lisp)/vc-annotate.elc \
-	$(lisp)/vc-arch.elc \
-	$(lisp)/vc-bzr.elc \
-	$(lisp)/vc-cvs.elc \
-	$(lisp)/vc-dav.elc \
-	$(lisp)/vc-dir.elc \
-	$(lisp)/vc-dispatcher.elc \
-	$(lisp)/vc-git.elc \
-	$(lisp)/vc-hg.elc \
-	$(lisp)/vc-hooks.elc \
-	$(lisp)/vc-mtn.elc \
-	$(lisp)/vc-rcs.elc \
-	$(lisp)/vc-sccs.elc \
-	$(lisp)/vc-svn.elc \
-	$(lisp)/vc.elc \
-	$(lisp)/vcursor.elc \
-	$(lisp)/view.elc \
-	$(lisp)/vt-control.elc \
-	$(lisp)/vt100-led.elc \
-	$(lisp)/w32-fns.elc \
-	$(lisp)/w32-vars.elc \
-	$(lisp)/wdired.elc \
-	$(lisp)/whitespace.elc \
-	$(lisp)/wid-browse.elc \
-	$(lisp)/wid-edit.elc \
-	$(lisp)/widget.elc \
-	$(lisp)/windmove.elc \
-	$(lisp)/window.elc \
-	$(lisp)/winner.elc \
-	$(lisp)/woman.elc \
-	$(lisp)/x-dnd.elc \
-	$(lisp)/xml.elc \
-	$(lisp)/xt-mouse.elc
-
 # The src/Makefile.in has its own set of dependencies and when they decide
 # that one Lisp file needs to be re-compiled, we had better recompile it as
 # well, otherwise every subsequent make will again call us, until we finally
@@ -1486,17 +211,41 @@

 # An old-fashioned suffix rule, which, according to the GNU Make manual,
 # cannot have prerequisites.
-# Note that if a .el file is removed from the repository without
-# updating ELCFILES, make will abort.
 .el.elc:
 	@echo Compiling $<
 	@$(emacs) $(BYTE_COMPILE_EXTRA_FLAGS) -f batch-byte-compile $<

-.PHONY: compile-first compile-main compile-last compile compile-always
+.PHONY: compile-first compile-main compile compile-always

 compile-first: $(COMPILE_FIRST)

-compile-main: $(ELCFILES)
+# In `compile-main' we could directly do
+#    ... | xargs $(MAKE) $(MFLAGS) EMACS="$(EMACS)"
+# and it works, but it generates a lot of messages like
+#    make[2]: « gnus/gnus-mlspl.elc » is up to date.
+# so instead, we use "xargs echo" to split the list of file into manageable
+# chunks and then use an intermediate `compile-targets' target so the
+# actual targets (the .elc files) are not mentioned as targets on the
+# make command line.
+
+
+.PHONY: compile-targets
+# TARGETS is set dynamically in the recursive call from `compile-main'.
+compile-targets: $(TARGETS)
+
+# Compile all the Elisp files that need it.  Beware: it approximates
+# `no-byte-compile', so watch out for false-positives!
+compile-main:
+	@cd $(lisp); $(setwins); \
+	els=`echo "$$wins " | sed -e 's|/\./|/|g' -e 's|/\. | |g' -e 's| |/*.el |g'`; \
+	for el in $$els; do \
+	  test -f $$el || continue; \
+	  test ! -f $${el}c && GREP_OPTIONS= grep '^;.*no-byte-compile: t' $$el > /dev/null && continue; \
+	  echo "$${el}c"; \
+	done | xargs echo | \
+	while read chunk; do \
+	  $(MAKE) $(MFLAGS) compile-targets EMACS="$(EMACS)" TARGETS="$$chunk"; \
+	done

 # Compile all Lisp files, but don't recompile those that are up to
 # date.  Some .el files don't get compiled because they set the
@@ -1506,10 +255,6 @@
 # sub-makes that run rules that use it, for the sake of some non-GNU makes.
 compile: $(LOADDEFS) autoloads compile-first
 	$(MAKE) $(MFLAGS) compile-main EMACS=$(EMACS)
-	$(MAKE) $(MFLAGS) compile-last EMACS=$(EMACS)
-
-## Doing this causes make install to dump another emacs.
-#	$(MAKE) $(MFLAGS) update-elclist

 # Compile all Lisp files.  This is like `compile' but compiles files
 # unconditionally.  Some files don't actually get compiled because they
@@ -1518,20 +263,6 @@
 	cd $(lisp); rm -f *.elc */*.elc */*/*.elc */*/*/*.elc
 	$(MAKE) $(MFLAGS) compile EMACS=$(EMACS)

-## In case any files are missing from ELCFILES.
-compile-last:
-	@wd=$(lisp); $(setwins); \
-	els=`echo "$$wins " | sed -e 's|/\./|/|g' -e 's|/\. | |g' -e 's| |/*.el |g'`; \
-	for el in $$els; do \
-	  test -f $$el || continue; \
-	  test -f $${el}c && continue; \
-	  GREP_OPTIONS= grep 'no-byte-compile: t' $$el > /dev/null && continue; \
-	  sel=`echo $$el | sed "s|^$(lisp)|\\$$(lisp)|"`; \
-	  echo "Maintainer warning: $$sel missing from \$$ELCFILES?"; \
-	  echo "Compiling $$el"; \
-	  $(emacs) $(BYTE_COMPILE_EXTRA_FLAGS) -f batch-byte-compile $$el || exit 1; \
-	done
-
 compile-calc:
 	for el in $(lisp)/calc/*.el; do \
 	  echo Compiling $$el; \
@@ -1551,8 +282,7 @@

 # Recompile all Lisp files which are newer than their .elc files and compile
 # new ones.
-# This has the same effect as compile-main (followed up with compile-last,
-# if ELCFILES is out of date).  recompile has some advantages:
+# This has the same effect as compile-main.  recompile has some advantages:
 # i) It is faster (on a single processor), since it only has to start
 # Emacs once.  It was 33% faster on a test with a random 10% of the .el
 # files needing recompilation.
--- a/lisp/gnus/ChangeLog	Thu Mar 18 12:56:23 2010 +0100
+++ b/lisp/gnus/ChangeLog	Mon Mar 22 08:34:25 2010 +0100
@@ -1,3 +1,93 @@
+2010-03-19  Michael Albinus  <michael.albinus@gmx.de>
+
+	* auth-source.el (netrc-machine-user-or-password): Autoload.
+
+2010-03-19  Glenn Morris  <rgm@gnu.org>
+
+	Stop message.el from loading about 40 libraries it doesn't always need.
+	The general approach is to autoload rather than require, and to
+	require in the specific functions rather than the file.  (Bug#5642)
+
+	* gmm-utils.el: Don't require wid-edit.
+	(widget-create-child-value, widget-convert, widget-default-get):
+	Autoload.
+
+	* gnus-util.el: Don't require time-date, netrc.
+	(message-fetch-field, gnus-group-name-decode): Declare rather than
+	autoloading.
+	(gnus-fetch-field): Require message.
+	(gnus-decode-newsgroups): Require gnus-group.
+
+	* ietf-drums.el: Don't require time-date.
+
+	* message.el: Don't require hashcash, canlock, ecomplete.
+	Do require mail-utils.  Require nnheader only when compiling.
+	(smtpmail-default-smtp-server): Remove declaration.
+	(message-send-mail-function): Check smtpmail-default-smtp-server
+	is bound rather than requiring smtpmail.
+	(message-auto-save-directory, message-insert-signature): Use
+	expand-file-name rather than nnheader-concat.
+	(nnheader-insert-file-contents): Autoload.
+	(hashcash-wait-async): Declare.
+	(message-send-mail): Only call gnus-setup-posting-charset if
+	gnus-group-posting-charset-alist is bound.  Require hashcash if needed.
+	(message-send-mail-with-sendmail): Require sendmail.
+	(canlock-password, canlock-password-for-verify): Declare.
+	(message-canlock-password): Require canlock.
+	(nnheader-get-report): Autoload.
+	(gnus-setup-posting-charset): Declare.
+	(message-send-news): Require gnus-msg.
+	(message-make-references, message-make-in-reply-to): Use mail-header-id
+	rather than the alias mail-header-message-id.
+	(ecomplete-add-item, ecomplete-save): Declare.
+	(message-put-addresses-in-ecomplete): Require ecomplete.
+	(ecomplete-display-matches): Autoload.
+
+	* mm-decode.el: Don't require mailcap, gnus-util.
+	(gnus-map-function, gnus-replace-in-string, gnus-read-shell-command)
+	(message-fetch-field, mailcap-parse-mailcaps, mailcap-mime-info):
+	Autoload.
+	(mailcap-mime-extensions): Declare.
+
+	* mm-encode.el: Don't require mailcap.
+	(mailcap-extension-to-mime): Autoload.
+
+	* mml-sec.el: Don't require password-cache.
+
+	* mml.el (gnus-setup-posting-charset): Declare rather than autoload.
+	(mailcap-parse-mimetypes, mailcap-mime-types): Declare.
+	(mml-minibuffer-read-type): Require mailcap.
+	(mml-preview): Require gnus-msg.
+
+	* mml1991.el: Require password-cache.
+	(password-cache-expiry): Remove declaration.
+
+	* mml2015.el: Require password-cache.
+	(password-cache-expiry): Remove declaration.
+
+	* nneething.el (mailcap): Require mailcap.
+
+	* nnheader.el: (declare-function): Add compatibility stub.
+	(message-remove-header): Declare rather than autoload.
+	(nnheader-replace-header): Require message.
+
+	* nnimap.el (declare-function): Add compatibility stub.
+	(netrc-parse, netrc-machine-user-or-password): Declare.
+	(nnimap-open-connection): Require netrc.
+
+	* nntp.el (declare-function): Add compatibility stub.
+	(netrc-parse, netrc-machine, netrc-get): Declare.
+	(nntp-send-authinfo): Require netrc.
+
+	* rfc2047.el: Don't require qp.
+	(quoted-printable-encode-region, quoted-printable-decode-string):
+	Autoload.
+
+	* sieve-mode.el: Don't require easymenu.
+	(easy-menu-add-item): Autoload it.
+
+	* spam-stat.el (time-to-number-of-days): Autoload it.
+
 2010-03-17  Kevin Ryde  <user42@zip.com.au>

 	* mml.el (mml-read-tag): Unquote values with `read' to reverse
--- a/lisp/gnus/auth-source.el	Thu Mar 18 12:56:23 2010 +0100
+++ b/lisp/gnus/auth-source.el	Mon Mar 22 08:34:25 2010 +0100
@@ -34,7 +34,7 @@
 (require 'gnus-util)

 (eval-when-compile (require 'cl))
-(eval-when-compile (require 'netrc))
+(autoload 'netrc-machine-user-or-password "netrc")

 (defgroup auth-source nil
   "Authentication sources."
@@ -86,7 +86,7 @@
  that function using the same arguments as `message'."
   :group 'auth-source
   :version "23.1" ;; No Gnus
-  :type	`(choice
+  :type	`(choice
 	  :tag "auth-source debugging mode"
 	  (const :tag "Log using `message' to the *Messages* buffer" t)
 	  (function :tag "Function that takes arguments like `message'")
@@ -145,7 +145,7 @@
   ;; we also check the value
   (when auth-source-debug
     (let ((logger (if (functionp auth-source-debug)
-		      auth-source-debug
+		      auth-source-debug
 		    'message)))
       (apply logger msg))))
--- a/lisp/gnus/gmm-utils.el	Thu Mar 18 12:56:23 2010 +0100
+++ b/lisp/gnus/gmm-utils.el	Mon Mar 22 08:34:25 2010 +0100
@@ -28,8 +28,6 @@

 ;;; Code:

-(require 'wid-edit)
-
 (defgroup gmm nil
   "Utility functions for Gnus, Message and MML."
   :prefix "gmm-"
@@ -95,6 +93,10 @@
   "Non-nil if SYMBOL is a widget."
   (get symbol 'widget-type))

+(autoload 'widget-create-child-value "wid-edit")
+(autoload 'widget-convert "wid-edit")
+(autoload 'widget-default-get "wid-edit")
+
 ;; Copy of the `nnmail-lazy' code from `nnmail.el':
 (define-widget 'gmm-lazy 'default
   "Base widget for recursive datastructures.
--- a/lisp/gnus/gnus-util.el	Thu Mar 18 12:56:23 2010 +0100
+++ b/lisp/gnus/gnus-util.el	Mon Mar 22 08:34:25 2010 +0100
@@ -53,10 +53,6 @@
 (defvar gnus-original-article-buffer)
 (defvar gnus-user-agent)

-(require 'time-date)
-(require 'netrc)
-
-(autoload 'message-fetch-field "message")
 (autoload 'gnus-get-buffer-window "gnus-win")
 (autoload 'nnheader-narrow-to-headers "nnheader")
 (autoload 'nnheader-replace-chars-in-string "nnheader")
@@ -206,8 +202,11 @@
 Uses `gnus-extract-address-components'."
   (nth 1 (gnus-extract-address-components from)))

+(declare-function message-fetch-field "message" (header &optional not-all))
+
 (defun gnus-fetch-field (field)
   "Return the value of the header FIELD of current article."
+  (require 'message)
   (save-excursion
     (save-restriction
       (let ((inhibit-point-motion-hooks t))
@@ -228,13 +227,14 @@
 		   (point)))))

 (declare-function gnus-find-method-for-group "gnus" (group &optional info))
-(autoload 'gnus-group-name-decode "gnus-group")
+(declare-function gnus-group-name-decode "gnus-group" (string charset))
 (declare-function gnus-group-name-charset "gnus-group" (method group))
 ;; gnus-group requires gnus-int which requires message.
 (declare-function message-tokenize-header "message"
                   (header &optional separator))

 (defun gnus-decode-newsgroups (newsgroups group &optional method)
+  (require 'gnus-group)
   (let ((method (or method (gnus-find-method-for-group group))))
     (mapconcat (lambda (group)
 		 (gnus-group-name-decode group (gnus-group-name-charset
--- a/lisp/gnus/ietf-drums.el	Thu Mar 18 12:56:23 2010 +0100
+++ b/lisp/gnus/ietf-drums.el	Mon Mar 22 08:34:25 2010 +0100
@@ -39,7 +39,6 @@
 ;;; Code:

 (eval-when-compile (require 'cl))
-(require 'time-date)
 (require 'mm-util)

 (defvar ietf-drums-no-ws-ctl-token "\001-\010\013\014\016-\037\177"
--- a/lisp/gnus/message.el	Thu Mar 18 12:56:23 2010 +0100
+++ b/lisp/gnus/message.el	Mon Mar 22 08:34:25 2010 +0100
@@ -34,11 +34,12 @@
 (eval-when-compile
   (require 'cl))

-(require 'hashcash)
-(require 'canlock)
 (require 'mailheader)
 (require 'gmm-utils)
-(require 'nnheader)
+(require 'mail-utils)
+;; Only for the trivial macros mail-header-from, mail-header-date
+;; mail-header-references, mail-header-subject, mail-header-id
+(eval-when-compile (require 'nnheader))
 ;; This is apparently necessary even though things are autoloaded.
 ;; Because we dynamically bind mail-abbrev-mode-regexp, we'd better
 ;; require mailabbrev here.
@@ -48,7 +49,6 @@
 (require 'mail-parse)
 (require 'mml)
 (require 'rfc822)
-(require 'ecomplete)

 (autoload 'mailclient-send-it "mailclient") ;; Emacs 22 or contrib/

@@ -655,8 +655,6 @@
   :link '(custom-manual "(message)Canceling News")
   :type 'string)

-(defvar smtpmail-default-smtp-server)
-
 (defun message-send-mail-function ()
   "Return suitable value for the variable `message-send-mail-function'."
   (cond ((and (require 'sendmail)
@@ -665,14 +663,13 @@
 	      (executable-find sendmail-program))
 	 'message-send-mail-with-sendmail)
 	((and (locate-library "smtpmail")
-	      (require 'smtpmail)
+	      (boundp 'smtpmail-default-smtp-server)
 	      smtpmail-default-smtp-server)
 	 'message-smtpmail-send-it)
 	((locate-library "mailclient")
 	 'message-send-mail-with-mailclient)
 	(t
-	 (lambda ()
-	   (error "Don't know how to send mail.  Please customize `message-send-mail-function'")))))
+	 (error "Don't know how to send mail.  Please customize `message-send-mail-function'"))))

 ;; Useful to set in site-init.el
 (defcustom message-send-mail-function
@@ -1282,7 +1279,7 @@
   :type '(repeat function))

 (defcustom message-auto-save-directory
-  (file-name-as-directory (nnheader-concat message-directory "drafts"))
+  (file-name-as-directory (expand-file-name "drafts" message-directory))
   "*Directory where Message auto-saves buffers if Gnus isn't running.
 If nil, Message won't auto-save."
   :group 'message-buffers
@@ -1958,6 +1955,8 @@
 		 (setq paren nil))))
 	(nreverse elems)))))

+(autoload 'nnheader-insert-file-contents "nnheader")
+
 (defun message-mail-file-mbox-p (file)
   "Say whether FILE looks like a Unix mbox file."
   (when (and (file-exists-p file)
@@ -3410,8 +3409,8 @@
 				;; if message-signature-file contains a path.
 				(not (file-name-directory
 				      message-signature-file)))
-			   (nnheader-concat message-signature-directory
-					    message-signature-file)
+			   (expand-file-name message-signature-file
+					     message-signature-directory)
 			 message-signature-file))
 		 (file-exists-p signature-file))))
     (when signature
@@ -4414,6 +4413,8 @@
 	    (erase-buffer)))
       (kill-buffer tembuf))))

+(declare-function hashcash-wait-async "hashcash" (&optional buffer))
+
 (defun message-send-mail (&optional arg)
   (require 'mail-utils)
   (let* ((tembuf (message-generate-new-buffer-clone-locals " message temp"))
@@ -4421,14 +4422,26 @@
 	 (news (message-news-p))
 	 (mailbuf (current-buffer))
 	 (message-this-is-mail t)
+	 ;; gnus-setup-posting-charset is autoloaded in mml.el (FIXME
+	 ;; maybe it should not be), which this file requires.  Hence
+	 ;; the fboundp test is always true.  Loading it from gnus-msg
+	 ;; loads many Gnus files (Bug#5642).  If
+	 ;; gnus-group-posting-charset-alist hasn't been customized,
+	 ;; this is just going to return nil anyway.  FIXME it would
+	 ;; be good to improve this further, because even if g-g-p-c-a
+	 ;; has been customized, that is likely to just be for news.
+	 ;; Eg either move the definition from gnus-msg, or separate out
+	 ;; the mail and news parts.
 	 (message-posting-charset
-	  (if (fboundp 'gnus-setup-posting-charset)
+	  (if (and (fboundp 'gnus-setup-posting-charset)
+		   (boundp 'gnus-group-posting-charset-alist))
 	      (gnus-setup-posting-charset nil)
 	    message-posting-charset))
 	 (headers message-required-mail-headers))
     (when (and message-generate-hashcash
 	       (not (eq message-generate-hashcash 'opportunistic)))
       (message "Generating hashcash...")
+      (require 'hashcash)
       ;; Wait for calculations already started to finish...
       (hashcash-wait-async)
       ;; ...and do calculations not already done.  mail-add-payment
@@ -4550,6 +4563,7 @@

 (defun message-send-mail-with-sendmail ()
   "Send off the prepared buffer with sendmail."
+  (require 'sendmail)
   (let ((errbuf (if message-interactive
 		    (message-generate-new-buffer-clone-locals
 		     " sendmail errors")
@@ -4713,10 +4727,14 @@
 		  (prin1-to-string (recent-keys))
 		  (prin1-to-string (garbage-collect))))))

+(defvar canlock-password)
+(defvar canlock-password-for-verify)
+
 (defun message-canlock-password ()
   "The password used by message for cancel locks.
 This is the value of `canlock-password', if that option is non-nil.
 Otherwise, generate and save a value for `canlock-password' first."
+  (require 'canlock)
   (unless canlock-password
     (customize-save-variable 'canlock-password (message-canlock-generate))
     (setq canlock-password-for-verify canlock-password))
@@ -4727,7 +4745,12 @@
     (message-canlock-password)
     (canlock-insert-header)))

+(autoload 'nnheader-get-report "nnheader")
+
+(declare-function gnus-setup-posting-charset "gnus-msg" (group))
+
 (defun message-send-news (&optional arg)
+  (require 'gnus-msg)
   (let* ((tembuf (message-generate-new-buffer-clone-locals " *message temp*"))
 	 (case-fold-search nil)
 	 (method (if (functionp message-post-method)
@@ -5466,7 +5489,7 @@
 (defun message-make-references ()
   "Return the References header for this message."
   (when message-reply-headers
-    (let ((message-id (mail-header-message-id message-reply-headers))
+    (let ((message-id (mail-header-id message-reply-headers))
 	  (references (mail-header-references message-reply-headers)))
       (if (or references message-id)
 	  (concat (or references "") (and references " ")
@@ -5478,7 +5501,7 @@
   (when message-reply-headers
     (let ((from (mail-header-from message-reply-headers))
 	  (date (mail-header-date message-reply-headers))
-	  (msg-id (mail-header-message-id message-reply-headers)))
+	  (msg-id (mail-header-id message-reply-headers)))
       (when from
 	(let ((name (mail-extract-address-components from)))
 	  (concat
@@ -8003,7 +8026,11 @@
 	(not result)
       result)))

+(declare-function ecomplete-add-item "ecomplete" (type key text))
+(declare-function ecomplete-save "ecomplete" ())
+
 (defun message-put-addresses-in-ecomplete ()
+  (require 'ecomplete)
   (dolist (header '("to" "cc" "from" "reply-to"))
     (let ((value (message-field-value header)))
       (dolist (string (mail-header-parse-addresses value 'raw))
@@ -8014,6 +8041,8 @@
 			    string))))
   (ecomplete-save))

+(autoload 'ecomplete-display-matches "ecomplete")
+
 (defun message-display-abbrev (&optional choose)
   "Display the next possible abbrev for the text before point."
   (interactive (list t))
--- a/lisp/gnus/mm-decode.el	Thu Mar 18 12:56:23 2010 +0100
+++ b/lisp/gnus/mm-decode.el	Mon Mar 22 08:34:25 2010 +0100
@@ -29,12 +29,14 @@
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))

 (require 'mail-parse)
-(require 'mailcap)
 (require 'mm-bodies)
-(require 'gnus-util)
 (eval-when-compile (require 'cl)
 		   (require 'term))

+(autoload 'gnus-map-function "gnus-util")
+(autoload 'gnus-replace-in-string "gnus-util")
+(autoload 'gnus-read-shell-command "gnus-util")
+
 (autoload 'mm-inline-partial "mm-partial")
 (autoload 'mm-inline-external-body "mm-extern")
 (autoload 'mm-extern-cache-contents "mm-extern")
@@ -550,6 +552,8 @@
     (message "Destroying external MIME viewers")
     (mm-destroy-parts mm-postponed-undisplay-list)))

+(autoload 'message-fetch-field "message")
+
 (defun mm-dissect-buffer (&optional no-strict-mime loose-mime from)
   "Dissect the current buffer and return a list of MIME handles."
   (save-excursion
@@ -688,6 +692,9 @@
 	  (goto-char (point-max)))
       (mapcar 'mm-display-parts handle))))

+(autoload 'mailcap-parse-mailcaps "mailcap")
+(autoload 'mailcap-mime-info "mailcap")
+
 (defun mm-display-part (handle &optional no-default)
   "Display the MIME part represented by HANDLE.
 Returns nil if the part is removed; inline if displayed inline;
@@ -747,6 +754,7 @@
 		 handle 'mailcap-save-binary-file)))))))))

 (declare-function gnus-configure-windows "gnus-win" (setting &optional force))
+(defvar mailcap-mime-extensions)	; mailcap-mime-info autoloads

 (defun mm-display-external (handle method)
   "Display HANDLE using METHOD."
--- a/lisp/gnus/mm-encode.el	Thu Mar 18 12:56:23 2010 +0100
+++ b/lisp/gnus/mm-encode.el	Mon Mar 22 08:34:25 2010 +0100
@@ -26,7 +26,7 @@

 (eval-when-compile (require 'cl))
 (require 'mail-parse)
-(require 'mailcap)
+(autoload 'mailcap-extension-to-mime "mailcap")
 (autoload 'mm-body-7-or-8 "mm-bodies")
 (autoload 'mm-long-lines-p "mm-bodies")
--- a/lisp/gnus/mml-sec.el	Thu Mar 18 12:56:23 2010 +0100
+++ b/lisp/gnus/mml-sec.el	Mon Mar 22 08:34:25 2010 +0100
@@ -26,10 +26,6 @@

 (eval-when-compile (require 'cl))

-(if (locate-library "password-cache")
-    (require 'password-cache)
-  (require 'password))
-
 (autoload 'mml2015-sign "mml2015")
 (autoload 'mml2015-encrypt "mml2015")
 (autoload 'mml1991-sign "mml1991")
--- a/lisp/gnus/mml.el	Thu Mar 18 12:56:23 2010 +0100
+++ b/lisp/gnus/mml.el	Mon Mar 22 08:34:25 2010 +0100
@@ -35,7 +35,7 @@
 (eval-when-compile (require 'cl))

 (autoload 'message-make-message-id "message")
-(autoload 'gnus-setup-posting-charset "gnus-msg")
+(declare-function gnus-setup-posting-charset "gnus-msg" (group))
 (autoload 'gnus-make-local-hook "gnus-util")
 (autoload 'message-fetch-field "message")
 (autoload 'message-mark-active-p "message")
@@ -1173,7 +1173,11 @@
       (error "Permission denied: %s" file))
     file))

+(declare-function mailcap-parse-mimetypes "mailcap" (&optional path force))
+(declare-function mailcap-mime-types "mailcap" ())
+
 (defun mml-minibuffer-read-type (name &optional default)
+  (require 'mailcap)
   (mailcap-parse-mimetypes)
   (let* ((default (or default
 		      (mm-default-file-encoding name)
@@ -1445,6 +1449,7 @@
   (setq mml-preview-buffer (generate-new-buffer
 			    (concat (if raw "*Raw MIME preview of "
 				      "*MIME preview of ") (buffer-name))))
+  (require 'gnus-msg)		      ; for gnus-setup-posting-charset
   (save-excursion
     (let* ((buf (current-buffer))
 	   (message-options message-options)
--- a/lisp/gnus/mml1991.el	Thu Mar 18 12:56:23 2010 +0100
+++ b/lisp/gnus/mml1991.el	Mon Mar 22 08:34:25 2010 +0100
@@ -28,7 +28,11 @@

 ;; For Emacs < 22.2.
 (eval-and-compile
-  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
+  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r)))
+
+  (if (locate-library "password-cache")
+      (require 'password-cache)
+    (require 'password)))

 (eval-when-compile
   (require 'cl)
@@ -329,7 +333,6 @@
 ;; epg wrapper

 (defvar epg-user-id-alist)
-(defvar password-cache-expiry)

 (autoload 'epg-make-context "epg")
 (autoload 'epg-passphrase-callback-function "epg")
--- a/lisp/gnus/mml2015.el	Thu Mar 18 12:56:23 2010 +0100
+++ b/lisp/gnus/mml2015.el	Mon Mar 22 08:34:25 2010 +0100
@@ -30,7 +30,11 @@

 ;; For Emacs < 22.2.
 (eval-and-compile
-  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
+  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r)))
+
+  (if (locate-library "password-cache")
+      (require 'password-cache)
+    (require 'password)))

 (eval-when-compile (require 'cl))
 (require 'mm-decode)
@@ -986,8 +990,6 @@
 (autoload 'epg-expand-group "epg-config")
 (autoload 'epa-select-keys "epa")

-(defvar password-cache-expiry)
-
 (defvar mml2015-epg-secret-key-id-list nil)

 (defun mml2015-epg-passphrase-callback (context key-id ignore)
--- a/lisp/gnus/nneething.el	Thu Mar 18 12:56:23 2010 +0100
+++ b/lisp/gnus/nneething.el	Mon Mar 22 08:34:25 2010 +0100
@@ -28,6 +28,7 @@

 (eval-when-compile (require 'cl))

+(require 'mailcap)
 (require 'nnheader)
 (require 'nnmail)
 (require 'nnoo)
--- a/lisp/gnus/nnheader.el	Thu Mar 18 12:56:23 2010 +0100
+++ b/lisp/gnus/nnheader.el	Mon Mar 22 08:34:25 2010 +0100
@@ -27,6 +27,8 @@

 ;;; Code:

+(eval-and-compile
+  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 (eval-when-compile (require 'cl))

 (defvar nnmail-extra-headers)
@@ -121,7 +123,6 @@

 (autoload 'nnmail-message-id "nnmail")
 (autoload 'mail-position-on-field "sendmail")
-(autoload 'message-remove-header "message")
 (autoload 'gnus-buffer-live-p "gnus-util")

 ;;; Header access macros.
@@ -662,8 +663,12 @@
       ;; without inserting extra newline.
       (fill-region-as-paragraph begin (1+ (point))))))

+(declare-function message-remove-header "message"
+		  (header &optional is-regexp first reverse))
+
 (defun nnheader-replace-header (header new-value)
   "Remove HEADER and insert the NEW-VALUE."
+  (require 'message)
   (save-excursion
     (save-restriction
       (nnheader-narrow-to-headers)
--- a/lisp/gnus/nnimap.el	Thu Mar 18 12:56:23 2010 +0100
+++ b/lisp/gnus/nnimap.el	Mon Mar 22 08:34:25 2010 +0100
@@ -59,6 +59,10 @@

 ;;; Code:

+;; For Emacs < 22.2.
+(eval-and-compile
+  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
+
 (require 'imap)
 (require 'nnoo)
 (require 'nnmail)
@@ -789,12 +793,17 @@
 	    (nnheader-nov-delete-outside-range low high))))
       'nov)))

+(declare-function netrc-parse "netrc" (file))
+(declare-function netrc-machine-user-or-password "netrc"
+		  (mode authinfo-file-or-list machines ports defaults))
+
 (defun nnimap-open-connection (server)
   ;; Note: `nnimap-open-server' that calls this function binds
   ;; `imap-logout-timeout' to `nnimap-logout-timeout'.
   (if (not (imap-open nnimap-address nnimap-server-port nnimap-stream
 		      nnimap-authenticator nnimap-server-buffer))
       (nnheader-report 'nnimap "Can't open connection to server %s" server)
+    (require 'netrc)
     (unless (or (imap-capability 'IMAP4 nnimap-server-buffer)
 		(imap-capability 'IMAP4rev1 nnimap-server-buffer))
       (imap-close nnimap-server-buffer)
@@ -805,7 +814,7 @@
  	   (port (if nnimap-server-port
  		     (int-to-string nnimap-server-port)
  		   "imap"))
-	   (auth-info
+	   (auth-info
 	    (auth-source-user-or-password '("login" "password") server port))
 	   (auth-user (nth 0 auth-info))
 	   (auth-passwd (nth 1 auth-info))
--- a/lisp/gnus/nntp.el	Thu Mar 18 12:56:23 2010 +0100
+++ b/lisp/gnus/nntp.el	Mon Mar 22 08:34:25 2010 +0100
@@ -26,6 +26,10 @@

 ;;; Code:

+;; For Emacs < 22.2.
+(eval-and-compile
+  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
+
 (require 'nnheader)
 (require 'nnoo)
 (require 'gnus-util)
@@ -1168,6 +1172,11 @@
 reading."
   (nntp-send-command "^.*\n" "MODE READER"))

+(declare-function netrc-parse "netrc" (file))
+(declare-function netrc-machine "netrc"
+		  (list machine &optional port defaultport))
+(declare-function netrc-get "netrc" (alist type))
+
 (defun nntp-send-authinfo (&optional send-if-force)
   "Send the AUTHINFO to the nntp server.
 It will look in the \"~/.authinfo\" file for matching entries.  If
@@ -1176,10 +1185,11 @@

 If SEND-IF-FORCE, only send authinfo to the server if the
 .authinfo file has the FORCE token."
+  (require 'netrc)
   (let* ((list (netrc-parse nntp-authinfo-file))
 	 (alist (netrc-machine list nntp-address "nntp"))
 	 (force (or (netrc-get alist "force") nntp-authinfo-force))
-	 (auth-info
+	 (auth-info
 	  (auth-source-user-or-password '("login" "password") nntp-address "nntp"))
 	 (auth-user (nth 0 auth-info))
 	 (auth-passwd (nth 1 auth-info))
--- a/lisp/gnus/rfc2047.el	Thu Mar 18 12:56:23 2010 +0100
+++ b/lisp/gnus/rfc2047.el	Mon Mar 22 08:34:25 2010 +0100
@@ -31,7 +31,6 @@
   (require 'cl))
 (defvar message-posting-charset)

-(require 'qp)
 (require 'mm-util)
 (require 'ietf-drums)
 ;; Fixme: Avoid this (used for mail-parse-charset) mm dependence on gnus.
@@ -827,6 +826,8 @@
   "Base64-encode the header contained in STRING."
   (base64-encode-string string t))

+(autoload 'quoted-printable-encode-region "qp")
+
 (defun rfc2047-q-encode-string (string)
   "Quoted-printable-encode the header in STRING."
   (mm-with-unibyte-buffer
@@ -929,6 +930,8 @@
 	'raw-text
       cs)))

+(autoload 'quoted-printable-decode-string "qp")
+
 (defun rfc2047-decode-encoded-words (words)
   "Decode successive encoded-words in WORDS and return a decoded string.
 Each element of WORDS looks like (CHARSET ENCODING ENCODED-TEXT
--- a/lisp/gnus/sieve-mode.el	Thu Mar 18 12:56:23 2010 +0100
+++ b/lisp/gnus/sieve-mode.el	Mon Mar 22 08:34:25 2010 +0100
@@ -1,7 +1,7 @@
 ;;; sieve-mode.el --- Sieve code editing commands for Emacs

-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+;;   2010  Free Software Foundation, Inc.

 ;; Author: Simon Josefsson <simon@josefsson.org>

@@ -49,7 +49,6 @@

 (autoload 'sieve-manage "sieve")
 (autoload 'sieve-upload "sieve")
-(require 'easymenu)
 (eval-when-compile
   (require 'font-lock))

@@ -186,6 +185,7 @@
   "Menubar used in sieve mode.")

 ;; Code for Sieve editing mode.
+(autoload 'easy-menu-add-item "easymenu")

 ;;;###autoload
 (define-derived-mode sieve-mode c-mode "Sieve"
--- a/lisp/gnus/spam-stat.el	Thu Mar 18 12:56:23 2010 +0100
+++ b/lisp/gnus/spam-stat.el	Mon Mar 22 08:34:25 2010 +0100
@@ -1,6 +1,7 @@
 ;;; spam-stat.el --- detecting spam based on statistics

-;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+;;   2010  Free Software Foundation, Inc.

 ;; Author: Alex Schroeder <alex@gnu.org>
 ;; Keywords: network
@@ -557,6 +558,8 @@
     (when (re-search-forward "^Xref:.*\n" nil t)
       (delete-region (match-beginning 0) (match-end 0)))))

+(autoload 'time-to-number-of-days "time-date")
+
 (defun spam-stat-process-directory (dir func)
   "Process all the regular files in directory DIR using function FUNC."
   (let* ((files (directory-files dir t "^[^.]"))
--- a/lisp/ldefs-boot.el	Thu Mar 18 12:56:23 2010 +0100
+++ b/lisp/ldefs-boot.el	Mon Mar 22 08:34:25 2010 +0100
@@ -5,7 +5,7 @@

 ;;;### (autoloads (5x5-crack 5x5-crack-xor-mutate 5x5-crack-mutating-best
 ;;;;;;  5x5-crack-mutating-current 5x5-crack-randomly 5x5) "5x5"
-;;;;;;  "play/5x5.el" (19278 4526))
+;;;;;;  "play/5x5.el" (19277 34922))
 ;;; Generated autoloads from play/5x5.el

 (autoload '5x5 "5x5" "\
@@ -65,7 +65,7 @@
 ;;;***

 ;;;### (autoloads (list-one-abbrev-table) "abbrevlist" "abbrevlist.el"
-;;;;;;  (19278 4516))
+;;;;;;  (19277 34915))
 ;;; Generated autoloads from abbrevlist.el

 (autoload 'list-one-abbrev-table "abbrevlist" "\
@@ -76,7 +76,7 @@
 ;;;***

 ;;;### (autoloads (ada-mode ada-add-extensions) "ada-mode" "progmodes/ada-mode.el"
-;;;;;;  (19312 40243))
+;;;;;;  (19312 41311))
 ;;; Generated autoloads from progmodes/ada-mode.el

 (autoload 'ada-add-extensions "ada-mode" "\
@@ -96,7 +96,7 @@
 ;;;***

 ;;;### (autoloads (ada-header) "ada-stmt" "progmodes/ada-stmt.el"
-;;;;;;  (19279 36173))
+;;;;;;  (19279 53114))
 ;;; Generated autoloads from progmodes/ada-stmt.el

 (autoload 'ada-header "ada-stmt" "\
@@ -107,7 +107,7 @@
 ;;;***

 ;;;### (autoloads (ada-find-file) "ada-xref" "progmodes/ada-xref.el"
-;;;;;;  (19279 36173))
+;;;;;;  (19279 53114))
 ;;; Generated autoloads from progmodes/ada-xref.el

 (autoload 'ada-find-file "ada-xref" "\
@@ -121,8 +121,8 @@
 ;;;### (autoloads (change-log-merge add-log-current-defun change-log-mode
 ;;;;;;  add-change-log-entry-other-window add-change-log-entry find-change-log
 ;;;;;;  prompt-for-change-log-name add-log-mailing-address add-log-full-name
-;;;;;;  add-log-current-defun-function) "add-log" "add-log.el" (19278
-;;;;;;  4516))
+;;;;;;  add-log-current-defun-function) "add-log" "add-log.el" (19277
+;;;;;;  34915))
 ;;; Generated autoloads from add-log.el

 (put 'change-log-default-name 'safe-local-variable 'string-or-null-p)
@@ -261,7 +261,7 @@

 ;;;### (autoloads (defadvice ad-activate ad-add-advice ad-disable-advice
 ;;;;;;  ad-enable-advice ad-default-compilation-action ad-redefinition-action)
-;;;;;;  "advice" "emacs-lisp/advice.el" (19322 43407))
+;;;;;;  "advice" "emacs-lisp/advice.el" (19321 45634))
 ;;; Generated autoloads from emacs-lisp/advice.el

 (defvar ad-redefinition-action 'warn "\
@@ -404,7 +404,7 @@

 ;;;### (autoloads (align-newline-and-indent align-unhighlight-rule
 ;;;;;;  align-highlight-rule align-current align-entire align-regexp
-;;;;;;  align) "align" "align.el" (19278 4516))
+;;;;;;  align) "align" "align.el" (19277 34915))
 ;;; Generated autoloads from align.el

 (autoload 'align "align" "\
@@ -494,7 +494,7 @@
 ;;;***

 ;;;### (autoloads (outlineify-sticky allout-mode) "allout" "allout.el"
-;;;;;;  (19278 4516))
+;;;;;;  (19277 34915))
 ;;; Generated autoloads from allout.el

 (put 'allout-use-hanging-indents 'safe-local-variable (if (fboundp 'booleanp) 'booleanp '(lambda (x) (member x '(t nil)))))
@@ -801,7 +801,7 @@
 ;;;***

 ;;;### (autoloads (ange-ftp-hook-function ange-ftp-reread-dir) "ange-ftp"
-;;;;;;  "net/ange-ftp.el" (19322 43174))
+;;;;;;  "net/ange-ftp.el" (19360 14173))
 ;;; Generated autoloads from net/ange-ftp.el

 (defalias 'ange-ftp-re-read-dir 'ange-ftp-reread-dir)
@@ -823,7 +823,7 @@
 ;;;***

 ;;;### (autoloads (animate-birthday-present animate-sequence animate-string)
-;;;;;;  "animate" "play/animate.el" (19278 4526))
+;;;;;;  "animate" "play/animate.el" (19277 34922))
 ;;; Generated autoloads from play/animate.el

 (autoload 'animate-string "animate" "\
@@ -851,7 +851,7 @@
 ;;;***

 ;;;### (autoloads (ansi-color-process-output ansi-color-for-comint-mode-on)
-;;;;;;  "ansi-color" "ansi-color.el" (19278 4516))
+;;;;;;  "ansi-color" "ansi-color.el" (19277 34915))
 ;;; Generated autoloads from ansi-color.el

 (autoload 'ansi-color-for-comint-mode-on "ansi-color" "\
@@ -877,7 +877,7 @@
 ;;;***

 ;;;### (autoloads (antlr-set-tabs antlr-mode antlr-show-makefile-rules)
-;;;;;;  "antlr-mode" "progmodes/antlr-mode.el" (19278 4527))
+;;;;;;  "antlr-mode" "progmodes/antlr-mode.el" (19277 34922))
 ;;; Generated autoloads from progmodes/antlr-mode.el

 (autoload 'antlr-show-makefile-rules "antlr-mode" "\
@@ -914,7 +914,7 @@
 ;;;***

 ;;;### (autoloads (appt-activate appt-make-list appt-delete appt-add)
-;;;;;;  "appt" "calendar/appt.el" (19278 4519))
+;;;;;;  "appt" "calendar/appt.el" (19277 34917))
 ;;; Generated autoloads from calendar/appt.el

 (autoload 'appt-add "appt" "\
@@ -954,7 +954,7 @@

 ;;;### (autoloads (apropos-documentation apropos-value apropos-library
 ;;;;;;  apropos apropos-documentation-property apropos-command apropos-variable
-;;;;;;  apropos-read-pattern) "apropos" "apropos.el" (19278 4516))
+;;;;;;  apropos-read-pattern) "apropos" "apropos.el" (19277 34915))
 ;;; Generated autoloads from apropos.el

 (autoload 'apropos-read-pattern "apropos" "\
@@ -1058,7 +1058,7 @@
 ;;;***

 ;;;### (autoloads (archive-mode) "arc-mode" "arc-mode.el" (19318
-;;;;;;  22201))
+;;;;;;  65023))
 ;;; Generated autoloads from arc-mode.el

 (autoload 'archive-mode "arc-mode" "\
@@ -1078,7 +1078,7 @@

 ;;;***

-;;;### (autoloads (array-mode) "array" "array.el" (19278 4516))
+;;;### (autoloads (array-mode) "array" "array.el" (19277 34915))
 ;;; Generated autoloads from array.el

 (autoload 'array-mode "array" "\
@@ -1150,7 +1150,7 @@
 ;;;***

 ;;;### (autoloads (artist-mode) "artist" "textmodes/artist.el" (19315
-;;;;;;  29628))
+;;;;;;  24485))
 ;;; Generated autoloads from textmodes/artist.el

 (autoload 'artist-mode "artist" "\
@@ -1356,8 +1356,8 @@

 ;;;***

-;;;### (autoloads (asm-mode) "asm-mode" "progmodes/asm-mode.el" (19278
-;;;;;;  4527))
+;;;### (autoloads (asm-mode) "asm-mode" "progmodes/asm-mode.el" (19277
+;;;;;;  34922))
 ;;; Generated autoloads from progmodes/asm-mode.el

 (autoload 'asm-mode "asm-mode" "\
@@ -1385,7 +1385,7 @@
 ;;;***

 ;;;### (autoloads (autoarg-kp-mode autoarg-mode) "autoarg" "autoarg.el"
-;;;;;;  (19278 4516))
+;;;;;;  (19277 34915))
 ;;; Generated autoloads from autoarg.el

 (defvar autoarg-mode nil "\
@@ -1439,7 +1439,7 @@
 ;;;***

 ;;;### (autoloads (autoconf-mode) "autoconf" "progmodes/autoconf.el"
-;;;;;;  (19278 4527))
+;;;;;;  (19277 34922))
 ;;; Generated autoloads from progmodes/autoconf.el

 (autoload 'autoconf-mode "autoconf" "\
@@ -1450,7 +1450,7 @@
 ;;;***

 ;;;### (autoloads (auto-insert-mode define-auto-insert auto-insert)
-;;;;;;  "autoinsert" "autoinsert.el" (19278 4516))
+;;;;;;  "autoinsert" "autoinsert.el" (19277 34915))
 ;;; Generated autoloads from autoinsert.el

 (autoload 'auto-insert "autoinsert" "\
@@ -1489,7 +1489,7 @@

 ;;;### (autoloads (batch-update-autoloads update-directory-autoloads
 ;;;;;;  update-file-autoloads) "autoload" "emacs-lisp/autoload.el"
-;;;;;;  (19278 4521))
+;;;;;;  (19361 52486))
 ;;; Generated autoloads from emacs-lisp/autoload.el

 (put 'generated-autoload-file 'safe-local-variable 'stringp)
@@ -1528,7 +1528,7 @@

 ;;;### (autoloads (global-auto-revert-mode turn-on-auto-revert-tail-mode
 ;;;;;;  auto-revert-tail-mode turn-on-auto-revert-mode auto-revert-mode)
-;;;;;;  "autorevert" "autorevert.el" (19278 4516))
+;;;;;;  "autorevert" "autorevert.el" (19277 34915))
 ;;; Generated autoloads from autorevert.el

 (autoload 'auto-revert-mode "autorevert" "\
@@ -1609,7 +1609,7 @@
 ;;;***

 ;;;### (autoloads (mouse-avoidance-mode mouse-avoidance-mode) "avoid"
-;;;;;;  "avoid.el" (19278 4516))
+;;;;;;  "avoid.el" (19277 34915))
 ;;; Generated autoloads from avoid.el

 (defvar mouse-avoidance-mode nil "\
@@ -1650,7 +1650,7 @@
 ;;;***

 ;;;### (autoloads (display-battery-mode battery) "battery" "battery.el"
-;;;;;;  (19278 4516))
+;;;;;;  (19277 34915))
 ;;; Generated autoloads from battery.el
  (put 'battery-mode-line-string 'risky-local-variable t)

@@ -1682,7 +1682,7 @@
 ;;;***

 ;;;### (autoloads (benchmark benchmark-run-compiled benchmark-run)
-;;;;;;  "benchmark" "emacs-lisp/benchmark.el" (19278 4521))
+;;;;;;  "benchmark" "emacs-lisp/benchmark.el" (19277 34919))
 ;;; Generated autoloads from emacs-lisp/benchmark.el

 (autoload 'benchmark-run "benchmark" "\
@@ -1715,7 +1715,7 @@
 ;;;***

 ;;;### (autoloads (bibtex-search-entry bibtex-mode bibtex-initialize)
-;;;;;;  "bibtex" "textmodes/bibtex.el" (19279 36174))
+;;;;;;  "bibtex" "textmodes/bibtex.el" (19279 53114))
 ;;; Generated autoloads from textmodes/bibtex.el

 (autoload 'bibtex-initialize "bibtex" "\
@@ -1802,7 +1802,7 @@
 ;;;***

 ;;;### (autoloads (bibtex-style-mode) "bibtex-style" "textmodes/bibtex-style.el"
-;;;;;;  (19278 4528))
+;;;;;;  (19277 34923))
 ;;; Generated autoloads from textmodes/bibtex-style.el
  (add-to-list 'auto-mode-alist (cons (purecopy "\\.bst\\'") 'bibtex-style-mode))

@@ -1815,7 +1815,7 @@

 ;;;### (autoloads (binhex-decode-region binhex-decode-region-external
 ;;;;;;  binhex-decode-region-internal) "binhex" "mail/binhex.el"
-;;;;;;  (19278 4524))
+;;;;;;  (19277 34921))
 ;;; Generated autoloads from mail/binhex.el

 (defconst binhex-begin-line "^:...............................................................$")
@@ -1838,8 +1838,8 @@

 ;;;***

-;;;### (autoloads (blackbox) "blackbox" "play/blackbox.el" (19278
-;;;;;;  4526))
+;;;### (autoloads (blackbox) "blackbox" "play/blackbox.el" (19277
+;;;;;;  34922))
 ;;; Generated autoloads from play/blackbox.el

 (autoload 'blackbox "blackbox" "\
@@ -1962,7 +1962,7 @@
 ;;;;;;  bookmark-save bookmark-write bookmark-delete bookmark-insert
 ;;;;;;  bookmark-rename bookmark-insert-location bookmark-relocate
 ;;;;;;  bookmark-jump-other-window bookmark-jump bookmark-set) "bookmark"
-;;;;;;  "bookmark.el" (19327 808))
+;;;;;;  "bookmark.el" (19325 42040))
 ;;; Generated autoloads from bookmark.el
  (define-key ctl-x-r-map "b" 'bookmark-jump)
  (define-key ctl-x-r-map "m" 'bookmark-set)
@@ -2169,7 +2169,7 @@
 ;;;;;;  browse-url-of-dired-file browse-url-of-buffer browse-url-of-file
 ;;;;;;  browse-url-url-at-point browse-url-galeon-program browse-url-firefox-program
 ;;;;;;  browse-url-browser-function) "browse-url" "net/browse-url.el"
-;;;;;;  (19278 4525))
+;;;;;;  (19360 14173))
 ;;; Generated autoloads from net/browse-url.el

 (defvar browse-url-browser-function (cond ((memq system-type '(windows-nt ms-dos cygwin)) 'browse-url-default-windows-browser) ((memq system-type '(darwin)) 'browse-url-default-macosx-browser) (t 'browse-url-default-browser)) "\
@@ -2499,8 +2499,8 @@

 ;;;***

-;;;### (autoloads (snarf-bruces bruce) "bruce" "play/bruce.el" (19278
-;;;;;;  4526))
+;;;### (autoloads (snarf-bruces bruce) "bruce" "play/bruce.el" (19277
+;;;;;;  34922))
 ;;; Generated autoloads from play/bruce.el

 (autoload 'bruce "bruce" "\
@@ -2516,7 +2516,7 @@
 ;;;***

 ;;;### (autoloads (bs-show bs-customize bs-cycle-previous bs-cycle-next)
-;;;;;;  "bs" "bs.el" (19278 4516))
+;;;;;;  "bs" "bs.el" (19277 34915))
 ;;; Generated autoloads from bs.el

 (autoload 'bs-cycle-next "bs" "\
@@ -2556,7 +2556,7 @@

 ;;;***

-;;;### (autoloads (bubbles) "bubbles" "play/bubbles.el" (19278 4526))
+;;;### (autoloads (bubbles) "bubbles" "play/bubbles.el" (19277 34922))
 ;;; Generated autoloads from play/bubbles.el

 (autoload 'bubbles "bubbles" "\
@@ -2578,7 +2578,7 @@
 ;;;***

 ;;;### (autoloads (bug-reference-prog-mode bug-reference-mode) "bug-reference"
-;;;;;;  "progmodes/bug-reference.el" (19278 4527))
+;;;;;;  "progmodes/bug-reference.el" (19277 34922))
 ;;; Generated autoloads from progmodes/bug-reference.el

 (put 'bug-reference-url-format 'safe-local-variable 'stringp)
@@ -2600,7 +2600,7 @@
 ;;;;;;  compile-defun byte-compile-file byte-recompile-directory
 ;;;;;;  byte-force-recompile byte-compile-enable-warning byte-compile-disable-warning
 ;;;;;;  byte-compile-warnings-safe-p) "bytecomp" "emacs-lisp/bytecomp.el"
-;;;;;;  (19321 22156))
+;;;;;;  (19277 34919))
 ;;; Generated autoloads from emacs-lisp/bytecomp.el
 (put 'byte-compile-dynamic 'safe-local-variable 'booleanp)
 (put 'byte-compile-disable-print-circle 'safe-local-variable 'booleanp)
@@ -2724,8 +2724,8 @@

 ;;;***

-;;;### (autoloads nil "cal-china" "calendar/cal-china.el" (19278
-;;;;;;  4519))
+;;;### (autoloads nil "cal-china" "calendar/cal-china.el" (19277
+;;;;;;  34917))
 ;;; Generated autoloads from calendar/cal-china.el

 (put 'calendar-chinese-time-zone 'risky-local-variable t)
@@ -2734,7 +2734,7 @@

 ;;;***

-;;;### (autoloads nil "cal-dst" "calendar/cal-dst.el" (19278 4519))
+;;;### (autoloads nil "cal-dst" "calendar/cal-dst.el" (19277 34917))
 ;;; Generated autoloads from calendar/cal-dst.el

 (put 'calendar-daylight-savings-starts 'risky-local-variable t)
@@ -2746,7 +2746,7 @@
 ;;;***

 ;;;### (autoloads (calendar-hebrew-list-yahrzeits) "cal-hebrew" "calendar/cal-hebrew.el"
-;;;;;;  (19278 4519))
+;;;;;;  (19340 9803))
 ;;; Generated autoloads from calendar/cal-hebrew.el

 (autoload 'calendar-hebrew-list-yahrzeits "cal-hebrew" "\
@@ -2762,8 +2762,8 @@

 ;;;### (autoloads (defmath calc-embedded-activate calc-embedded calc-grab-rectangle
 ;;;;;;  calc-grab-region full-calc-keypad calc-keypad calc-eval quick-calc
-;;;;;;  full-calc calc calc-dispatch) "calc" "calc/calc.el" (19283
-;;;;;;  23524))
+;;;;;;  full-calc calc calc-dispatch) "calc" "calc/calc.el" (19286
+;;;;;;  4503))
 ;;; Generated autoloads from calc/calc.el
  (define-key ctl-x-map "*" 'calc-dispatch)

@@ -2845,8 +2845,8 @@

 ;;;***

-;;;### (autoloads (calculator) "calculator" "calculator.el" (19278
-;;;;;;  4516))
+;;;### (autoloads (calculator) "calculator" "calculator.el" (19354
+;;;;;;  34807))
 ;;; Generated autoloads from calculator.el

 (autoload 'calculator "calculator" "\
@@ -2857,8 +2857,8 @@

 ;;;***

-;;;### (autoloads (calendar) "calendar" "calendar/calendar.el" (19278
-;;;;;;  4519))
+;;;### (autoloads (calendar) "calendar" "calendar/calendar.el" (19277
+;;;;;;  34918))
 ;;; Generated autoloads from calendar/calendar.el

 (autoload 'calendar "calendar" "\
@@ -2902,7 +2902,7 @@
 ;;;***

 ;;;### (autoloads (canlock-verify canlock-insert-header) "canlock"
-;;;;;;  "gnus/canlock.el" (19278 4522))
+;;;;;;  "gnus/canlock.el" (19277 34919))
 ;;; Generated autoloads from gnus/canlock.el

 (autoload 'canlock-insert-header "canlock" "\
@@ -2920,7 +2920,7 @@
 ;;;***

 ;;;### (autoloads (capitalized-words-mode) "cap-words" "progmodes/cap-words.el"
-;;;;;;  (19278 4527))
+;;;;;;  (19277 34922))
 ;;; Generated autoloads from progmodes/cap-words.el

 (autoload 'capitalized-words-mode "cap-words" "\
@@ -2955,15 +2955,15 @@

 ;;;***

-;;;### (autoloads nil "cc-compat" "progmodes/cc-compat.el" (19278
-;;;;;;  4527))
+;;;### (autoloads nil "cc-compat" "progmodes/cc-compat.el" (19277
+;;;;;;  34922))
 ;;; Generated autoloads from progmodes/cc-compat.el
 (put 'c-indent-level 'safe-local-variable 'integerp)

 ;;;***

 ;;;### (autoloads (c-guess-basic-syntax) "cc-engine" "progmodes/cc-engine.el"
-;;;;;;  (19335 6619))
+;;;;;;  (19340 34420))
 ;;; Generated autoloads from progmodes/cc-engine.el

 (autoload 'c-guess-basic-syntax "cc-engine" "\
@@ -2975,7 +2975,7 @@

 ;;;### (autoloads (pike-mode idl-mode java-mode objc-mode c++-mode
 ;;;;;;  c-mode c-initialize-cc-mode) "cc-mode" "progmodes/cc-mode.el"
-;;;;;;  (19335 6619))
+;;;;;;  (19335 21247))
 ;;; Generated autoloads from progmodes/cc-mode.el

 (autoload 'c-initialize-cc-mode "cc-mode" "\
@@ -3135,7 +3135,7 @@
 ;;;***

 ;;;### (autoloads (c-set-offset c-add-style c-set-style) "cc-styles"
-;;;;;;  "progmodes/cc-styles.el" (19278 4527))
+;;;;;;  "progmodes/cc-styles.el" (19277 34922))
 ;;; Generated autoloads from progmodes/cc-styles.el

 (autoload 'c-set-style "cc-styles" "\
@@ -3186,7 +3186,7 @@

 ;;;***

-;;;### (autoloads nil "cc-vars" "progmodes/cc-vars.el" (19278 4527))
+;;;### (autoloads nil "cc-vars" "progmodes/cc-vars.el" (19277 34922))
 ;;; Generated autoloads from progmodes/cc-vars.el
 (put 'c-basic-offset 'safe-local-variable 'integerp)
 (put 'c-backslash-column 'safe-local-variable 'integerp)
@@ -3196,7 +3196,7 @@

 ;;;### (autoloads (ccl-execute-with-args check-ccl-program define-ccl-program
 ;;;;;;  declare-ccl-program ccl-dump ccl-compile) "ccl" "international/ccl.el"
-;;;;;;  (19278 4524))
+;;;;;;  (19277 34920))
 ;;; Generated autoloads from international/ccl.el

 (autoload 'ccl-compile "ccl" "\
@@ -3455,7 +3455,7 @@
 ;;;***

 ;;;### (autoloads (cfengine-mode) "cfengine" "progmodes/cfengine.el"
-;;;;;;  (19278 4527))
+;;;;;;  (19277 34922))
 ;;; Generated autoloads from progmodes/cfengine.el

 (autoload 'cfengine-mode "cfengine" "\
@@ -3470,7 +3470,7 @@
 ;;;***

 ;;;### (autoloads (check-declare-directory check-declare-file) "check-declare"
-;;;;;;  "emacs-lisp/check-declare.el" (19278 4521))
+;;;;;;  "emacs-lisp/check-declare.el" (19277 34919))
 ;;; Generated autoloads from emacs-lisp/check-declare.el

 (autoload 'check-declare-file "check-declare" "\
@@ -3495,7 +3495,7 @@
 ;;;;;;  checkdoc-comments checkdoc-continue checkdoc-start checkdoc-current-buffer
 ;;;;;;  checkdoc-eval-current-buffer checkdoc-message-interactive
 ;;;;;;  checkdoc-interactive checkdoc checkdoc-list-of-strings-p)
-;;;;;;  "checkdoc" "emacs-lisp/checkdoc.el" (19278 4521))
+;;;;;;  "checkdoc" "emacs-lisp/checkdoc.el" (19277 34919))
 ;;; Generated autoloads from emacs-lisp/checkdoc.el
 (put 'checkdoc-force-docstrings-flag 'safe-local-variable 'booleanp)
 (put 'checkdoc-force-history-flag 'safe-local-variable 'booleanp)
@@ -3690,7 +3690,7 @@

 ;;;### (autoloads (pre-write-encode-hz post-read-decode-hz encode-hz-buffer
 ;;;;;;  encode-hz-region decode-hz-buffer decode-hz-region) "china-util"
-;;;;;;  "language/china-util.el" (19278 4524))
+;;;;;;  "language/china-util.el" (19277 34920))
 ;;; Generated autoloads from language/china-util.el

 (autoload 'decode-hz-region "china-util" "\
@@ -3728,7 +3728,7 @@
 ;;;***

 ;;;### (autoloads (command-history list-command-history repeat-matching-complex-command)
-;;;;;;  "chistory" "chistory.el" (19278 4516))
+;;;;;;  "chistory" "chistory.el" (19277 34915))
 ;;; Generated autoloads from chistory.el

 (autoload 'repeat-matching-complex-command "chistory" "\
@@ -3767,7 +3767,7 @@

 ;;;***

-;;;### (autoloads nil "cl" "emacs-lisp/cl.el" (19278 4521))
+;;;### (autoloads nil "cl" "emacs-lisp/cl.el" (19277 34919))
 ;;; Generated autoloads from emacs-lisp/cl.el

 (defvar custom-print-functions nil "\
@@ -3783,7 +3783,7 @@
 ;;;***

 ;;;### (autoloads (common-lisp-indent-function) "cl-indent" "emacs-lisp/cl-indent.el"
-;;;;;;  (19278 4521))
+;;;;;;  (19277 34919))
 ;;; Generated autoloads from emacs-lisp/cl-indent.el

 (autoload 'common-lisp-indent-function "cl-indent" "\
@@ -3862,7 +3862,7 @@
 ;;;***

 ;;;### (autoloads (c-macro-expand) "cmacexp" "progmodes/cmacexp.el"
-;;;;;;  (19278 4527))
+;;;;;;  (19277 34922))
 ;;; Generated autoloads from progmodes/cmacexp.el

 (autoload 'c-macro-expand "cmacexp" "\
@@ -3882,8 +3882,8 @@

 ;;;***

-;;;### (autoloads (run-scheme) "cmuscheme" "cmuscheme.el" (19278
-;;;;;;  4516))
+;;;### (autoloads (run-scheme) "cmuscheme" "cmuscheme.el" (19277
+;;;;;;  34915))
 ;;; Generated autoloads from cmuscheme.el

 (autoload 'run-scheme "cmuscheme" "\
@@ -3907,7 +3907,7 @@
 ;;;### (autoloads (comint-redirect-results-list-from-process comint-redirect-results-list
 ;;;;;;  comint-redirect-send-command-to-process comint-redirect-send-command
 ;;;;;;  comint-run make-comint make-comint-in-buffer) "comint" "comint.el"
-;;;;;;  (19278 4516))
+;;;;;;  (19277 34915))
 ;;; Generated autoloads from comint.el

 (defvar comint-output-filter-functions '(comint-postoutput-scroll-to-bottom comint-watch-for-password-prompt) "\
@@ -3999,8 +3999,8 @@

 ;;;***

-;;;### (autoloads (compare-windows) "compare-w" "compare-w.el" (19278
-;;;;;;  4516))
+;;;### (autoloads (compare-windows) "compare-w" "compare-w.el" (19277
+;;;;;;  34915))
 ;;; Generated autoloads from compare-w.el

 (autoload 'compare-windows "compare-w" "\
@@ -4037,8 +4037,8 @@
 ;;;;;;  compilation-shell-minor-mode compilation-mode compilation-start
 ;;;;;;  compile compilation-disable-input compile-command compilation-search-path
 ;;;;;;  compilation-ask-about-save compilation-window-height compilation-start-hook
-;;;;;;  compilation-mode-hook) "compile" "progmodes/compile.el" (19327
-;;;;;;  59567))
+;;;;;;  compilation-mode-hook) "compile" "progmodes/compile.el" (19328
+;;;;;;  18581))
 ;;; Generated autoloads from progmodes/compile.el

 (defvar compilation-mode-hook nil "\
@@ -4216,7 +4216,7 @@
 ;;;***

 ;;;### (autoloads (partial-completion-mode) "complete" "complete.el"
-;;;;;;  (19278 4516))
+;;;;;;  (19360 14173))
 ;;; Generated autoloads from complete.el

 (defvar partial-completion-mode nil "\
@@ -4258,7 +4258,7 @@
 ;;;***

 ;;;### (autoloads (dynamic-completion-mode) "completion" "completion.el"
-;;;;;;  (19278 4516))
+;;;;;;  (19277 34915))
 ;;; Generated autoloads from completion.el

 (defvar dynamic-completion-mode nil "\
@@ -4280,7 +4280,7 @@
 ;;;### (autoloads (conf-xdefaults-mode conf-ppd-mode conf-colon-mode
 ;;;;;;  conf-space-keywords conf-space-mode conf-javaprop-mode conf-windows-mode
 ;;;;;;  conf-unix-mode conf-mode) "conf-mode" "textmodes/conf-mode.el"
-;;;;;;  (19278 4528))
+;;;;;;  (19277 34923))
 ;;; Generated autoloads from textmodes/conf-mode.el

 (autoload 'conf-mode "conf-mode" "\
@@ -4436,7 +4436,7 @@
 ;;;***

 ;;;### (autoloads (shuffle-vector cookie-snarf cookie-insert cookie)
-;;;;;;  "cookie1" "play/cookie1.el" (19278 4527))
+;;;;;;  "cookie1" "play/cookie1.el" (19277 34922))
 ;;; Generated autoloads from play/cookie1.el

 (autoload 'cookie "cookie1" "\
@@ -4468,8 +4468,8 @@
 ;;;***

 ;;;### (autoloads (copyright-update-directory copyright copyright-fix-years
-;;;;;;  copyright-update) "copyright" "emacs-lisp/copyright.el" (19278
-;;;;;;  4521))
+;;;;;;  copyright-update) "copyright" "emacs-lisp/copyright.el" (19277
+;;;;;;  34919))
 ;;; Generated autoloads from emacs-lisp/copyright.el

 (autoload 'copyright-update "copyright" "\
@@ -4502,7 +4502,7 @@
 ;;;***

 ;;;### (autoloads (cperl-perldoc-at-point cperl-perldoc cperl-mode)
-;;;;;;  "cperl-mode" "progmodes/cperl-mode.el" (19278 4527))
+;;;;;;  "cperl-mode" "progmodes/cperl-mode.el" (19277 34922))
 ;;; Generated autoloads from progmodes/cperl-mode.el
 (put 'cperl-indent-level 'safe-local-variable 'integerp)
 (put 'cperl-brace-offset 'safe-local-variable 'integerp)
@@ -4701,7 +4701,7 @@
 ;;;***

 ;;;### (autoloads (cpp-parse-edit cpp-highlight-buffer) "cpp" "progmodes/cpp.el"
-;;;;;;  (19278 4527))
+;;;;;;  (19277 34922))
 ;;; Generated autoloads from progmodes/cpp.el

 (autoload 'cpp-highlight-buffer "cpp" "\
@@ -4720,7 +4720,7 @@
 ;;;***

 ;;;### (autoloads (crisp-mode crisp-mode) "crisp" "emulation/crisp.el"
-;;;;;;  (19278 4522))
+;;;;;;  (19277 34919))
 ;;; Generated autoloads from emulation/crisp.el

 (defvar crisp-mode nil "\
@@ -4744,7 +4744,7 @@
 ;;;***

 ;;;### (autoloads (completing-read-multiple) "crm" "emacs-lisp/crm.el"
-;;;;;;  (19278 4521))
+;;;;;;  (19277 34919))
 ;;; Generated autoloads from emacs-lisp/crm.el

 (autoload 'completing-read-multiple "crm" "\
@@ -4779,8 +4779,8 @@

 ;;;***

-;;;### (autoloads (css-mode) "css-mode" "textmodes/css-mode.el" (19278
-;;;;;;  4528))
+;;;### (autoloads (css-mode) "css-mode" "textmodes/css-mode.el" (19277
+;;;;;;  34923))
 ;;; Generated autoloads from textmodes/css-mode.el
  (add-to-list 'auto-mode-alist (cons (purecopy "\\.css\\'") 'css-mode))

@@ -4792,7 +4792,7 @@
 ;;;***

 ;;;### (autoloads (cua-selection-mode cua-mode) "cua-base" "emulation/cua-base.el"
-;;;;;;  (19278 4522))
+;;;;;;  (19277 34919))
 ;;; Generated autoloads from emulation/cua-base.el

 (defvar cua-mode nil "\
@@ -4851,7 +4851,7 @@
 ;;;;;;  customize-mode customize customize-save-variable customize-set-variable
 ;;;;;;  customize-set-value custom-menu-sort-alphabetically custom-buffer-sort-alphabetically
 ;;;;;;  custom-browse-sort-alphabetically) "cus-edit" "cus-edit.el"
-;;;;;;  (19322 14239))
+;;;;;;  (19360 14173))
 ;;; Generated autoloads from cus-edit.el

 (defvar custom-browse-sort-alphabetically nil "\
@@ -4859,8 +4859,8 @@

 (custom-autoload 'custom-browse-sort-alphabetically "cus-edit" t)

-(defvar custom-buffer-sort-alphabetically nil "\
-If non-nil, sort each customization group alphabetically in Custom buffer.")
+(defvar custom-buffer-sort-alphabetically t "\
+Whether to sort customization groups alphabetically in Custom buffer.")

 (custom-autoload 'custom-buffer-sort-alphabetically "cus-edit" t)

@@ -5036,15 +5036,20 @@
 \(fn)" t nil)

 (autoload 'customize-apropos "cus-edit" "\
-Customize all loaded options, faces and groups matching REGEXP.
-If ALL is `options', include only options.
-If ALL is `faces', include only faces.
-If ALL is `groups', include only groups.
-If ALL is t (interactively, with prefix arg), include variables
+Customize all loaded options, faces and groups matching PATTERN.
+PATTERN can be a word, a list of words (separated by spaces),
+or a regexp (using some regexp special characters).  If it is a word,
+search for matches for that word as a substring.  If it is a list of words,
+search for matches for any two (or more) of those words.
+
+If TYPE is `options', include only options.
+If TYPE is `faces', include only faces.
+If TYPE is `groups', include only groups.
+If TYPE is t (interactively, with prefix arg), include variables
 that are not customizable options, as well as faces and groups
 \(but we recommend using `apropos-variable' instead).

-\(fn REGEXP &optional ALL)" t nil)
+\(fn PATTERN &optional TYPE)" t nil)

 (autoload 'customize-apropos-options "cus-edit" "\
 Customize all loaded customizable options matching REGEXP.
@@ -5149,7 +5154,7 @@
 ;;;***

 ;;;### (autoloads (customize-create-theme) "cus-theme" "cus-theme.el"
-;;;;;;  (19278 4516))
+;;;;;;  (19277 34915))
 ;;; Generated autoloads from cus-theme.el

 (autoload 'customize-create-theme "cus-theme" "\
@@ -5160,7 +5165,7 @@
 ;;;***

 ;;;### (autoloads (cvs-status-mode) "cvs-status" "cvs-status.el"
-;;;;;;  (19278 4516))
+;;;;;;  (19277 34915))
 ;;; Generated autoloads from cvs-status.el

 (autoload 'cvs-status-mode "cvs-status" "\
@@ -5171,7 +5176,7 @@
 ;;;***

 ;;;### (autoloads (global-cwarn-mode turn-on-cwarn-mode cwarn-mode)
-;;;;;;  "cwarn" "progmodes/cwarn.el" (19278 4527))
+;;;;;;  "cwarn" "progmodes/cwarn.el" (19277 34922))
 ;;; Generated autoloads from progmodes/cwarn.el

 (autoload 'cwarn-mode "cwarn" "\
@@ -5218,7 +5223,7 @@

 ;;;### (autoloads (standard-display-cyrillic-translit cyrillic-encode-alternativnyj-char
 ;;;;;;  cyrillic-encode-koi8-r-char) "cyril-util" "language/cyril-util.el"
-;;;;;;  (19278 4524))
+;;;;;;  (19277 34920))
 ;;; Generated autoloads from language/cyril-util.el

 (autoload 'cyrillic-encode-koi8-r-char "cyril-util" "\
@@ -5247,7 +5252,7 @@
 ;;;***

 ;;;### (autoloads (dabbrev-expand dabbrev-completion) "dabbrev" "dabbrev.el"
-;;;;;;  (19278 4516))
+;;;;;;  (19277 34915))
 ;;; Generated autoloads from dabbrev.el
 (put 'dabbrev-case-fold-search 'risky-local-variable t)
 (put 'dabbrev-case-replace 'risky-local-variable t)
@@ -5294,7 +5299,7 @@
 ;;;***

 ;;;### (autoloads (data-debug-new-buffer) "data-debug" "cedet/data-debug.el"
-;;;;;;  (19322 12063))
+;;;;;;  (19324 55755))
 ;;; Generated autoloads from cedet/data-debug.el

 (autoload 'data-debug-new-buffer "data-debug" "\
@@ -5304,8 +5309,8 @@

 ;;;***

-;;;### (autoloads (dbus-handle-event) "dbus" "net/dbus.el" (19278
-;;;;;;  4525))
+;;;### (autoloads (dbus-handle-event) "dbus" "net/dbus.el" (19339
+;;;;;;  10551))
 ;;; Generated autoloads from net/dbus.el

 (autoload 'dbus-handle-event "dbus" "\
@@ -5318,8 +5323,8 @@

 ;;;***

-;;;### (autoloads (dcl-mode) "dcl-mode" "progmodes/dcl-mode.el" (19278
-;;;;;;  4527))
+;;;### (autoloads (dcl-mode) "dcl-mode" "progmodes/dcl-mode.el" (19277
+;;;;;;  34922))
 ;;; Generated autoloads from progmodes/dcl-mode.el

 (autoload 'dcl-mode "dcl-mode" "\
@@ -5446,7 +5451,7 @@
 ;;;***

 ;;;### (autoloads (cancel-debug-on-entry debug-on-entry debug) "debug"
-;;;;;;  "emacs-lisp/debug.el" (19278 4521))
+;;;;;;  "emacs-lisp/debug.el" (19277 34919))
 ;;; Generated autoloads from emacs-lisp/debug.el

 (setq debugger 'debug)
@@ -5490,7 +5495,7 @@
 ;;;***

 ;;;### (autoloads (decipher-mode decipher) "decipher" "play/decipher.el"
-;;;;;;  (19278 4527))
+;;;;;;  (19277 34922))
 ;;; Generated autoloads from play/decipher.el

 (autoload 'decipher "decipher" "\
@@ -5519,8 +5524,8 @@
 ;;;***

 ;;;### (autoloads (delimit-columns-rectangle delimit-columns-region
-;;;;;;  delimit-columns-customize) "delim-col" "delim-col.el" (19322
-;;;;;;  12603))
+;;;;;;  delimit-columns-customize) "delim-col" "delim-col.el" (19324
+;;;;;;  55755))
 ;;; Generated autoloads from delim-col.el

 (autoload 'delimit-columns-customize "delim-col" "\
@@ -5545,7 +5550,7 @@
 ;;;***

 ;;;### (autoloads (delphi-mode) "delphi" "progmodes/delphi.el" (19279
-;;;;;;  36173))
+;;;;;;  53114))
 ;;; Generated autoloads from progmodes/delphi.el

 (autoload 'delphi-mode "delphi" "\
@@ -5596,8 +5601,8 @@

 ;;;***

-;;;### (autoloads (delete-selection-mode) "delsel" "delsel.el" (19278
-;;;;;;  4516))
+;;;### (autoloads (delete-selection-mode) "delsel" "delsel.el" (19277
+;;;;;;  34915))
 ;;; Generated autoloads from delsel.el

 (defalias 'pending-delete-mode 'delete-selection-mode)
@@ -5626,7 +5631,7 @@
 ;;;***

 ;;;### (autoloads (derived-mode-init-mode-variables define-derived-mode)
-;;;;;;  "derived" "emacs-lisp/derived.el" (19278 4521))
+;;;;;;  "derived" "emacs-lisp/derived.el" (19277 34919))
 ;;; Generated autoloads from emacs-lisp/derived.el

 (autoload 'define-derived-mode "derived" "\
@@ -5691,7 +5696,7 @@
 ;;;***

 ;;;### (autoloads (describe-char describe-text-properties) "descr-text"
-;;;;;;  "descr-text.el" (19278 4516))
+;;;;;;  "descr-text.el" (19277 34915))
 ;;; Generated autoloads from descr-text.el

 (autoload 'describe-text-properties "descr-text" "\
@@ -5719,7 +5724,7 @@
 ;;;### (autoloads (desktop-revert desktop-save-in-desktop-dir desktop-change-dir
 ;;;;;;  desktop-load-default desktop-read desktop-remove desktop-save
 ;;;;;;  desktop-clear desktop-locals-to-save desktop-save-mode) "desktop"
-;;;;;;  "desktop.el" (19278 4516))
+;;;;;;  "desktop.el" (19277 34915))
 ;;; Generated autoloads from desktop.el

 (defvar desktop-save-mode nil "\
@@ -5903,7 +5908,7 @@

 ;;;### (autoloads (gnus-article-outlook-deuglify-article gnus-outlook-deuglify-article
 ;;;;;;  gnus-article-outlook-repair-attribution gnus-article-outlook-unwrap-lines)
-;;;;;;  "deuglify" "gnus/deuglify.el" (19278 4522))
+;;;;;;  "deuglify" "gnus/deuglify.el" (19277 34919))
 ;;; Generated autoloads from gnus/deuglify.el

 (autoload 'gnus-article-outlook-unwrap-lines "deuglify" "\
@@ -5936,7 +5941,7 @@
 ;;;***

 ;;;### (autoloads (diary-mode diary-mail-entries diary) "diary-lib"
-;;;;;;  "calendar/diary-lib.el" (19295 48190))
+;;;;;;  "calendar/diary-lib.el" (19295 48708))
 ;;; Generated autoloads from calendar/diary-lib.el

 (autoload 'diary "diary-lib" "\
@@ -5979,7 +5984,7 @@
 ;;;***

 ;;;### (autoloads (diff-backup diff diff-command diff-switches) "diff"
-;;;;;;  "diff.el" (19278 4516))
+;;;;;;  "diff.el" (19277 34915))
 ;;; Generated autoloads from diff.el

 (defvar diff-switches (purecopy "-c") "\
@@ -6017,7 +6022,7 @@
 ;;;***

 ;;;### (autoloads (diff-minor-mode diff-mode) "diff-mode" "diff-mode.el"
-;;;;;;  (19278 4516))
+;;;;;;  (19354 34807))
 ;;; Generated autoloads from diff-mode.el

 (autoload 'diff-mode "diff-mode" "\
@@ -6045,7 +6050,7 @@

 ;;;***

-;;;### (autoloads (dig) "dig" "net/dig.el" (19278 4525))
+;;;### (autoloads (dig) "dig" "net/dig.el" (19277 34921))
 ;;; Generated autoloads from net/dig.el

 (autoload 'dig "dig" "\
@@ -6058,7 +6063,7 @@

 ;;;### (autoloads (dired-mode dired-auto-revert-buffer dired-noselect
 ;;;;;;  dired-other-frame dired-other-window dired dired-trivial-filenames
-;;;;;;  dired-listing-switches) "dired" "dired.el" (19307 36715))
+;;;;;;  dired-listing-switches) "dired" "dired.el" (19307 9881))
 ;;; Generated autoloads from dired.el

 (defvar dired-listing-switches (purecopy "-al") "\
@@ -6203,7 +6208,7 @@
 ;;;***

 ;;;### (autoloads (dirtrack dirtrack-mode) "dirtrack" "dirtrack.el"
-;;;;;;  (19299 12748))
+;;;;;;  (19299 41380))
 ;;; Generated autoloads from dirtrack.el

 (autoload 'dirtrack-mode "dirtrack" "\
@@ -6229,8 +6234,8 @@

 ;;;***

-;;;### (autoloads (disassemble) "disass" "emacs-lisp/disass.el" (19278
-;;;;;;  4521))
+;;;### (autoloads (disassemble) "disass" "emacs-lisp/disass.el" (19277
+;;;;;;  34919))
 ;;; Generated autoloads from emacs-lisp/disass.el

 (autoload 'disassemble "disass" "\
@@ -6249,7 +6254,7 @@
 ;;;;;;  standard-display-g1 standard-display-ascii standard-display-default
 ;;;;;;  standard-display-8bit describe-current-display-table describe-display-table
 ;;;;;;  set-display-table-slot display-table-slot make-display-table)
-;;;;;;  "disp-table" "disp-table.el" (19278 4516))
+;;;;;;  "disp-table" "disp-table.el" (19277 34916))
 ;;; Generated autoloads from disp-table.el

 (autoload 'make-display-table "disp-table" "\
@@ -6361,7 +6366,7 @@
 ;;;***

 ;;;### (autoloads (dissociated-press) "dissociate" "play/dissociate.el"
-;;;;;;  (19278 4527))
+;;;;;;  (19277 34922))
 ;;; Generated autoloads from play/dissociate.el

 (autoload 'dissociated-press "dissociate" "\
@@ -6377,7 +6382,7 @@

 ;;;***

-;;;### (autoloads (dnd-protocol-alist) "dnd" "dnd.el" (19278 4516))
+;;;### (autoloads (dnd-protocol-alist) "dnd" "dnd.el" (19277 34916))
 ;;; Generated autoloads from dnd.el

 (defvar dnd-protocol-alist `((,(purecopy "^file:///") . dnd-open-local-file) (,(purecopy "^file://") . dnd-open-file) (,(purecopy "^file:") . dnd-open-local-file) (,(purecopy "^\\(https?\\|ftp\\|file\\|nfs\\)://") . dnd-open-file)) "\
@@ -6398,7 +6403,7 @@
 ;;;***

 ;;;### (autoloads (dns-mode-soa-increment-serial dns-mode) "dns-mode"
-;;;;;;  "textmodes/dns-mode.el" (19278 4528))
+;;;;;;  "textmodes/dns-mode.el" (19277 34923))
 ;;; Generated autoloads from textmodes/dns-mode.el

 (autoload 'dns-mode "dns-mode" "\
@@ -6423,7 +6428,7 @@
 ;;;***

 ;;;### (autoloads (doc-view-bookmark-jump doc-view-minor-mode doc-view-mode
-;;;;;;  doc-view-mode-p) "doc-view" "doc-view.el" (19322 12465))
+;;;;;;  doc-view-mode-p) "doc-view" "doc-view.el" (19324 55755))
 ;;; Generated autoloads from doc-view.el

 (autoload 'doc-view-mode-p "doc-view" "\
@@ -6458,7 +6463,7 @@

 ;;;***

-;;;### (autoloads (doctor) "doctor" "play/doctor.el" (19278 4527))
+;;;### (autoloads (doctor) "doctor" "play/doctor.el" (19277 34922))
 ;;; Generated autoloads from play/doctor.el

 (autoload 'doctor "doctor" "\
@@ -6468,7 +6473,7 @@

 ;;;***

-;;;### (autoloads (double-mode) "double" "double.el" (19278 4516))
+;;;### (autoloads (double-mode) "double" "double.el" (19277 34916))
 ;;; Generated autoloads from double.el

 (autoload 'double-mode "double" "\
@@ -6483,7 +6488,7 @@

 ;;;***

-;;;### (autoloads (dunnet) "dunnet" "play/dunnet.el" (19278 4527))
+;;;### (autoloads (dunnet) "dunnet" "play/dunnet.el" (19277 34922))
 ;;; Generated autoloads from play/dunnet.el

 (autoload 'dunnet "dunnet" "\
@@ -6494,7 +6499,7 @@
 ;;;***

 ;;;### (autoloads (gnus-earcon-display) "earcon" "gnus/earcon.el"
-;;;;;;  (19278 4522))
+;;;;;;  (19277 34919))
 ;;; Generated autoloads from gnus/earcon.el

 (autoload 'gnus-earcon-display "earcon" "\
@@ -6506,7 +6511,7 @@

 ;;;### (autoloads (easy-mmode-defsyntax easy-mmode-defmap easy-mmode-define-keymap
 ;;;;;;  define-globalized-minor-mode define-minor-mode) "easy-mmode"
-;;;;;;  "emacs-lisp/easy-mmode.el" (19278 4521))
+;;;;;;  "emacs-lisp/easy-mmode.el" (19277 34919))
 ;;; Generated autoloads from emacs-lisp/easy-mmode.el

 (defalias 'easy-mmode-define-minor-mode 'define-minor-mode)
@@ -6611,8 +6616,8 @@
 ;;;***

 ;;;### (autoloads (easy-menu-change easy-menu-create-menu easy-menu-do-define
-;;;;;;  easy-menu-define) "easymenu" "emacs-lisp/easymenu.el" (19278
-;;;;;;  4521))
+;;;;;;  easy-menu-define) "easymenu" "emacs-lisp/easymenu.el" (19277
+;;;;;;  34919))
 ;;; Generated autoloads from emacs-lisp/easymenu.el

 (put 'easy-menu-define 'lisp-indent-function 'defun)
@@ -6766,7 +6771,7 @@
 ;;;;;;  ebnf-eps-file ebnf-eps-directory ebnf-spool-region ebnf-spool-buffer
 ;;;;;;  ebnf-spool-file ebnf-spool-directory ebnf-print-region ebnf-print-buffer
 ;;;;;;  ebnf-print-file ebnf-print-directory ebnf-customize) "ebnf2ps"
-;;;;;;  "progmodes/ebnf2ps.el" (19278 4527))
+;;;;;;  "progmodes/ebnf2ps.el" (19277 34922))
 ;;; Generated autoloads from progmodes/ebnf2ps.el

 (autoload 'ebnf-customize "ebnf2ps" "\
@@ -7040,8 +7045,8 @@
 ;;;;;;  ebrowse-tags-find-declaration-other-window ebrowse-tags-find-definition
 ;;;;;;  ebrowse-tags-view-definition ebrowse-tags-find-declaration
 ;;;;;;  ebrowse-tags-view-declaration ebrowse-member-mode ebrowse-electric-choose-tree
-;;;;;;  ebrowse-tree-mode) "ebrowse" "progmodes/ebrowse.el" (19278
-;;;;;;  4527))
+;;;;;;  ebrowse-tree-mode) "ebrowse" "progmodes/ebrowse.el" (19277
+;;;;;;  34922))
 ;;; Generated autoloads from progmodes/ebrowse.el

 (autoload 'ebrowse-tree-mode "ebrowse" "\
@@ -7192,7 +7197,7 @@
 ;;;***

 ;;;### (autoloads (electric-buffer-list) "ebuff-menu" "ebuff-menu.el"
-;;;;;;  (19278 4516))
+;;;;;;  (19277 34916))
 ;;; Generated autoloads from ebuff-menu.el

 (autoload 'electric-buffer-list "ebuff-menu" "\
@@ -7217,7 +7222,7 @@
 ;;;***

 ;;;### (autoloads (Electric-command-history-redo-expression) "echistory"
-;;;;;;  "echistory.el" (19278 4516))
+;;;;;;  "echistory.el" (19277 34916))
 ;;; Generated autoloads from echistory.el

 (autoload 'Electric-command-history-redo-expression "echistory" "\
@@ -7229,7 +7234,7 @@
 ;;;***

 ;;;### (autoloads (ecomplete-setup) "ecomplete" "gnus/ecomplete.el"
-;;;;;;  (19278 4522))
+;;;;;;  (19277 34919))
 ;;; Generated autoloads from gnus/ecomplete.el

 (autoload 'ecomplete-setup "ecomplete" "\
@@ -7239,7 +7244,7 @@

 ;;;***

-;;;### (autoloads (global-ede-mode) "ede" "cedet/ede.el" (19322 43174))
+;;;### (autoloads (global-ede-mode) "ede" "cedet/ede.el" (19324 55755))
 ;;; Generated autoloads from cedet/ede.el

 (defvar global-ede-mode nil "\
@@ -7265,7 +7270,7 @@

 ;;;### (autoloads (edebug-all-forms edebug-all-defs edebug-eval-top-level-form
 ;;;;;;  edebug-basic-spec edebug-all-forms edebug-all-defs) "edebug"
-;;;;;;  "emacs-lisp/edebug.el" (19278 4521))
+;;;;;;  "emacs-lisp/edebug.el" (19277 34919))
 ;;; Generated autoloads from emacs-lisp/edebug.el

 (defvar edebug-all-defs nil "\
@@ -7338,7 +7343,7 @@
 ;;;;;;  ediff-merge-directories-with-ancestor ediff-merge-directories
 ;;;;;;  ediff-directories3 ediff-directory-revisions ediff-directories
 ;;;;;;  ediff-buffers3 ediff-buffers ediff-backup ediff-current-file
-;;;;;;  ediff-files3 ediff-files) "ediff" "ediff.el" (19278 4516))
+;;;;;;  ediff-files3 ediff-files) "ediff" "ediff.el" (19277 34916))
 ;;; Generated autoloads from ediff.el

 (autoload 'ediff-files "ediff" "\
@@ -7570,7 +7575,7 @@
 ;;;***

 ;;;### (autoloads (ediff-customize) "ediff-help" "ediff-help.el"
-;;;;;;  (19278 4516))
+;;;;;;  (19277 34916))
 ;;; Generated autoloads from ediff-help.el

 (autoload 'ediff-customize "ediff-help" "\
@@ -7581,7 +7586,7 @@
 ;;;***

 ;;;### (autoloads (ediff-show-registry) "ediff-mult" "ediff-mult.el"
-;;;;;;  (19278 4516))
+;;;;;;  (19277 34916))
 ;;; Generated autoloads from ediff-mult.el

 (autoload 'ediff-show-registry "ediff-mult" "\
@@ -7594,7 +7599,7 @@
 ;;;***

 ;;;### (autoloads (ediff-toggle-use-toolbar ediff-toggle-multiframe)
-;;;;;;  "ediff-util" "ediff-util.el" (19307 36715))
+;;;;;;  "ediff-util" "ediff-util.el" (19304 58663))
 ;;; Generated autoloads from ediff-util.el

 (autoload 'ediff-toggle-multiframe "ediff-util" "\
@@ -7615,7 +7620,7 @@

 ;;;### (autoloads (format-kbd-macro read-kbd-macro edit-named-kbd-macro
 ;;;;;;  edit-last-kbd-macro edit-kbd-macro) "edmacro" "edmacro.el"
-;;;;;;  (19278 4516))
+;;;;;;  (19277 34916))
 ;;; Generated autoloads from edmacro.el

 (defvar edmacro-eight-bits nil "\
@@ -7668,7 +7673,7 @@
 ;;;***

 ;;;### (autoloads (edt-emulation-on edt-set-scroll-margins) "edt"
-;;;;;;  "emulation/edt.el" (19281 63740))
+;;;;;;  "emulation/edt.el" (19280 45063))
 ;;; Generated autoloads from emulation/edt.el

 (autoload 'edt-set-scroll-margins "edt" "\
@@ -7686,7 +7691,7 @@
 ;;;***

 ;;;### (autoloads (electric-helpify with-electric-help) "ehelp" "ehelp.el"
-;;;;;;  (19278 4516))
+;;;;;;  (19277 34916))
 ;;; Generated autoloads from ehelp.el

 (autoload 'with-electric-help "ehelp" "\
@@ -7723,7 +7728,7 @@
 ;;;***

 ;;;### (autoloads (turn-on-eldoc-mode eldoc-mode eldoc-minor-mode-string)
-;;;;;;  "eldoc" "emacs-lisp/eldoc.el" (19278 4521))
+;;;;;;  "eldoc" "emacs-lisp/eldoc.el" (19277 34919))
 ;;; Generated autoloads from emacs-lisp/eldoc.el

 (defvar eldoc-minor-mode-string (purecopy " ElDoc") "\
@@ -7766,8 +7771,8 @@

 ;;;***

-;;;### (autoloads (elide-head) "elide-head" "elide-head.el" (19278
-;;;;;;  4516))
+;;;### (autoloads (elide-head) "elide-head" "elide-head.el" (19277
+;;;;;;  34916))
 ;;; Generated autoloads from elide-head.el

 (autoload 'elide-head "elide-head" "\
@@ -7784,7 +7789,7 @@

 ;;;### (autoloads (elint-initialize elint-defun elint-current-buffer
 ;;;;;;  elint-directory elint-file) "elint" "emacs-lisp/elint.el"
-;;;;;;  (19322 43174))
+;;;;;;  (19339 10551))
 ;;; Generated autoloads from emacs-lisp/elint.el

 (autoload 'elint-file "elint" "\
@@ -7820,8 +7825,8 @@
 ;;;***

 ;;;### (autoloads (elp-results elp-instrument-package elp-instrument-list
-;;;;;;  elp-instrument-function) "elp" "emacs-lisp/elp.el" (19278
-;;;;;;  4521))
+;;;;;;  elp-instrument-function) "elp" "emacs-lisp/elp.el" (19277
+;;;;;;  34919))
 ;;; Generated autoloads from emacs-lisp/elp.el

 (autoload 'elp-instrument-function "elp" "\
@@ -7856,7 +7861,7 @@
 ;;;***

 ;;;### (autoloads (report-emacs-bug) "emacsbug" "mail/emacsbug.el"
-;;;;;;  (19276 36114))
+;;;;;;  (19361 52486))
 ;;; Generated autoloads from mail/emacsbug.el

 (autoload 'report-emacs-bug "emacsbug" "\
@@ -7871,7 +7876,7 @@
 ;;;;;;  emerge-revisions emerge-files-with-ancestor-remote emerge-files-remote
 ;;;;;;  emerge-files-with-ancestor-command emerge-files-command emerge-buffers-with-ancestor
 ;;;;;;  emerge-buffers emerge-files-with-ancestor emerge-files) "emerge"
-;;;;;;  "emerge.el" (19259 35415))
+;;;;;;  "emerge.el" (19267 61658))
 ;;; Generated autoloads from emerge.el

 (autoload 'emerge-files "emerge" "\
@@ -7932,7 +7937,7 @@
 ;;;***

 ;;;### (autoloads (enriched-decode enriched-encode enriched-mode)
-;;;;;;  "enriched" "textmodes/enriched.el" (19278 4528))
+;;;;;;  "enriched" "textmodes/enriched.el" (19277 34923))
 ;;; Generated autoloads from textmodes/enriched.el

 (autoload 'enriched-mode "enriched" "\
@@ -7967,8 +7972,8 @@
 ;;;;;;  epa-sign-region epa-verify-cleartext-in-region epa-verify-region
 ;;;;;;  epa-decrypt-armor-in-region epa-decrypt-region epa-encrypt-file
 ;;;;;;  epa-sign-file epa-verify-file epa-decrypt-file epa-select-keys
-;;;;;;  epa-list-secret-keys epa-list-keys) "epa" "epa.el" (19278
-;;;;;;  4516))
+;;;;;;  epa-list-secret-keys epa-list-keys) "epa" "epa.el" (19277
+;;;;;;  34916))
 ;;; Generated autoloads from epa.el

 (autoload 'epa-list-keys "epa" "\
@@ -8141,7 +8146,7 @@
 ;;;***

 ;;;### (autoloads (epa-dired-do-encrypt epa-dired-do-sign epa-dired-do-verify
-;;;;;;  epa-dired-do-decrypt) "epa-dired" "epa-dired.el" (19278 4516))
+;;;;;;  epa-dired-do-decrypt) "epa-dired" "epa-dired.el" (19277 34916))
 ;;; Generated autoloads from epa-dired.el

 (autoload 'epa-dired-do-decrypt "epa-dired" "\
@@ -8167,7 +8172,7 @@
 ;;;***

 ;;;### (autoloads (epa-file-disable epa-file-enable epa-file-handler)
-;;;;;;  "epa-file" "epa-file.el" (19278 4516))
+;;;;;;  "epa-file" "epa-file.el" (19277 34916))
 ;;; Generated autoloads from epa-file.el

 (autoload 'epa-file-handler "epa-file" "\
@@ -8189,7 +8194,7 @@

 ;;;### (autoloads (epa-global-mail-mode epa-mail-import-keys epa-mail-encrypt
 ;;;;;;  epa-mail-sign epa-mail-verify epa-mail-decrypt epa-mail-mode)
-;;;;;;  "epa-mail" "epa-mail.el" (19278 4516))
+;;;;;;  "epa-mail" "epa-mail.el" (19277 34916))
 ;;; Generated autoloads from epa-mail.el

 (autoload 'epa-mail-mode "epa-mail" "\
@@ -8253,7 +8258,7 @@

 ;;;***

-;;;### (autoloads (epg-make-context) "epg" "epg.el" (19278 4516))
+;;;### (autoloads (epg-make-context) "epg" "epg.el" (19277 34916))
 ;;; Generated autoloads from epg.el

 (autoload 'epg-make-context "epg" "\
@@ -8264,7 +8269,7 @@
 ;;;***

 ;;;### (autoloads (epg-expand-group epg-check-configuration epg-configuration)
-;;;;;;  "epg-config" "epg-config.el" (19278 4516))
+;;;;;;  "epg-config" "epg-config.el" (19354 34807))
 ;;; Generated autoloads from epg-config.el

 (autoload 'epg-configuration "epg-config" "\
@@ -8285,7 +8290,7 @@
 ;;;***

 ;;;### (autoloads (erc-handle-irc-url erc erc-select-read-args) "erc"
-;;;;;;  "erc/erc.el" (19293 59093))
+;;;;;;  "erc/erc.el" (19294 23005))
 ;;; Generated autoloads from erc/erc.el

 (autoload 'erc-select-read-args "erc" "\
@@ -8327,33 +8332,33 @@

 ;;;***

-;;;### (autoloads nil "erc-autoaway" "erc/erc-autoaway.el" (19278
-;;;;;;  4522))
+;;;### (autoloads nil "erc-autoaway" "erc/erc-autoaway.el" (19277
+;;;;;;  34919))
 ;;; Generated autoloads from erc/erc-autoaway.el
  (autoload 'erc-autoaway-mode "erc-autoaway")

 ;;;***

-;;;### (autoloads nil "erc-button" "erc/erc-button.el" (19278 4522))
+;;;### (autoloads nil "erc-button" "erc/erc-button.el" (19277 34919))
 ;;; Generated autoloads from erc/erc-button.el
  (autoload 'erc-button-mode "erc-button" nil t)

 ;;;***

-;;;### (autoloads nil "erc-capab" "erc/erc-capab.el" (19278 4522))
+;;;### (autoloads nil "erc-capab" "erc/erc-capab.el" (19277 34919))
 ;;; Generated autoloads from erc/erc-capab.el
  (autoload 'erc-capab-identify-mode "erc-capab" nil t)

 ;;;***

-;;;### (autoloads nil "erc-compat" "erc/erc-compat.el" (19278 4522))
+;;;### (autoloads nil "erc-compat" "erc/erc-compat.el" (19277 34919))
 ;;; Generated autoloads from erc/erc-compat.el
  (autoload 'erc-define-minor-mode "erc-compat")

 ;;;***

 ;;;### (autoloads (erc-ctcp-query-DCC pcomplete/erc-mode/DCC erc-cmd-DCC)
-;;;;;;  "erc-dcc" "erc/erc-dcc.el" (19278 4522))
+;;;;;;  "erc-dcc" "erc/erc-dcc.el" (19277 34919))
 ;;; Generated autoloads from erc/erc-dcc.el
  (autoload 'erc-dcc-mode "erc-dcc")

@@ -8386,7 +8391,7 @@
 ;;;;;;  erc-ezb-add-session erc-ezb-end-of-session-list erc-ezb-init-session-list
 ;;;;;;  erc-ezb-identify erc-ezb-notice-autodetect erc-ezb-lookup-action
 ;;;;;;  erc-ezb-get-login erc-cmd-ezb) "erc-ezbounce" "erc/erc-ezbounce.el"
-;;;;;;  (19278 4522))
+;;;;;;  (19277 34919))
 ;;; Generated autoloads from erc/erc-ezbounce.el

 (autoload 'erc-cmd-ezb "erc-ezbounce" "\
@@ -8448,8 +8453,8 @@

 ;;;***

-;;;### (autoloads (erc-fill) "erc-fill" "erc/erc-fill.el" (19278
-;;;;;;  4522))
+;;;### (autoloads (erc-fill) "erc-fill" "erc/erc-fill.el" (19277
+;;;;;;  34919))
 ;;; Generated autoloads from erc/erc-fill.el
  (autoload 'erc-fill-mode "erc-fill" nil t)

@@ -8461,15 +8466,15 @@

 ;;;***

-;;;### (autoloads nil "erc-hecomplete" "erc/erc-hecomplete.el" (19278
-;;;;;;  4522))
+;;;### (autoloads nil "erc-hecomplete" "erc/erc-hecomplete.el" (19277
+;;;;;;  34919))
 ;;; Generated autoloads from erc/erc-hecomplete.el
  (autoload 'erc-hecomplete-mode "erc-hecomplete" nil t)

 ;;;***

 ;;;### (autoloads (erc-identd-stop erc-identd-start) "erc-identd"
-;;;;;;  "erc/erc-identd.el" (19278 4522))
+;;;;;;  "erc/erc-identd.el" (19277 34919))
 ;;; Generated autoloads from erc/erc-identd.el
  (autoload 'erc-identd-mode "erc-identd")

@@ -8491,7 +8496,7 @@
 ;;;***

 ;;;### (autoloads (erc-create-imenu-index) "erc-imenu" "erc/erc-imenu.el"
-;;;;;;  (19278 4522))
+;;;;;;  (19277 34919))
 ;;; Generated autoloads from erc/erc-imenu.el

 (autoload 'erc-create-imenu-index "erc-imenu" "\
@@ -8501,20 +8506,20 @@

 ;;;***

-;;;### (autoloads nil "erc-join" "erc/erc-join.el" (19278 4522))
+;;;### (autoloads nil "erc-join" "erc/erc-join.el" (19277 34919))
 ;;; Generated autoloads from erc/erc-join.el
  (autoload 'erc-autojoin-mode "erc-join" nil t)

 ;;;***

-;;;### (autoloads nil "erc-list" "erc/erc-list.el" (19278 4522))
+;;;### (autoloads nil "erc-list" "erc/erc-list.el" (19277 34919))
 ;;; Generated autoloads from erc/erc-list.el
  (autoload 'erc-list-mode "erc-list")

 ;;;***

 ;;;### (autoloads (erc-save-buffer-in-logs erc-logging-enabled) "erc-log"
-;;;;;;  "erc/erc-log.el" (19278 4522))
+;;;;;;  "erc/erc-log.el" (19277 34919))
 ;;; Generated autoloads from erc/erc-log.el
  (autoload 'erc-log-mode "erc-log" nil t)

@@ -8546,7 +8551,7 @@
 ;;;### (autoloads (erc-delete-dangerous-host erc-add-dangerous-host
 ;;;;;;  erc-delete-keyword erc-add-keyword erc-delete-fool erc-add-fool
 ;;;;;;  erc-delete-pal erc-add-pal) "erc-match" "erc/erc-match.el"
-;;;;;;  (19278 4522))
+;;;;;;  (19277 34919))
 ;;; Generated autoloads from erc/erc-match.el
  (autoload 'erc-match-mode "erc-match")

@@ -8592,14 +8597,14 @@

 ;;;***

-;;;### (autoloads nil "erc-menu" "erc/erc-menu.el" (19278 4522))
+;;;### (autoloads nil "erc-menu" "erc/erc-menu.el" (19277 34919))
 ;;; Generated autoloads from erc/erc-menu.el
  (autoload 'erc-menu-mode "erc-menu" nil t)

 ;;;***

 ;;;### (autoloads (erc-cmd-WHOLEFT) "erc-netsplit" "erc/erc-netsplit.el"
-;;;;;;  (19278 4522))
+;;;;;;  (19277 34919))
 ;;; Generated autoloads from erc/erc-netsplit.el
  (autoload 'erc-netsplit-mode "erc-netsplit")

@@ -8611,7 +8616,7 @@
 ;;;***

 ;;;### (autoloads (erc-server-select erc-determine-network) "erc-networks"
-;;;;;;  "erc/erc-networks.el" (19278 4522))
+;;;;;;  "erc/erc-networks.el" (19277 34919))
 ;;; Generated autoloads from erc/erc-networks.el

 (autoload 'erc-determine-network "erc-networks" "\
@@ -8629,7 +8634,7 @@
 ;;;***

 ;;;### (autoloads (pcomplete/erc-mode/NOTIFY erc-cmd-NOTIFY) "erc-notify"
-;;;;;;  "erc/erc-notify.el" (19278 4522))
+;;;;;;  "erc/erc-notify.el" (19277 34919))
 ;;; Generated autoloads from erc/erc-notify.el
  (autoload 'erc-notify-mode "erc-notify" nil t)

@@ -8647,33 +8652,33 @@

 ;;;***

-;;;### (autoloads nil "erc-page" "erc/erc-page.el" (19278 4522))
+;;;### (autoloads nil "erc-page" "erc/erc-page.el" (19277 34919))
 ;;; Generated autoloads from erc/erc-page.el
  (autoload 'erc-page-mode "erc-page")

 ;;;***

-;;;### (autoloads nil "erc-pcomplete" "erc/erc-pcomplete.el" (19278
-;;;;;;  4522))
+;;;### (autoloads nil "erc-pcomplete" "erc/erc-pcomplete.el" (19277
+;;;;;;  34919))
 ;;; Generated autoloads from erc/erc-pcomplete.el
  (autoload 'erc-completion-mode "erc-pcomplete" nil t)

 ;;;***

-;;;### (autoloads nil "erc-replace" "erc/erc-replace.el" (19278 4522))
+;;;### (autoloads nil "erc-replace" "erc/erc-replace.el" (19277 34919))
 ;;; Generated autoloads from erc/erc-replace.el
  (autoload 'erc-replace-mode "erc-replace")

 ;;;***

-;;;### (autoloads nil "erc-ring" "erc/erc-ring.el" (19278 4522))
+;;;### (autoloads nil "erc-ring" "erc/erc-ring.el" (19277 34919))
 ;;; Generated autoloads from erc/erc-ring.el
  (autoload 'erc-ring-mode "erc-ring" nil t)

 ;;;***

 ;;;### (autoloads (erc-nickserv-identify erc-nickserv-identify-mode)
-;;;;;;  "erc-services" "erc/erc-services.el" (19310 24286))
+;;;;;;  "erc-services" "erc/erc-services.el" (19311 8632))
 ;;; Generated autoloads from erc/erc-services.el
  (autoload 'erc-services-mode "erc-services" nil t)

@@ -8690,14 +8695,14 @@

 ;;;***

-;;;### (autoloads nil "erc-sound" "erc/erc-sound.el" (19278 4522))
+;;;### (autoloads nil "erc-sound" "erc/erc-sound.el" (19277 34919))
 ;;; Generated autoloads from erc/erc-sound.el
  (autoload 'erc-sound-mode "erc-sound")

 ;;;***

 ;;;### (autoloads (erc-speedbar-browser) "erc-speedbar" "erc/erc-speedbar.el"
-;;;;;;  (19278 4522))
+;;;;;;  (19277 34919))
 ;;; Generated autoloads from erc/erc-speedbar.el

 (autoload 'erc-speedbar-browser "erc-speedbar" "\
@@ -8708,21 +8713,21 @@

 ;;;***

-;;;### (autoloads nil "erc-spelling" "erc/erc-spelling.el" (19278
-;;;;;;  4522))
+;;;### (autoloads nil "erc-spelling" "erc/erc-spelling.el" (19277
+;;;;;;  34919))
 ;;; Generated autoloads from erc/erc-spelling.el
  (autoload 'erc-spelling-mode "erc-spelling" nil t)

 ;;;***

-;;;### (autoloads nil "erc-stamp" "erc/erc-stamp.el" (19278 4522))
+;;;### (autoloads nil "erc-stamp" "erc/erc-stamp.el" (19277 34919))
 ;;; Generated autoloads from erc/erc-stamp.el
  (autoload 'erc-timestamp-mode "erc-stamp" nil t)

 ;;;***

 ;;;### (autoloads (erc-track-minor-mode) "erc-track" "erc/erc-track.el"
-;;;;;;  (19278 4522))
+;;;;;;  (19277 34919))
 ;;; Generated autoloads from erc/erc-track.el

 (defvar erc-track-minor-mode nil "\
@@ -8745,7 +8750,7 @@
 ;;;***

 ;;;### (autoloads (erc-truncate-buffer erc-truncate-buffer-to-size)
-;;;;;;  "erc-truncate" "erc/erc-truncate.el" (19278 4522))
+;;;;;;  "erc-truncate" "erc/erc-truncate.el" (19277 34919))
 ;;; Generated autoloads from erc/erc-truncate.el
  (autoload 'erc-truncate-mode "erc-truncate" nil t)

@@ -8765,7 +8770,7 @@
 ;;;***

 ;;;### (autoloads (erc-xdcc-add-file) "erc-xdcc" "erc/erc-xdcc.el"
-;;;;;;  (19278 4522))
+;;;;;;  (19277 34919))
 ;;; Generated autoloads from erc/erc-xdcc.el
  (autoload 'erc-xdcc-mode "erc-xdcc")

@@ -8776,8 +8781,8 @@

 ;;;***

-;;;### (autoloads (eshell-mode) "esh-mode" "eshell/esh-mode.el" (19278
-;;;;;;  4522))
+;;;### (autoloads (eshell-mode) "esh-mode" "eshell/esh-mode.el" (19277
+;;;;;;  34919))
 ;;; Generated autoloads from eshell/esh-mode.el

 (autoload 'eshell-mode "esh-mode" "\
@@ -8789,8 +8794,8 @@

 ;;;***

-;;;### (autoloads (eshell-test) "esh-test" "eshell/esh-test.el" (19278
-;;;;;;  4522))
+;;;### (autoloads (eshell-test) "esh-test" "eshell/esh-test.el" (19277
+;;;;;;  34919))
 ;;; Generated autoloads from eshell/esh-test.el

 (autoload 'eshell-test "esh-test" "\
@@ -8801,7 +8806,7 @@
 ;;;***

 ;;;### (autoloads (eshell-command-result eshell-command eshell) "eshell"
-;;;;;;  "eshell/eshell.el" (19329 34899))
+;;;;;;  "eshell/eshell.el" (19330 62404))
 ;;; Generated autoloads from eshell/eshell.el

 (autoload 'eshell "eshell" "\
@@ -8842,7 +8847,7 @@
 ;;;;;;  visit-tags-table tags-table-mode find-tag-default-function
 ;;;;;;  find-tag-hook tags-add-tables tags-compression-info-list
 ;;;;;;  tags-table-list tags-case-fold-search) "etags" "progmodes/etags.el"
-;;;;;;  (19278 4527))
+;;;;;;  (19277 34922))
 ;;; Generated autoloads from progmodes/etags.el

 (defvar tags-file-name nil "\
@@ -9150,7 +9155,7 @@
 ;;;;;;  ethio-fidel-to-sera-marker ethio-fidel-to-sera-region ethio-fidel-to-sera-buffer
 ;;;;;;  ethio-sera-to-fidel-marker ethio-sera-to-fidel-region ethio-sera-to-fidel-buffer
 ;;;;;;  setup-ethiopic-environment-internal) "ethio-util" "language/ethio-util.el"
-;;;;;;  (19278 4524))
+;;;;;;  (19277 34920))
 ;;; Generated autoloads from language/ethio-util.el

 (autoload 'setup-ethiopic-environment-internal "ethio-util" "\
@@ -9320,7 +9325,7 @@

 ;;;### (autoloads (eudc-load-eudc eudc-query-form eudc-expand-inline
 ;;;;;;  eudc-get-phone eudc-get-email eudc-set-server) "eudc" "net/eudc.el"
-;;;;;;  (19278 4525))
+;;;;;;  (19277 34921))
 ;;; Generated autoloads from net/eudc.el

 (autoload 'eudc-set-server "eudc" "\
@@ -9376,7 +9381,7 @@

 ;;;### (autoloads (eudc-display-jpeg-as-button eudc-display-jpeg-inline
 ;;;;;;  eudc-display-sound eudc-display-mail eudc-display-url eudc-display-generic-binary)
-;;;;;;  "eudc-bob" "net/eudc-bob.el" (19278 4525))
+;;;;;;  "eudc-bob" "net/eudc-bob.el" (19277 34921))
 ;;; Generated autoloads from net/eudc-bob.el

 (autoload 'eudc-display-generic-binary "eudc-bob" "\
@@ -9412,7 +9417,7 @@
 ;;;***

 ;;;### (autoloads (eudc-try-bbdb-insert eudc-insert-record-at-point-into-bbdb)
-;;;;;;  "eudc-export" "net/eudc-export.el" (19278 4525))
+;;;;;;  "eudc-export" "net/eudc-export.el" (19277 34921))
 ;;; Generated autoloads from net/eudc-export.el

 (autoload 'eudc-insert-record-at-point-into-bbdb "eudc-export" "\
@@ -9429,7 +9434,7 @@
 ;;;***

 ;;;### (autoloads (eudc-edit-hotlist) "eudc-hotlist" "net/eudc-hotlist.el"
-;;;;;;  (19278 4525))
+;;;;;;  (19277 34921))
 ;;; Generated autoloads from net/eudc-hotlist.el

 (autoload 'eudc-edit-hotlist "eudc-hotlist" "\
@@ -9439,8 +9444,8 @@

 ;;;***

-;;;### (autoloads (ewoc-create) "ewoc" "emacs-lisp/ewoc.el" (19278
-;;;;;;  4521))
+;;;### (autoloads (ewoc-create) "ewoc" "emacs-lisp/ewoc.el" (19277
+;;;;;;  34919))
 ;;; Generated autoloads from emacs-lisp/ewoc.el

 (autoload 'ewoc-create "ewoc" "\
@@ -9469,7 +9474,7 @@
 ;;;### (autoloads (executable-make-buffer-file-executable-if-script-p
 ;;;;;;  executable-self-display executable-set-magic executable-interpret
 ;;;;;;  executable-command-find-posix-p) "executable" "progmodes/executable.el"
-;;;;;;  (19278 4527))
+;;;;;;  (19277 34922))
 ;;; Generated autoloads from progmodes/executable.el

 (autoload 'executable-command-find-posix-p "executable" "\
@@ -9512,7 +9517,7 @@

 ;;;### (autoloads (expand-jump-to-next-slot expand-jump-to-previous-slot
 ;;;;;;  expand-abbrev-hook expand-add-abbrevs) "expand" "expand.el"
-;;;;;;  (19278 4516))
+;;;;;;  (19277 34916))
 ;;; Generated autoloads from expand.el

 (autoload 'expand-add-abbrevs "expand" "\
@@ -9561,7 +9566,7 @@

 ;;;***

-;;;### (autoloads (f90-mode) "f90" "progmodes/f90.el" (19327 809))
+;;;### (autoloads (f90-mode) "f90" "progmodes/f90.el" (19325 45050))
 ;;; Generated autoloads from progmodes/f90.el

 (autoload 'f90-mode "f90" "\
@@ -9627,8 +9632,8 @@
 ;;;### (autoloads (variable-pitch-mode buffer-face-toggle buffer-face-set
 ;;;;;;  buffer-face-mode text-scale-adjust text-scale-decrease text-scale-increase
 ;;;;;;  text-scale-set face-remap-set-base face-remap-reset-base
-;;;;;;  face-remap-add-relative) "face-remap" "face-remap.el" (19278
-;;;;;;  4516))
+;;;;;;  face-remap-add-relative) "face-remap" "face-remap.el" (19360
+;;;;;;  14173))
 ;;; Generated autoloads from face-remap.el

 (autoload 'face-remap-add-relative "face-remap" "\
@@ -9768,7 +9773,7 @@

 ;;;### (autoloads (feedmail-queue-reminder feedmail-run-the-queue
 ;;;;;;  feedmail-run-the-queue-global-prompt feedmail-run-the-queue-no-prompts
-;;;;;;  feedmail-send-it) "feedmail" "mail/feedmail.el" (19259 35416))
+;;;;;;  feedmail-send-it) "feedmail" "mail/feedmail.el" (19267 61658))
 ;;; Generated autoloads from mail/feedmail.el

 (autoload 'feedmail-send-it "feedmail" "\
@@ -9822,7 +9827,7 @@
 ;;;***

 ;;;### (autoloads (ffap-bindings dired-at-point ffap-at-mouse ffap-menu
-;;;;;;  find-file-at-point ffap-next) "ffap" "ffap.el" (19318 22201))
+;;;;;;  find-file-at-point ffap-next) "ffap" "ffap.el" (19318 65023))
 ;;; Generated autoloads from ffap.el

 (autoload 'ffap-next "ffap" "\
@@ -9886,7 +9891,7 @@
 ;;;### (autoloads (file-cache-minibuffer-complete file-cache-add-directory-recursively
 ;;;;;;  file-cache-add-directory-using-locate file-cache-add-directory-using-find
 ;;;;;;  file-cache-add-file file-cache-add-directory-list file-cache-add-directory)
-;;;;;;  "filecache" "filecache.el" (19278 4516))
+;;;;;;  "filecache" "filecache.el" (19277 34916))
 ;;; Generated autoloads from filecache.el

 (autoload 'file-cache-add-directory "filecache" "\
@@ -9946,7 +9951,7 @@
 ;;;;;;  copy-file-locals-to-dir-locals delete-dir-local-variable
 ;;;;;;  add-dir-local-variable delete-file-local-variable-prop-line
 ;;;;;;  add-file-local-variable-prop-line delete-file-local-variable
-;;;;;;  add-file-local-variable) "files-x" "files-x.el" (19278 4517))
+;;;;;;  add-file-local-variable) "files-x" "files-x.el" (19277 34916))
 ;;; Generated autoloads from files-x.el

 (autoload 'add-file-local-variable "files-x" "\
@@ -10011,8 +10016,8 @@

 ;;;***

-;;;### (autoloads (filesets-init) "filesets" "filesets.el" (19278
-;;;;;;  4517))
+;;;### (autoloads (filesets-init) "filesets" "filesets.el" (19277
+;;;;;;  34916))
 ;;; Generated autoloads from filesets.el

 (autoload 'filesets-init "filesets" "\
@@ -10023,7 +10028,7 @@

 ;;;***

-;;;### (autoloads (find-cmd) "find-cmd" "find-cmd.el" (19279 36173))
+;;;### (autoloads (find-cmd) "find-cmd" "find-cmd.el" (19279 53114))
 ;;; Generated autoloads from find-cmd.el

 (autoload 'find-cmd "find-cmd" "\
@@ -10044,7 +10049,7 @@

 ;;;### (autoloads (find-grep-dired find-name-dired find-dired find-grep-options
 ;;;;;;  find-ls-subdir-switches find-ls-option) "find-dired" "find-dired.el"
-;;;;;;  (19278 4517))
+;;;;;;  (19277 34916))
 ;;; Generated autoloads from find-dired.el

 (defvar find-ls-option (if (eq system-type 'berkeley-unix) (purecopy '("-ls" . "-gilsb")) (purecopy '("-exec ls -ld {} \\;" . "-ld"))) "\
@@ -10105,7 +10110,7 @@

 ;;;### (autoloads (ff-mouse-find-other-file-other-window ff-mouse-find-other-file
 ;;;;;;  ff-find-other-file ff-get-other-file) "find-file" "find-file.el"
-;;;;;;  (19278 4517))
+;;;;;;  (19277 34916))
 ;;; Generated autoloads from find-file.el

 (defvar ff-special-constructs `((,(purecopy "^#\\s *\\(include\\|import\\)\\s +[<\"]\\(.*\\)[>\"]") lambda nil (buffer-substring (match-beginning 2) (match-end 2)))) "\
@@ -10199,7 +10204,7 @@
 ;;;;;;  find-variable find-variable-noselect find-function-other-frame
 ;;;;;;  find-function-other-window find-function find-function-noselect
 ;;;;;;  find-function-search-for-symbol find-library) "find-func"
-;;;;;;  "emacs-lisp/find-func.el" (19278 4521))
+;;;;;;  "emacs-lisp/find-func.el" (19277 34919))
 ;;; Generated autoloads from emacs-lisp/find-func.el

 (autoload 'find-library "find-func" "\
@@ -10354,7 +10359,7 @@
 ;;;***

 ;;;### (autoloads (find-lisp-find-dired-filter find-lisp-find-dired-subdirectories
-;;;;;;  find-lisp-find-dired) "find-lisp" "find-lisp.el" (19278 4517))
+;;;;;;  find-lisp-find-dired) "find-lisp" "find-lisp.el" (19277 34916))
 ;;; Generated autoloads from find-lisp.el

 (autoload 'find-lisp-find-dired "find-lisp" "\
@@ -10375,7 +10380,7 @@
 ;;;***

 ;;;### (autoloads (finder-by-keyword finder-commentary finder-list-keywords)
-;;;;;;  "finder" "finder.el" (19278 4517))
+;;;;;;  "finder" "finder.el" (19360 14173))
 ;;; Generated autoloads from finder.el

 (autoload 'finder-list-keywords "finder" "\
@@ -10397,7 +10402,7 @@
 ;;;***

 ;;;### (autoloads (enable-flow-control-on enable-flow-control) "flow-ctrl"
-;;;;;;  "flow-ctrl.el" (19278 4517))
+;;;;;;  "flow-ctrl.el" (19277 34916))
 ;;; Generated autoloads from flow-ctrl.el

 (autoload 'enable-flow-control "flow-ctrl" "\
@@ -10419,7 +10424,7 @@
 ;;;***

 ;;;### (autoloads (fill-flowed fill-flowed-encode) "flow-fill" "gnus/flow-fill.el"
-;;;;;;  (19278 4522))
+;;;;;;  (19277 34919))
 ;;; Generated autoloads from gnus/flow-fill.el

 (autoload 'fill-flowed-encode "flow-fill" "\
@@ -10435,7 +10440,7 @@
 ;;;***

 ;;;### (autoloads (flymake-mode-off flymake-mode-on flymake-mode)
-;;;;;;  "flymake" "progmodes/flymake.el" (19297 59939))
+;;;;;;  "flymake" "progmodes/flymake.el" (19299 5862))
 ;;; Generated autoloads from progmodes/flymake.el

 (autoload 'flymake-mode "flymake" "\
@@ -10459,7 +10464,7 @@

 ;;;### (autoloads (flyspell-buffer flyspell-region flyspell-mode-off
 ;;;;;;  turn-off-flyspell turn-on-flyspell flyspell-mode flyspell-prog-mode)
-;;;;;;  "flyspell" "textmodes/flyspell.el" (19319 39351))
+;;;;;;  "flyspell" "textmodes/flyspell.el" (19324 55756))
 ;;; Generated autoloads from textmodes/flyspell.el

 (autoload 'flyspell-prog-mode "flyspell" "\
@@ -10529,7 +10534,7 @@

 ;;;### (autoloads (follow-delete-other-windows-and-split follow-mode
 ;;;;;;  turn-off-follow-mode turn-on-follow-mode) "follow" "follow.el"
-;;;;;;  (19321 25921))
+;;;;;;  (19277 34916))
 ;;; Generated autoloads from follow.el

 (autoload 'turn-on-follow-mode "follow" "\
@@ -10602,8 +10607,8 @@

 ;;;***

-;;;### (autoloads (footnote-mode) "footnote" "mail/footnote.el" (19278
-;;;;;;  4524))
+;;;### (autoloads (footnote-mode) "footnote" "mail/footnote.el" (19277
+;;;;;;  34921))
 ;;; Generated autoloads from mail/footnote.el

 (autoload 'footnote-mode "footnote" "\
@@ -10617,7 +10622,7 @@
 ;;;***

 ;;;### (autoloads (forms-find-file-other-window forms-find-file forms-mode)
-;;;;;;  "forms" "forms.el" (19278 4517))
+;;;;;;  "forms" "forms.el" (19277 34916))
 ;;; Generated autoloads from forms.el

 (autoload 'forms-mode "forms" "\
@@ -10654,7 +10659,7 @@
 ;;;***

 ;;;### (autoloads (fortran-mode) "fortran" "progmodes/fortran.el"
-;;;;;;  (19278 4527))
+;;;;;;  (19277 34922))
 ;;; Generated autoloads from progmodes/fortran.el

 (autoload 'fortran-mode "fortran" "\
@@ -10732,7 +10737,7 @@
 ;;;***

 ;;;### (autoloads (fortune fortune-to-signature fortune-compile fortune-from-region
-;;;;;;  fortune-add-fortune) "fortune" "play/fortune.el" (19278 4527))
+;;;;;;  fortune-add-fortune) "fortune" "play/fortune.el" (19277 34922))
 ;;; Generated autoloads from play/fortune.el

 (autoload 'fortune-add-fortune "fortune" "\
@@ -10782,7 +10787,7 @@
 ;;;***

 ;;;### (autoloads (gdb-enable-debug gdb) "gdb-ui" "progmodes/gdb-ui.el"
-;;;;;;  (19327 809))
+;;;;;;  (19326 57936))
 ;;; Generated autoloads from progmodes/gdb-ui.el

 (autoload 'gdb "gdb-ui" "\
@@ -10840,8 +10845,8 @@
 ;;;***

 ;;;### (autoloads (generic-make-keywords-list generic-mode generic-mode-internal
-;;;;;;  define-generic-mode) "generic" "emacs-lisp/generic.el" (19278
-;;;;;;  4521))
+;;;;;;  define-generic-mode) "generic" "emacs-lisp/generic.el" (19277
+;;;;;;  34919))
 ;;; Generated autoloads from emacs-lisp/generic.el

 (defvar generic-mode-list nil "\
@@ -10916,7 +10921,7 @@
 ;;;***

 ;;;### (autoloads (glasses-mode) "glasses" "progmodes/glasses.el"
-;;;;;;  (19278 4527))
+;;;;;;  (19277 34922))
 ;;; Generated autoloads from progmodes/glasses.el

 (autoload 'glasses-mode "glasses" "\
@@ -10930,7 +10935,7 @@

 ;;;### (autoloads (gmm-tool-bar-from-list gmm-widget-p gmm-error
 ;;;;;;  gmm-message gmm-regexp-concat) "gmm-utils" "gnus/gmm-utils.el"
-;;;;;;  (19278 4522))
+;;;;;;  (19362 59593))
 ;;; Generated autoloads from gnus/gmm-utils.el

 (autoload 'gmm-regexp-concat "gmm-utils" "\
@@ -10985,7 +10990,7 @@
 ;;;***

 ;;;### (autoloads (gnus gnus-other-frame gnus-slave gnus-no-server
-;;;;;;  gnus-slave-no-server) "gnus" "gnus/gnus.el" (19278 4523))
+;;;;;;  gnus-slave-no-server) "gnus" "gnus/gnus.el" (19277 34920))
 ;;; Generated autoloads from gnus/gnus.el
 (when (fboundp 'custom-autoload)
  (custom-autoload 'gnus-select-method "gnus"))
@@ -11038,7 +11043,7 @@
 ;;;;;;  gnus-agent-get-undownloaded-list gnus-agent-delete-group
 ;;;;;;  gnus-agent-rename-group gnus-agent-possibly-save-gcc gnus-agentize
 ;;;;;;  gnus-slave-unplugged gnus-plugged gnus-unplugged) "gnus-agent"
-;;;;;;  "gnus/gnus-agent.el" (19278 4522))
+;;;;;;  "gnus/gnus-agent.el" (19277 34920))
 ;;; Generated autoloads from gnus/gnus-agent.el

 (autoload 'gnus-unplugged "gnus-agent" "\
@@ -11129,7 +11134,7 @@
 ;;;***

 ;;;### (autoloads (gnus-article-prepare-display) "gnus-art" "gnus/gnus-art.el"
-;;;;;;  (19334 38589))
+;;;;;;  (19333 26940))
 ;;; Generated autoloads from gnus/gnus-art.el

 (autoload 'gnus-article-prepare-display "gnus-art" "\
@@ -11140,7 +11145,7 @@
 ;;;***

 ;;;### (autoloads (gnus-audio-play) "gnus-audio" "gnus/gnus-audio.el"
-;;;;;;  (19278 4522))
+;;;;;;  (19277 34920))
 ;;; Generated autoloads from gnus/gnus-audio.el

 (autoload 'gnus-audio-play "gnus-audio" "\
@@ -11151,7 +11156,7 @@
 ;;;***

 ;;;### (autoloads (gnus-bookmark-bmenu-list gnus-bookmark-jump gnus-bookmark-set)
-;;;;;;  "gnus-bookmark" "gnus/gnus-bookmark.el" (19278 4522))
+;;;;;;  "gnus-bookmark" "gnus/gnus-bookmark.el" (19277 34920))
 ;;; Generated autoloads from gnus/gnus-bookmark.el

 (autoload 'gnus-bookmark-set "gnus-bookmark" "\
@@ -11176,8 +11181,8 @@

 ;;;### (autoloads (gnus-cache-delete-group gnus-cache-rename-group
 ;;;;;;  gnus-cache-generate-nov-databases gnus-cache-generate-active
-;;;;;;  gnus-jog-cache) "gnus-cache" "gnus/gnus-cache.el" (19278
-;;;;;;  4522))
+;;;;;;  gnus-jog-cache) "gnus-cache" "gnus/gnus-cache.el" (19277
+;;;;;;  34920))
 ;;; Generated autoloads from gnus/gnus-cache.el

 (autoload 'gnus-jog-cache "gnus-cache" "\
@@ -11219,7 +11224,7 @@
 ;;;***

 ;;;### (autoloads (gnus-delay-initialize gnus-delay-send-queue gnus-delay-article)
-;;;;;;  "gnus-delay" "gnus/gnus-delay.el" (19278 4522))
+;;;;;;  "gnus-delay" "gnus/gnus-delay.el" (19277 34920))
 ;;; Generated autoloads from gnus/gnus-delay.el

 (autoload 'gnus-delay-article "gnus-delay" "\
@@ -11255,7 +11260,7 @@
 ;;;***

 ;;;### (autoloads (gnus-user-format-function-D gnus-user-format-function-d)
-;;;;;;  "gnus-diary" "gnus/gnus-diary.el" (19279 36173))
+;;;;;;  "gnus-diary" "gnus/gnus-diary.el" (19279 53114))
 ;;; Generated autoloads from gnus/gnus-diary.el

 (autoload 'gnus-user-format-function-d "gnus-diary" "\
@@ -11271,7 +11276,7 @@
 ;;;***

 ;;;### (autoloads (turn-on-gnus-dired-mode) "gnus-dired" "gnus/gnus-dired.el"
-;;;;;;  (19278 4522))
+;;;;;;  (19277 34920))
 ;;; Generated autoloads from gnus/gnus-dired.el

 (autoload 'turn-on-gnus-dired-mode "gnus-dired" "\
@@ -11282,7 +11287,7 @@
 ;;;***

 ;;;### (autoloads (gnus-draft-reminder) "gnus-draft" "gnus/gnus-draft.el"
-;;;;;;  (19278 4522))
+;;;;;;  (19277 34920))
 ;;; Generated autoloads from gnus/gnus-draft.el

 (autoload 'gnus-draft-reminder "gnus-draft" "\
@@ -11294,8 +11299,8 @@

 ;;;### (autoloads (gnus-convert-png-to-face gnus-convert-face-to-png
 ;;;;;;  gnus-face-from-file gnus-x-face-from-file gnus-insert-random-x-face-header
-;;;;;;  gnus-random-x-face) "gnus-fun" "gnus/gnus-fun.el" (19278
-;;;;;;  4522))
+;;;;;;  gnus-random-x-face) "gnus-fun" "gnus/gnus-fun.el" (19277
+;;;;;;  34920))
 ;;; Generated autoloads from gnus/gnus-fun.el

 (autoload 'gnus-random-x-face "gnus-fun" "\
@@ -11340,7 +11345,7 @@
 ;;;***

 ;;;### (autoloads (gnus-fetch-group-other-frame gnus-fetch-group)
-;;;;;;  "gnus-group" "gnus/gnus-group.el" (19278 4522))
+;;;;;;  "gnus-group" "gnus/gnus-group.el" (19277 34920))
 ;;; Generated autoloads from gnus/gnus-group.el

 (autoload 'gnus-fetch-group "gnus-group" "\
@@ -11358,7 +11363,7 @@
 ;;;***

 ;;;### (autoloads (gnus-batch-score) "gnus-kill" "gnus/gnus-kill.el"
-;;;;;;  (19278 4523))
+;;;;;;  (19277 34920))
 ;;; Generated autoloads from gnus/gnus-kill.el

 (defalias 'gnus-batch-kill 'gnus-batch-score)
@@ -11373,7 +11378,7 @@

 ;;;### (autoloads (gnus-mailing-list-mode gnus-mailing-list-insinuate
 ;;;;;;  turn-on-gnus-mailing-list-mode) "gnus-ml" "gnus/gnus-ml.el"
-;;;;;;  (19278 4523))
+;;;;;;  (19277 34920))
 ;;; Generated autoloads from gnus/gnus-ml.el

 (autoload 'turn-on-gnus-mailing-list-mode "gnus-ml" "\
@@ -11398,7 +11403,7 @@

 ;;;### (autoloads (gnus-group-split-fancy gnus-group-split gnus-group-split-update
 ;;;;;;  gnus-group-split-setup) "gnus-mlspl" "gnus/gnus-mlspl.el"
-;;;;;;  (19278 4523))
+;;;;;;  (19277 34920))
 ;;; Generated autoloads from gnus/gnus-mlspl.el

 (autoload 'gnus-group-split-setup "gnus-mlspl" "\
@@ -11499,7 +11504,7 @@
 ;;;***

 ;;;### (autoloads (gnus-change-server) "gnus-move" "gnus/gnus-move.el"
-;;;;;;  (19278 4523))
+;;;;;;  (19277 34920))
 ;;; Generated autoloads from gnus/gnus-move.el

 (autoload 'gnus-change-server "gnus-move" "\
@@ -11511,7 +11516,7 @@
 ;;;***

 ;;;### (autoloads (gnus-button-reply gnus-button-mailto gnus-msg-mail)
-;;;;;;  "gnus-msg" "gnus/gnus-msg.el" (19278 4523))
+;;;;;;  "gnus-msg" "gnus/gnus-msg.el" (19277 34920))
 ;;; Generated autoloads from gnus/gnus-msg.el

 (autoload 'gnus-msg-mail "gnus-msg" "\
@@ -11536,7 +11541,7 @@
 ;;;***

 ;;;### (autoloads (gnus-nocem-load-cache gnus-nocem-scan-groups)
-;;;;;;  "gnus-nocem" "gnus/gnus-nocem.el" (19278 4523))
+;;;;;;  "gnus-nocem" "gnus/gnus-nocem.el" (19277 34920))
 ;;; Generated autoloads from gnus/gnus-nocem.el

 (autoload 'gnus-nocem-scan-groups "gnus-nocem" "\
@@ -11553,7 +11558,7 @@

 ;;;### (autoloads (gnus-treat-newsgroups-picon gnus-treat-mail-picon
 ;;;;;;  gnus-treat-from-picon) "gnus-picon" "gnus/gnus-picon.el"
-;;;;;;  (19278 4523))
+;;;;;;  (19277 34920))
 ;;; Generated autoloads from gnus/gnus-picon.el

 (autoload 'gnus-treat-from-picon "gnus-picon" "\
@@ -11580,7 +11585,7 @@
 ;;;;;;  gnus-sorted-nintersection gnus-sorted-range-intersection
 ;;;;;;  gnus-sorted-intersection gnus-intersection gnus-sorted-complement
 ;;;;;;  gnus-sorted-ndifference gnus-sorted-difference) "gnus-range"
-;;;;;;  "gnus/gnus-range.el" (19278 4523))
+;;;;;;  "gnus/gnus-range.el" (19277 34920))
 ;;; Generated autoloads from gnus/gnus-range.el

 (autoload 'gnus-sorted-difference "gnus-range" "\
@@ -11648,7 +11653,7 @@
 ;;;***

 ;;;### (autoloads (gnus-registry-install-hooks gnus-registry-initialize)
-;;;;;;  "gnus-registry" "gnus/gnus-registry.el" (19278 4523))
+;;;;;;  "gnus-registry" "gnus/gnus-registry.el" (19277 34920))
 ;;; Generated autoloads from gnus/gnus-registry.el

 (autoload 'gnus-registry-initialize "gnus-registry" "\
@@ -11664,8 +11669,8 @@
 ;;;***

 ;;;### (autoloads (gnus-sieve-article-add-rule gnus-sieve-generate
-;;;;;;  gnus-sieve-update) "gnus-sieve" "gnus/gnus-sieve.el" (19278
-;;;;;;  4523))
+;;;;;;  gnus-sieve-update) "gnus-sieve" "gnus/gnus-sieve.el" (19277
+;;;;;;  34920))
 ;;; Generated autoloads from gnus/gnus-sieve.el

 (autoload 'gnus-sieve-update "gnus-sieve" "\
@@ -11693,7 +11698,7 @@
 ;;;***

 ;;;### (autoloads (gnus-batch-brew-soup) "gnus-soup" "gnus/gnus-soup.el"
-;;;;;;  (19278 4523))
+;;;;;;  (19277 34920))
 ;;; Generated autoloads from gnus/gnus-soup.el

 (autoload 'gnus-batch-brew-soup "gnus-soup" "\
@@ -11713,7 +11718,7 @@
 ;;;***

 ;;;### (autoloads (gnus-update-format) "gnus-spec" "gnus/gnus-spec.el"
-;;;;;;  (19278 4523))
+;;;;;;  (19277 34920))
 ;;; Generated autoloads from gnus/gnus-spec.el

 (autoload 'gnus-update-format "gnus-spec" "\
@@ -11724,8 +11729,8 @@
 ;;;***

 ;;;### (autoloads (gnus-fixup-nnimap-unread-after-getting-new-news
-;;;;;;  gnus-declare-backend) "gnus-start" "gnus/gnus-start.el" (19278
-;;;;;;  4523))
+;;;;;;  gnus-declare-backend) "gnus-start" "gnus/gnus-start.el" (19277
+;;;;;;  34920))
 ;;; Generated autoloads from gnus/gnus-start.el

 (autoload 'gnus-declare-backend "gnus-start" "\
@@ -11741,7 +11746,7 @@
 ;;;***

 ;;;### (autoloads (gnus-add-configuration) "gnus-win" "gnus/gnus-win.el"
-;;;;;;  (19278 4523))
+;;;;;;  (19277 34920))
 ;;; Generated autoloads from gnus/gnus-win.el

 (autoload 'gnus-add-configuration "gnus-win" "\
@@ -11751,7 +11756,7 @@

 ;;;***

-;;;### (autoloads (gomoku) "gomoku" "play/gomoku.el" (19278 4527))
+;;;### (autoloads (gomoku) "gomoku" "play/gomoku.el" (19277 34922))
 ;;; Generated autoloads from play/gomoku.el

 (autoload 'gomoku "gomoku" "\
@@ -11778,8 +11783,8 @@
 ;;;***

 ;;;### (autoloads (goto-address-prog-mode goto-address-mode goto-address
-;;;;;;  goto-address-at-point) "goto-addr" "net/goto-addr.el" (19278
-;;;;;;  4525))
+;;;;;;  goto-address-at-point) "goto-addr" "net/goto-addr.el" (19360
+;;;;;;  14173))
 ;;; Generated autoloads from net/goto-addr.el

 (define-obsolete-function-alias 'goto-address-at-mouse 'goto-address-at-point "22.1")
@@ -11819,7 +11824,7 @@

 ;;;### (autoloads (zrgrep rgrep lgrep grep-find grep grep-mode grep-compute-defaults
 ;;;;;;  grep-process-setup grep-setup-hook grep-find-command grep-command
-;;;;;;  grep-window-height) "grep" "progmodes/grep.el" (19302 10642))
+;;;;;;  grep-window-height) "grep" "progmodes/grep.el" (19304 58663))
 ;;; Generated autoloads from progmodes/grep.el

 (defvar grep-window-height nil "\
@@ -11975,7 +11980,7 @@

 ;;;***

-;;;### (autoloads (gs-load-image) "gs" "gs.el" (19278 4517))
+;;;### (autoloads (gs-load-image) "gs" "gs.el" (19277 34916))
 ;;; Generated autoloads from gs.el

 (autoload 'gs-load-image "gs" "\
@@ -11989,7 +11994,7 @@
 ;;;***

 ;;;### (autoloads (gud-tooltip-mode gdb-script-mode jdb pdb perldb
-;;;;;;  xdb dbx sdb gud-gdb) "gud" "progmodes/gud.el" (19278 4527))
+;;;;;;  xdb dbx sdb gud-gdb) "gud" "progmodes/gud.el" (19277 34922))
 ;;; Generated autoloads from progmodes/gud.el

 (autoload 'gud-gdb "gud" "\
@@ -12077,8 +12082,8 @@

 ;;;***

-;;;### (autoloads (handwrite) "handwrite" "play/handwrite.el" (19278
-;;;;;;  4527))
+;;;### (autoloads (handwrite) "handwrite" "play/handwrite.el" (19277
+;;;;;;  34922))
 ;;; Generated autoloads from play/handwrite.el

 (autoload 'handwrite "handwrite" "\
@@ -12096,7 +12101,7 @@
 ;;;***

 ;;;### (autoloads (hanoi-unix-64 hanoi-unix hanoi) "hanoi" "play/hanoi.el"
-;;;;;;  (19259 35420))
+;;;;;;  (19267 61658))
 ;;; Generated autoloads from play/hanoi.el

 (autoload 'hanoi "hanoi" "\
@@ -12125,7 +12130,7 @@

 ;;;### (autoloads (mail-check-payment mail-add-payment-async mail-add-payment
 ;;;;;;  hashcash-verify-payment hashcash-insert-payment-async hashcash-insert-payment)
-;;;;;;  "hashcash" "mail/hashcash.el" (19278 4524))
+;;;;;;  "hashcash" "mail/hashcash.el" (19361 52486))
 ;;; Generated autoloads from mail/hashcash.el

 (autoload 'hashcash-insert-payment "hashcash" "\
@@ -12170,7 +12175,7 @@
 ;;;### (autoloads (scan-buf-previous-region scan-buf-next-region
 ;;;;;;  scan-buf-move-to-region help-at-pt-display-when-idle help-at-pt-set-timer
 ;;;;;;  help-at-pt-cancel-timer display-local-help help-at-pt-kbd-string
-;;;;;;  help-at-pt-string) "help-at-pt" "help-at-pt.el" (19278 4517))
+;;;;;;  help-at-pt-string) "help-at-pt" "help-at-pt.el" (19277 34916))
 ;;; Generated autoloads from help-at-pt.el

 (autoload 'help-at-pt-string "help-at-pt" "\
@@ -12300,7 +12305,7 @@
 ;;;### (autoloads (describe-categories describe-syntax describe-variable
 ;;;;;;  variable-at-point describe-function-1 find-lisp-object-file-name
 ;;;;;;  help-C-file-name describe-function) "help-fns" "help-fns.el"
-;;;;;;  (19278 4517))
+;;;;;;  (19277 34916))
 ;;; Generated autoloads from help-fns.el

 (autoload 'describe-function "help-fns" "\
@@ -12370,7 +12375,7 @@
 ;;;***

 ;;;### (autoloads (three-step-help) "help-macro" "help-macro.el"
-;;;;;;  (19278 4517))
+;;;;;;  (19277 34916))
 ;;; Generated autoloads from help-macro.el

 (defvar three-step-help nil "\
@@ -12386,8 +12391,8 @@

 ;;;### (autoloads (help-xref-on-pp help-insert-xref-button help-xref-button
 ;;;;;;  help-make-xrefs help-buffer help-setup-xref help-mode-finish
-;;;;;;  help-mode-setup help-mode) "help-mode" "help-mode.el" (19278
-;;;;;;  4517))
+;;;;;;  help-mode-setup help-mode) "help-mode" "help-mode.el" (19277
+;;;;;;  34916))
 ;;; Generated autoloads from help-mode.el

 (autoload 'help-mode "help-mode" "\
@@ -12479,7 +12484,7 @@
 ;;;***

 ;;;### (autoloads (Helper-help Helper-describe-bindings) "helper"
-;;;;;;  "emacs-lisp/helper.el" (19278 4521))
+;;;;;;  "emacs-lisp/helper.el" (19277 34919))
 ;;; Generated autoloads from emacs-lisp/helper.el

 (autoload 'Helper-describe-bindings "helper" "\
@@ -12495,7 +12500,7 @@
 ;;;***

 ;;;### (autoloads (hexlify-buffer hexl-find-file hexl-mode) "hexl"
-;;;;;;  "hexl.el" (19279 36173))
+;;;;;;  "hexl.el" (19279 53114))
 ;;; Generated autoloads from hexl.el

 (autoload 'hexl-mode "hexl" "\
@@ -12592,7 +12597,7 @@
 ;;;### (autoloads (hi-lock-write-interactive-patterns hi-lock-unface-buffer
 ;;;;;;  hi-lock-face-phrase-buffer hi-lock-face-buffer hi-lock-line-face-buffer
 ;;;;;;  global-hi-lock-mode hi-lock-mode) "hi-lock" "hi-lock.el"
-;;;;;;  (19278 4517))
+;;;;;;  (19277 34916))
 ;;; Generated autoloads from hi-lock.el

 (autoload 'hi-lock-mode "hi-lock" "\
@@ -12726,7 +12731,7 @@
 ;;;***

 ;;;### (autoloads (hide-ifdef-mode) "hideif" "progmodes/hideif.el"
-;;;;;;  (19278 4527))
+;;;;;;  (19277 34922))
 ;;; Generated autoloads from progmodes/hideif.el

 (autoload 'hide-ifdef-mode "hideif" "\
@@ -12766,7 +12771,7 @@
 ;;;***

 ;;;### (autoloads (turn-off-hideshow hs-minor-mode) "hideshow" "progmodes/hideshow.el"
-;;;;;;  (19278 4527))
+;;;;;;  (19277 34922))
 ;;; Generated autoloads from progmodes/hideshow.el

 (defvar hs-special-modes-alist (mapcar 'purecopy '((c-mode "{" "}" "/[*/]" nil nil) (c++-mode "{" "}" "/[*/]" nil nil) (bibtex-mode ("@\\S(*\\(\\s(\\)" 1)) (java-mode "{" "}" "/[*/]" nil nil) (js-mode "{" "}" "/[*/]" nil))) "\
@@ -12828,8 +12833,8 @@
 ;;;;;;  highlight-compare-buffers highlight-changes-rotate-faces
 ;;;;;;  highlight-changes-previous-change highlight-changes-next-change
 ;;;;;;  highlight-changes-remove-highlight highlight-changes-visible-mode
-;;;;;;  highlight-changes-mode) "hilit-chg" "hilit-chg.el" (19278
-;;;;;;  4517))
+;;;;;;  highlight-changes-mode) "hilit-chg" "hilit-chg.el" (19277
+;;;;;;  34916))
 ;;; Generated autoloads from hilit-chg.el

 (autoload 'highlight-changes-mode "hilit-chg" "\
@@ -12958,7 +12963,7 @@
 ;;;;;;  hippie-expand-ignore-buffers hippie-expand-max-buffers hippie-expand-no-restriction
 ;;;;;;  hippie-expand-dabbrev-as-symbol hippie-expand-dabbrev-skip-space
 ;;;;;;  hippie-expand-verbose hippie-expand-try-functions-list) "hippie-exp"
-;;;;;;  "hippie-exp.el" (19278 4517))
+;;;;;;  "hippie-exp.el" (19277 34916))
 ;;; Generated autoloads from hippie-exp.el

 (defvar hippie-expand-try-functions-list '(try-complete-file-name-partially try-complete-file-name try-expand-all-abbrevs try-expand-list try-expand-line try-expand-dabbrev try-expand-dabbrev-all-buffers try-expand-dabbrev-from-kill try-complete-lisp-symbol-partially try-complete-lisp-symbol) "\
@@ -13031,7 +13036,7 @@
 ;;;***

 ;;;### (autoloads (global-hl-line-mode hl-line-mode) "hl-line" "hl-line.el"
-;;;;;;  (19278 4517))
+;;;;;;  (19354 34807))
 ;;; Generated autoloads from hl-line.el

 (autoload 'hl-line-mode "hl-line" "\
@@ -13075,7 +13080,7 @@
 ;;;;;;  holiday-bahai-holidays holiday-islamic-holidays holiday-christian-holidays
 ;;;;;;  holiday-hebrew-holidays holiday-other-holidays holiday-local-holidays
 ;;;;;;  holiday-oriental-holidays holiday-general-holidays) "holidays"
-;;;;;;  "calendar/holidays.el" (19278 4519))
+;;;;;;  "calendar/holidays.el" (19277 34918))
 ;;; Generated autoloads from calendar/holidays.el

 (defvar holiday-general-holidays (mapcar 'purecopy '((holiday-fixed 1 1 "New Year's Day") (holiday-float 1 1 3 "Martin Luther King Day") (holiday-fixed 2 2 "Groundhog Day") (holiday-fixed 2 14 "Valentine's Day") (holiday-float 2 1 3 "President's Day") (holiday-fixed 3 17 "St. Patrick's Day") (holiday-fixed 4 1 "April Fools' Day") (holiday-float 5 0 2 "Mother's Day") (holiday-float 5 1 -1 "Memorial Day") (holiday-fixed 6 14 "Flag Day") (holiday-float 6 0 3 "Father's Day") (holiday-fixed 7 4 "Independence Day") (holiday-float 9 1 1 "Labor Day") (holiday-float 10 1 2 "Columbus Day") (holiday-fixed 10 31 "Halloween") (holiday-fixed 11 11 "Veteran's Day") (holiday-float 11 4 4 "Thanksgiving"))) "\
@@ -13223,8 +13228,8 @@

 ;;;***

-;;;### (autoloads (html2text) "html2text" "gnus/html2text.el" (19278
-;;;;;;  4523))
+;;;### (autoloads (html2text) "html2text" "gnus/html2text.el" (19277
+;;;;;;  34920))
 ;;; Generated autoloads from gnus/html2text.el

 (autoload 'html2text "html2text" "\
@@ -13235,8 +13240,8 @@
 ;;;***

 ;;;### (autoloads (define-ibuffer-filter define-ibuffer-op define-ibuffer-sorter
-;;;;;;  define-ibuffer-column) "ibuf-macs" "ibuf-macs.el" (19278
-;;;;;;  4517))
+;;;;;;  define-ibuffer-column) "ibuf-macs" "ibuf-macs.el" (19277
+;;;;;;  34916))
 ;;; Generated autoloads from ibuf-macs.el

 (autoload 'define-ibuffer-column "ibuf-macs" "\
@@ -13325,7 +13330,7 @@
 ;;;***

 ;;;### (autoloads (ibuffer ibuffer-other-window ibuffer-list-buffers)
-;;;;;;  "ibuffer" "ibuffer.el" (19278 4517))
+;;;;;;  "ibuffer" "ibuffer.el" (19279 53114))
 ;;; Generated autoloads from ibuffer.el

 (autoload 'ibuffer-list-buffers "ibuffer" "\
@@ -13366,7 +13371,7 @@

 ;;;### (autoloads (icalendar-import-buffer icalendar-import-file
 ;;;;;;  icalendar-export-region icalendar-export-file) "icalendar"
-;;;;;;  "calendar/icalendar.el" (19327 809))
+;;;;;;  "calendar/icalendar.el" (19339 10551))
 ;;; Generated autoloads from calendar/icalendar.el

 (autoload 'icalendar-export-file "icalendar" "\
@@ -13418,8 +13423,8 @@

 ;;;***

-;;;### (autoloads (icomplete-mode) "icomplete" "icomplete.el" (19278
-;;;;;;  4517))
+;;;### (autoloads (icomplete-mode) "icomplete" "icomplete.el" (19277
+;;;;;;  34916))
 ;;; Generated autoloads from icomplete.el

 (defvar icomplete-mode nil "\
@@ -13440,7 +13445,7 @@

 ;;;***

-;;;### (autoloads (icon-mode) "icon" "progmodes/icon.el" (19278 4527))
+;;;### (autoloads (icon-mode) "icon" "progmodes/icon.el" (19277 34922))
 ;;; Generated autoloads from progmodes/icon.el

 (autoload 'icon-mode "icon" "\
@@ -13481,7 +13486,7 @@
 ;;;***

 ;;;### (autoloads (idlwave-shell) "idlw-shell" "progmodes/idlw-shell.el"
-;;;;;;  (19278 4528))
+;;;;;;  (19277 34922))
 ;;; Generated autoloads from progmodes/idlw-shell.el

 (autoload 'idlwave-shell "idlw-shell" "\
@@ -13507,7 +13512,7 @@
 ;;;***

 ;;;### (autoloads (idlwave-mode) "idlwave" "progmodes/idlwave.el"
-;;;;;;  (19279 36173))
+;;;;;;  (19279 53114))
 ;;; Generated autoloads from progmodes/idlwave.el

 (autoload 'idlwave-mode "idlwave" "\
@@ -13641,8 +13646,8 @@
 ;;;;;;  ido-find-alternate-file ido-find-file-other-window ido-find-file
 ;;;;;;  ido-find-file-in-dir ido-switch-buffer-other-frame ido-insert-buffer
 ;;;;;;  ido-kill-buffer ido-display-buffer ido-switch-buffer-other-window
-;;;;;;  ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (19284
-;;;;;;  47302))
+;;;;;;  ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (19286
+;;;;;;  4503))
 ;;; Generated autoloads from ido.el

 (defvar ido-mode nil "\
@@ -13903,7 +13908,7 @@

 ;;;***

-;;;### (autoloads (ielm) "ielm" "ielm.el" (19278 4517))
+;;;### (autoloads (ielm) "ielm" "ielm.el" (19277 34916))
 ;;; Generated autoloads from ielm.el
  (add-hook 'same-window-buffer-names (purecopy "*ielm*"))

@@ -13916,7 +13921,7 @@
 ;;;***

 ;;;### (autoloads (iimage-mode turn-on-iimage-mode) "iimage" "iimage.el"
-;;;;;;  (19278 4517))
+;;;;;;  (19277 34916))
 ;;; Generated autoloads from iimage.el

 (autoload 'turn-on-iimage-mode "iimage" "\
@@ -13931,11 +13936,11 @@

 ;;;***

-;;;### (autoloads (defimage find-image remove-images insert-sliced-image
-;;;;;;  insert-image put-image create-image image-type-auto-detected-p
+;;;### (autoloads (create-animated-image defimage find-image remove-images
+;;;;;;  insert-sliced-image insert-image put-image create-image image-type-auto-detected-p
 ;;;;;;  image-type-available-p image-type image-type-from-file-name
 ;;;;;;  image-type-from-file-header image-type-from-buffer image-type-from-data)
-;;;;;;  "image" "image.el" (19278 4517))
+;;;;;;  "image" "image.el" (19351 60740))
 ;;; Generated autoloads from image.el

 (autoload 'image-type-from-data "image" "\
@@ -14109,6 +14114,22 @@

 \(fn SYMBOL SPECS &optional DOC)" nil (quote macro))

+(autoload 'create-animated-image "image" "\
+Create an animated image.
+FILE-OR-DATA is an image file name or image data.
+Optional TYPE is a symbol describing the image type.  If TYPE is omitted
+or nil, try to determine the image type from its first few bytes
+of image data.  If that doesn't work, and FILE-OR-DATA is a file name,
+use its file extension as image type.
+Optional DATA-P non-nil means FILE-OR-DATA is a string containing image data.
+Optional PROPS are additional image attributes to assign to the image,
+like, e.g. `:mask MASK'.
+Value is the image created, or nil if images of type TYPE are not supported.
+
+Images should not be larger than specified by `max-image-size'.
+
+\(fn FILE-OR-DATA &optional TYPE DATA-P &rest PROPS)" nil nil)
+
 ;;;***

 ;;;### (autoloads (image-dired-dired-edit-comment-and-tags image-dired-mark-tagged-files
@@ -14118,7 +14139,7 @@
 ;;;;;;  image-dired-jump-thumbnail-buffer image-dired-delete-tag
 ;;;;;;  image-dired-tag-files image-dired-show-all-from-dir image-dired-display-thumbs
 ;;;;;;  image-dired-dired-with-window-configuration image-dired-dired-insert-marked-thumbs)
-;;;;;;  "image-dired" "image-dired.el" (19278 4517))
+;;;;;;  "image-dired" "image-dired.el" (19277 34916))
 ;;; Generated autoloads from image-dired.el

 (autoload 'image-dired-dired-insert-marked-thumbs "image-dired" "\
@@ -14252,7 +14273,7 @@

 ;;;### (autoloads (auto-image-file-mode insert-image-file image-file-name-regexp
 ;;;;;;  image-file-name-regexps image-file-name-extensions) "image-file"
-;;;;;;  "image-file.el" (19278 4517))
+;;;;;;  "image-file.el" (19277 34916))
 ;;; Generated autoloads from image-file.el

 (defvar image-file-name-extensions (purecopy '("png" "jpeg" "jpg" "gif" "tiff" "tif" "xbm" "xpm" "pbm" "pgm" "ppm" "pnm" "svg")) "\
@@ -14314,7 +14335,7 @@
 ;;;***

 ;;;### (autoloads (image-bookmark-jump image-mode-as-text image-minor-mode
-;;;;;;  image-mode) "image-mode" "image-mode.el" (19308 49976))
+;;;;;;  image-mode) "image-mode" "image-mode.el" (19351 60435))
 ;;; Generated autoloads from image-mode.el
  (push (cons (purecopy "\\.jpe?g\\'")    'image-mode) auto-mode-alist)
  (push (cons (purecopy "\\.png\\'")      'image-mode) auto-mode-alist)
@@ -14364,7 +14385,7 @@
 ;;;***

 ;;;### (autoloads (imenu imenu-add-menubar-index imenu-add-to-menubar
-;;;;;;  imenu-sort-function) "imenu" "imenu.el" (19278 4517))
+;;;;;;  imenu-sort-function) "imenu" "imenu.el" (19277 34916))
 ;;; Generated autoloads from imenu.el

 (defvar imenu-sort-function nil "\
@@ -14481,7 +14502,7 @@

 ;;;### (autoloads (indian-2-column-to-ucs-region in-is13194-pre-write-conversion
 ;;;;;;  in-is13194-post-read-conversion indian-compose-string indian-compose-region)
-;;;;;;  "ind-util" "language/ind-util.el" (19278 4524))
+;;;;;;  "ind-util" "language/ind-util.el" (19277 34920))
 ;;; Generated autoloads from language/ind-util.el

 (autoload 'indian-compose-region "ind-util" "\
@@ -14513,7 +14534,7 @@

 ;;;### (autoloads (inferior-lisp inferior-lisp-prompt inferior-lisp-load-command
 ;;;;;;  inferior-lisp-program inferior-lisp-filter-regexp) "inf-lisp"
-;;;;;;  "progmodes/inf-lisp.el" (19278 4528))
+;;;;;;  "progmodes/inf-lisp.el" (19277 34922))
 ;;; Generated autoloads from progmodes/inf-lisp.el

 (defvar inferior-lisp-filter-regexp (purecopy "\\`\\s *\\(:\\(\\w\\|\\s_\\)\\)?\\s *\\'") "\
@@ -14581,7 +14602,7 @@
 ;;;;;;  Info-goto-emacs-command-node Info-mode info-finder info-apropos
 ;;;;;;  Info-index Info-directory Info-on-current-buffer info-standalone
 ;;;;;;  info-emacs-manual info info-other-window) "info" "info.el"
-;;;;;;  (19315 29628))
+;;;;;;  (19360 14173))
 ;;; Generated autoloads from info.el

 (autoload 'info-other-window "info" "\
@@ -14760,7 +14781,7 @@

 ;;;### (autoloads (info-complete-file info-complete-symbol info-lookup-file
 ;;;;;;  info-lookup-symbol info-lookup-reset) "info-look" "info-look.el"
-;;;;;;  (19278 4517))
+;;;;;;  (19277 34916))
 ;;; Generated autoloads from info-look.el

 (autoload 'info-lookup-reset "info-look" "\
@@ -14808,7 +14829,7 @@
 ;;;***

 ;;;### (autoloads (info-xref-check-all-custom info-xref-check-all
-;;;;;;  info-xref-check) "info-xref" "info-xref.el" (19278 4517))
+;;;;;;  info-xref-check) "info-xref" "info-xref.el" (19277 34916))
 ;;; Generated autoloads from info-xref.el

 (autoload 'info-xref-check "info-xref" "\
@@ -14835,7 +14856,7 @@
 ;;;***

 ;;;### (autoloads (batch-info-validate Info-validate Info-split Info-split-threshold
-;;;;;;  Info-tagify) "informat" "informat.el" (19278 4517))
+;;;;;;  Info-tagify) "informat" "informat.el" (19277 34916))
 ;;; Generated autoloads from informat.el

 (autoload 'Info-tagify "informat" "\
@@ -14882,7 +14903,7 @@

 ;;;### (autoloads (isearch-process-search-multibyte-characters isearch-toggle-input-method
 ;;;;;;  isearch-toggle-specified-input-method) "isearch-x" "international/isearch-x.el"
-;;;;;;  (19278 4524))
+;;;;;;  (19277 34920))
 ;;; Generated autoloads from international/isearch-x.el

 (autoload 'isearch-toggle-specified-input-method "isearch-x" "\
@@ -14902,8 +14923,8 @@

 ;;;***

-;;;### (autoloads (isearchb-activate) "isearchb" "isearchb.el" (19278
-;;;;;;  4517))
+;;;### (autoloads (isearchb-activate) "isearchb" "isearchb.el" (19277
+;;;;;;  34916))
 ;;; Generated autoloads from isearchb.el

 (autoload 'isearchb-activate "isearchb" "\
@@ -14919,7 +14940,7 @@
 ;;;### (autoloads (iso-cvt-define-menu iso-cvt-write-only iso-cvt-read-only
 ;;;;;;  iso-sgml2iso iso-iso2sgml iso-iso2duden iso-iso2gtex iso-gtex2iso
 ;;;;;;  iso-tex2iso iso-iso2tex iso-german iso-spanish) "iso-cvt"
-;;;;;;  "international/iso-cvt.el" (19278 4524))
+;;;;;;  "international/iso-cvt.el" (19277 34920))
 ;;; Generated autoloads from international/iso-cvt.el

 (autoload 'iso-spanish "iso-cvt" "\
@@ -15010,7 +15031,7 @@
 ;;;***

 ;;;### (autoloads nil "iso-transl" "international/iso-transl.el"
-;;;;;;  (19278 4524))
+;;;;;;  (19277 34920))
 ;;; Generated autoloads from international/iso-transl.el
  (or key-translation-map (setq key-translation-map (make-sparse-keymap)))
  (define-key key-translation-map "\C-x8" 'iso-transl-ctl-x-8-map)
@@ -15022,7 +15043,7 @@
 ;;;;;;  ispell-complete-word ispell-continue ispell-buffer ispell-comments-and-strings
 ;;;;;;  ispell-region ispell-change-dictionary ispell-kill-ispell
 ;;;;;;  ispell-help ispell-pdict-save ispell-word ispell-personal-dictionary)
-;;;;;;  "ispell" "textmodes/ispell.el" (19307 36715))
+;;;;;;  "ispell" "textmodes/ispell.el" (19304 58663))
 ;;; Generated autoloads from textmodes/ispell.el
 (put 'ispell-check-comments 'safe-local-variable (lambda (a) (memq a '(nil t exclusive))))

@@ -15240,8 +15261,8 @@

 ;;;***

-;;;### (autoloads (iswitchb-mode) "iswitchb" "iswitchb.el" (19314
-;;;;;;  31189))
+;;;### (autoloads (iswitchb-mode) "iswitchb" "iswitchb.el" (19315
+;;;;;;  24485))
 ;;; Generated autoloads from iswitchb.el

 (defvar iswitchb-mode nil "\
@@ -15266,7 +15287,7 @@
 ;;;### (autoloads (read-hiragana-string japanese-zenkaku-region japanese-hankaku-region
 ;;;;;;  japanese-hiragana-region japanese-katakana-region japanese-zenkaku
 ;;;;;;  japanese-hankaku japanese-hiragana japanese-katakana setup-japanese-environment-internal)
-;;;;;;  "japan-util" "language/japan-util.el" (19278 4524))
+;;;;;;  "japan-util" "language/japan-util.el" (19277 34920))
 ;;; Generated autoloads from language/japan-util.el

 (autoload 'setup-japanese-environment-internal "japan-util" "\
@@ -15344,7 +15365,7 @@
 ;;;***

 ;;;### (autoloads (jka-compr-uninstall jka-compr-handler) "jka-compr"
-;;;;;;  "jka-compr.el" (19289 53536))
+;;;;;;  "jka-compr.el" (19294 23005))
 ;;; Generated autoloads from jka-compr.el

 (defvar jka-compr-inhibit nil "\
@@ -15367,7 +15388,7 @@

 ;;;***

-;;;### (autoloads (js-mode) "js" "progmodes/js.el" (19278 4528))
+;;;### (autoloads (js-mode) "js" "progmodes/js.el" (19277 34922))
 ;;; Generated autoloads from progmodes/js.el

 (autoload 'js-mode "js" "\
@@ -15385,7 +15406,7 @@

 ;;;### (autoloads (keypad-setup keypad-numlock-shifted-setup keypad-shifted-setup
 ;;;;;;  keypad-numlock-setup keypad-setup) "keypad" "emulation/keypad.el"
-;;;;;;  (19278 4522))
+;;;;;;  (19277 34919))
 ;;; Generated autoloads from emulation/keypad.el

 (defvar keypad-setup nil "\
@@ -15441,7 +15462,7 @@
 ;;;***

 ;;;### (autoloads (kinsoku) "kinsoku" "international/kinsoku.el"
-;;;;;;  (19278 4524))
+;;;;;;  (19277 34920))
 ;;; Generated autoloads from international/kinsoku.el

 (autoload 'kinsoku "kinsoku" "\
@@ -15462,8 +15483,8 @@

 ;;;***

-;;;### (autoloads (kkc-region) "kkc" "international/kkc.el" (19278
-;;;;;;  4524))
+;;;### (autoloads (kkc-region) "kkc" "international/kkc.el" (19277
+;;;;;;  34920))
 ;;; Generated autoloads from international/kkc.el

 (defvar kkc-after-update-conversion-functions nil "\
@@ -15488,7 +15509,7 @@
 ;;;### (autoloads (kmacro-end-call-mouse kmacro-end-and-call-macro
 ;;;;;;  kmacro-end-or-call-macro kmacro-start-macro-or-insert-counter
 ;;;;;;  kmacro-call-macro kmacro-end-macro kmacro-start-macro kmacro-exec-ring-item)
-;;;;;;  "kmacro" "kmacro.el" (19278 4517))
+;;;;;;  "kmacro" "kmacro.el" (19277 34916))
 ;;; Generated autoloads from kmacro.el
  (global-set-key "\C-x(" 'kmacro-start-macro)
  (global-set-key "\C-x)" 'kmacro-end-macro)
@@ -15599,7 +15620,7 @@
 ;;;***

 ;;;### (autoloads (setup-korean-environment-internal) "korea-util"
-;;;;;;  "language/korea-util.el" (19278 4524))
+;;;;;;  "language/korea-util.el" (19277 34920))
 ;;; Generated autoloads from language/korea-util.el

 (defvar default-korean-keyboard (purecopy (if (string-match "3" (or (getenv "HANGUL_KEYBOARD_TYPE") "")) "3" "")) "\
@@ -15614,7 +15635,7 @@
 ;;;***

 ;;;### (autoloads (lm lm-test-run) "landmark" "play/landmark.el"
-;;;;;;  (19278 4527))
+;;;;;;  (19277 34922))
 ;;; Generated autoloads from play/landmark.el

 (defalias 'landmark-repeat 'lm-test-run)
@@ -15648,7 +15669,7 @@

 ;;;### (autoloads (lao-compose-region lao-composition-function lao-transcribe-roman-to-lao-string
 ;;;;;;  lao-transcribe-single-roman-syllable-to-lao lao-compose-string)
-;;;;;;  "lao-util" "language/lao-util.el" (19278 4524))
+;;;;;;  "lao-util" "language/lao-util.el" (19277 34920))
 ;;; Generated autoloads from language/lao-util.el

 (autoload 'lao-compose-string "lao-util" "\
@@ -15687,7 +15708,7 @@

 ;;;### (autoloads (latexenc-find-file-coding-system latexenc-coding-system-to-inputenc
 ;;;;;;  latexenc-inputenc-to-coding-system latex-inputenc-coding-alist)
-;;;;;;  "latexenc" "international/latexenc.el" (19278 4524))
+;;;;;;  "latexenc" "international/latexenc.el" (19277 34920))
 ;;; Generated autoloads from international/latexenc.el

 (defvar latex-inputenc-coding-alist (purecopy '(("ansinew" . windows-1252) ("applemac" . mac-roman) ("ascii" . us-ascii) ("cp1250" . windows-1250) ("cp1252" . windows-1252) ("cp1257" . cp1257) ("cp437de" . cp437) ("cp437" . cp437) ("cp850" . cp850) ("cp852" . cp852) ("cp858" . cp858) ("cp865" . cp865) ("latin1" . iso-8859-1) ("latin2" . iso-8859-2) ("latin3" . iso-8859-3) ("latin4" . iso-8859-4) ("latin5" . iso-8859-5) ("latin9" . iso-8859-15) ("next" . next) ("utf8" . utf-8) ("utf8x" . utf-8))) "\
@@ -15719,7 +15740,7 @@
 ;;;***

 ;;;### (autoloads (latin1-display-ucs-per-lynx latin1-display latin1-display)
-;;;;;;  "latin1-disp" "international/latin1-disp.el" (19278 4524))
+;;;;;;  "latin1-disp" "international/latin1-disp.el" (19277 34920))
 ;;; Generated autoloads from international/latin1-disp.el

 (defvar latin1-display nil "\
@@ -15761,7 +15782,7 @@
 ;;;***

 ;;;### (autoloads (ld-script-mode) "ld-script" "progmodes/ld-script.el"
-;;;;;;  (19278 4528))
+;;;;;;  (19277 34922))
 ;;; Generated autoloads from progmodes/ld-script.el

 (add-to-list 'auto-mode-alist (purecopy '("\\.ld[si]?\\>" . ld-script-mode)))
@@ -15778,7 +15799,7 @@
 ;;;***

 ;;;### (autoloads (ledit-from-lisp-mode ledit-mode) "ledit" "ledit.el"
-;;;;;;  (19278 4517))
+;;;;;;  (19277 34916))
 ;;; Generated autoloads from ledit.el

 (defconst ledit-save-files t "\
@@ -15813,7 +15834,7 @@

 ;;;***

-;;;### (autoloads (life) "life" "play/life.el" (19278 4527))
+;;;### (autoloads (life) "life" "play/life.el" (19277 34922))
 ;;; Generated autoloads from play/life.el

 (autoload 'life "life" "\
@@ -15827,7 +15848,7 @@
 ;;;***

 ;;;### (autoloads (global-linum-mode linum-mode linum-format) "linum"
-;;;;;;  "linum.el" (19278 4517))
+;;;;;;  "linum.el" (19277 34916))
 ;;; Generated autoloads from linum.el

 (defvar linum-format 'dynamic "\
@@ -15865,8 +15886,8 @@

 ;;;***

-;;;### (autoloads (unload-feature) "loadhist" "loadhist.el" (19278
-;;;;;;  4517))
+;;;### (autoloads (unload-feature) "loadhist" "loadhist.el" (19277
+;;;;;;  34916))
 ;;; Generated autoloads from loadhist.el

 (autoload 'unload-feature "loadhist" "\
@@ -15898,7 +15919,7 @@
 ;;;***

 ;;;### (autoloads (locate-with-filter locate locate-ls-subdir-switches)
-;;;;;;  "locate" "locate.el" (19278 4517))
+;;;;;;  "locate" "locate.el" (19277 34916))
 ;;; Generated autoloads from locate.el

 (defvar locate-ls-subdir-switches (purecopy "-al") "\
@@ -15949,7 +15970,7 @@

 ;;;***

-;;;### (autoloads (log-edit) "log-edit" "log-edit.el" (19297 48769))
+;;;### (autoloads (log-edit) "log-edit" "log-edit.el" (19354 34807))
 ;;; Generated autoloads from log-edit.el

 (autoload 'log-edit "log-edit" "\
@@ -15975,8 +15996,8 @@

 ;;;***

-;;;### (autoloads (log-view-mode) "log-view" "log-view.el" (19280
-;;;;;;  40239))
+;;;### (autoloads (log-view-mode) "log-view" "log-view.el" (19360
+;;;;;;  14173))
 ;;; Generated autoloads from log-view.el

 (autoload 'log-view-mode "log-view" "\
@@ -15986,8 +16007,8 @@

 ;;;***

-;;;### (autoloads (longlines-mode) "longlines" "longlines.el" (19278
-;;;;;;  4517))
+;;;### (autoloads (longlines-mode) "longlines" "longlines.el" (19277
+;;;;;;  34916))
 ;;; Generated autoloads from longlines.el

 (autoload 'longlines-mode "longlines" "\
@@ -16008,8 +16029,8 @@
 ;;;***

 ;;;### (autoloads (print-region lpr-region print-buffer lpr-buffer
-;;;;;;  lpr-command lpr-switches printer-name) "lpr" "lpr.el" (19278
-;;;;;;  4517))
+;;;;;;  lpr-command lpr-switches printer-name) "lpr" "lpr.el" (19277
+;;;;;;  34916))
 ;;; Generated autoloads from lpr.el

 (defvar lpr-windows-system (memq system-type '(ms-dos windows-nt)))
@@ -16103,7 +16124,7 @@
 ;;;***

 ;;;### (autoloads (ls-lisp-support-shell-wildcards) "ls-lisp" "ls-lisp.el"
-;;;;;;  (19314 30682))
+;;;;;;  (19315 24485))
 ;;; Generated autoloads from ls-lisp.el

 (defvar ls-lisp-support-shell-wildcards t "\
@@ -16114,8 +16135,8 @@

 ;;;***

-;;;### (autoloads (lunar-phases) "lunar" "calendar/lunar.el" (19278
-;;;;;;  4519))
+;;;### (autoloads (lunar-phases) "lunar" "calendar/lunar.el" (19277
+;;;;;;  34918))
 ;;; Generated autoloads from calendar/lunar.el

 (autoload 'lunar-phases "lunar" "\
@@ -16129,8 +16150,8 @@

 ;;;***

-;;;### (autoloads (m4-mode) "m4-mode" "progmodes/m4-mode.el" (19278
-;;;;;;  4528))
+;;;### (autoloads (m4-mode) "m4-mode" "progmodes/m4-mode.el" (19277
+;;;;;;  34922))
 ;;; Generated autoloads from progmodes/m4-mode.el

 (autoload 'm4-mode "m4-mode" "\
@@ -16142,7 +16163,7 @@
 ;;;***

 ;;;### (autoloads (macroexpand-all) "macroexp" "emacs-lisp/macroexp.el"
-;;;;;;  (19278 4521))
+;;;;;;  (19277 34919))
 ;;; Generated autoloads from emacs-lisp/macroexp.el

 (autoload 'macroexpand-all "macroexp" "\
@@ -16156,7 +16177,7 @@
 ;;;***

 ;;;### (autoloads (apply-macro-to-region-lines kbd-macro-query insert-kbd-macro
-;;;;;;  name-last-kbd-macro) "macros" "macros.el" (19307 36715))
+;;;;;;  name-last-kbd-macro) "macros" "macros.el" (19344 29797))
 ;;; Generated autoloads from macros.el

 (autoload 'name-last-kbd-macro "macros" "\
@@ -16245,7 +16266,7 @@
 ;;;***

 ;;;### (autoloads (what-domain mail-extract-address-components) "mail-extr"
-;;;;;;  "mail/mail-extr.el" (19278 4525))
+;;;;;;  "mail/mail-extr.el" (19277 34921))
 ;;; Generated autoloads from mail/mail-extr.el

 (autoload 'mail-extract-address-components "mail-extr" "\
@@ -16277,7 +16298,7 @@

 ;;;### (autoloads (mail-hist-put-headers-into-history mail-hist-keep-history
 ;;;;;;  mail-hist-enable mail-hist-define-keys) "mail-hist" "mail/mail-hist.el"
-;;;;;;  (19278 4525))
+;;;;;;  (19277 34921))
 ;;; Generated autoloads from mail/mail-hist.el

 (autoload 'mail-hist-define-keys "mail-hist" "\
@@ -16309,7 +16330,7 @@
 ;;;### (autoloads (mail-fetch-field mail-unquote-printable-region
 ;;;;;;  mail-unquote-printable mail-quote-printable-region mail-quote-printable
 ;;;;;;  mail-file-babyl-p mail-use-rfc822) "mail-utils" "mail/mail-utils.el"
-;;;;;;  (19307 36715))
+;;;;;;  (19306 22782))
 ;;; Generated autoloads from mail/mail-utils.el

 (defvar mail-use-rfc822 nil "\
@@ -16371,8 +16392,8 @@
 ;;;***

 ;;;### (autoloads (define-mail-abbrev build-mail-abbrevs mail-abbrevs-setup
-;;;;;;  mail-abbrevs-mode) "mailabbrev" "mail/mailabbrev.el" (19278
-;;;;;;  4525))
+;;;;;;  mail-abbrevs-mode) "mailabbrev" "mail/mailabbrev.el" (19277
+;;;;;;  34921))
 ;;; Generated autoloads from mail/mailabbrev.el

 (defvar mail-abbrevs-mode nil "\
@@ -16414,8 +16435,8 @@
 ;;;***

 ;;;### (autoloads (mail-complete define-mail-alias expand-mail-aliases
-;;;;;;  mail-complete-style) "mailalias" "mail/mailalias.el" (19278
-;;;;;;  4525))
+;;;;;;  mail-complete-style) "mailalias" "mail/mailalias.el" (19277
+;;;;;;  34921))
 ;;; Generated autoloads from mail/mailalias.el

 (defvar mail-complete-style 'angles "\
@@ -16461,7 +16482,7 @@
 ;;;***

 ;;;### (autoloads (mailclient-send-it) "mailclient" "mail/mailclient.el"
-;;;;;;  (19278 4525))
+;;;;;;  (19277 34921))
 ;;; Generated autoloads from mail/mailclient.el

 (autoload 'mailclient-send-it "mailclient" "\
@@ -16475,7 +16496,7 @@

 ;;;### (autoloads (makefile-imake-mode makefile-bsdmake-mode makefile-makepp-mode
 ;;;;;;  makefile-gmake-mode makefile-automake-mode makefile-mode)
-;;;;;;  "make-mode" "progmodes/make-mode.el" (19278 4528))
+;;;;;;  "make-mode" "progmodes/make-mode.el" (19277 34922))
 ;;; Generated autoloads from progmodes/make-mode.el

 (autoload 'makefile-mode "make-mode" "\
@@ -16592,8 +16613,8 @@

 ;;;***

-;;;### (autoloads (make-command-summary) "makesum" "makesum.el" (19278
-;;;;;;  4517))
+;;;### (autoloads (make-command-summary) "makesum" "makesum.el" (19277
+;;;;;;  34916))
 ;;; Generated autoloads from makesum.el

 (autoload 'make-command-summary "makesum" "\
@@ -16604,7 +16625,7 @@

 ;;;***

-;;;### (autoloads (man-follow man) "man" "man.el" (19322 43174))
+;;;### (autoloads (man-follow man) "man" "man.el" (19345 51357))
 ;;; Generated autoloads from man.el

 (defalias 'manual-entry 'man)
@@ -16653,7 +16674,7 @@

 ;;;***

-;;;### (autoloads (master-mode) "master" "master.el" (19278 4517))
+;;;### (autoloads (master-mode) "master" "master.el" (19277 34916))
 ;;; Generated autoloads from master.el

 (autoload 'master-mode "master" "\
@@ -16676,7 +16697,7 @@
 ;;;***

 ;;;### (autoloads (minibuffer-depth-indicate-mode) "mb-depth" "mb-depth.el"
-;;;;;;  (19278 4517))
+;;;;;;  (19277 34916))
 ;;; Generated autoloads from mb-depth.el

 (defvar minibuffer-depth-indicate-mode nil "\
@@ -16707,7 +16728,7 @@
 ;;;;;;  message-forward-make-body message-forward message-recover
 ;;;;;;  message-supersede message-cancel-news message-followup message-wide-reply
 ;;;;;;  message-reply message-news message-mail message-mode) "message"
-;;;;;;  "gnus/message.el" (19335 63611))
+;;;;;;  "gnus/message.el" (19362 59593))
 ;;; Generated autoloads from gnus/message.el

 (define-mail-user-agent 'message-user-agent 'message-mail 'message-send-and-exit 'message-kill-buffer 'message-send-hook)
@@ -16873,7 +16894,7 @@
 ;;;***

 ;;;### (autoloads (metapost-mode metafont-mode) "meta-mode" "progmodes/meta-mode.el"
-;;;;;;  (19278 4528))
+;;;;;;  (19277 34922))
 ;;; Generated autoloads from progmodes/meta-mode.el

 (autoload 'metafont-mode "meta-mode" "\
@@ -16900,7 +16921,7 @@

 ;;;### (autoloads (metamail-region metamail-buffer metamail-interpret-body
 ;;;;;;  metamail-interpret-header) "metamail" "mail/metamail.el"
-;;;;;;  (19278 4525))
+;;;;;;  (19354 34807))
 ;;; Generated autoloads from mail/metamail.el

 (autoload 'metamail-interpret-header "metamail" "\
@@ -16945,7 +16966,7 @@

 ;;;### (autoloads (mh-fully-kill-draft mh-send-letter mh-user-agent-compose
 ;;;;;;  mh-smail-batch mh-smail-other-window mh-smail) "mh-comp"
-;;;;;;  "mh-e/mh-comp.el" (19278 4525))
+;;;;;;  "mh-e/mh-comp.el" (19277 34921))
 ;;; Generated autoloads from mh-e/mh-comp.el

 (autoload 'mh-smail "mh-comp" "\
@@ -17035,7 +17056,7 @@

 ;;;***

-;;;### (autoloads (mh-version) "mh-e" "mh-e/mh-e.el" (19278 4525))
+;;;### (autoloads (mh-version) "mh-e" "mh-e/mh-e.el" (19277 34921))
 ;;; Generated autoloads from mh-e/mh-e.el

 (put 'mh-progs 'risky-local-variable t)
@@ -17052,7 +17073,7 @@
 ;;;***

 ;;;### (autoloads (mh-folder-mode mh-nmail mh-rmail) "mh-folder"
-;;;;;;  "mh-e/mh-folder.el" (19278 4525))
+;;;;;;  "mh-e/mh-folder.el" (19277 34921))
 ;;; Generated autoloads from mh-e/mh-folder.el

 (autoload 'mh-rmail "mh-folder" "\
@@ -17134,7 +17155,7 @@
 ;;;***

 ;;;### (autoloads (midnight-delay-set clean-buffer-list) "midnight"
-;;;;;;  "midnight.el" (19278 4517))
+;;;;;;  "midnight.el" (19277 34917))
 ;;; Generated autoloads from midnight.el

 (autoload 'clean-buffer-list "midnight" "\
@@ -17161,7 +17182,7 @@
 ;;;***

 ;;;### (autoloads (minibuffer-electric-default-mode) "minibuf-eldef"
-;;;;;;  "minibuf-eldef.el" (19278 4517))
+;;;;;;  "minibuf-eldef.el" (19277 34917))
 ;;; Generated autoloads from minibuf-eldef.el

 (defvar minibuffer-electric-default-mode nil "\
@@ -17188,7 +17209,7 @@

 ;;;***

-;;;### (autoloads (butterfly) "misc" "misc.el" (19278 4517))
+;;;### (autoloads (butterfly) "misc" "misc.el" (19277 34917))
 ;;; Generated autoloads from misc.el

 (autoload 'butterfly "misc" "\
@@ -17207,7 +17228,7 @@

 ;;;### (autoloads (multi-isearch-files-regexp multi-isearch-files
 ;;;;;;  multi-isearch-buffers-regexp multi-isearch-buffers multi-isearch-setup)
-;;;;;;  "misearch" "misearch.el" (19278 4517))
+;;;;;;  "misearch" "misearch.el" (19277 34917))
 ;;; Generated autoloads from misearch.el
  (add-hook 'isearch-mode-hook 'multi-isearch-setup)

@@ -17289,7 +17310,7 @@
 ;;;***

 ;;;### (autoloads (mixal-mode) "mixal-mode" "progmodes/mixal-mode.el"
-;;;;;;  (19278 4528))
+;;;;;;  (19360 14173))
 ;;; Generated autoloads from progmodes/mixal-mode.el

 (autoload 'mixal-mode "mixal-mode" "\
@@ -17303,7 +17324,7 @@
 ;;;***

 ;;;### (autoloads (mm-inline-external-body mm-extern-cache-contents)
-;;;;;;  "mm-extern" "gnus/mm-extern.el" (19278 4523))
+;;;;;;  "mm-extern" "gnus/mm-extern.el" (19277 34920))
 ;;; Generated autoloads from gnus/mm-extern.el

 (autoload 'mm-extern-cache-contents "mm-extern" "\
@@ -17322,7 +17343,7 @@
 ;;;***

 ;;;### (autoloads (mm-inline-partial) "mm-partial" "gnus/mm-partial.el"
-;;;;;;  (19278 4523))
+;;;;;;  (19277 34920))
 ;;; Generated autoloads from gnus/mm-partial.el

 (autoload 'mm-inline-partial "mm-partial" "\
@@ -17336,7 +17357,7 @@
 ;;;***

 ;;;### (autoloads (mm-url-insert-file-contents-external mm-url-insert-file-contents)
-;;;;;;  "mm-url" "gnus/mm-url.el" (19278 4523))
+;;;;;;  "mm-url" "gnus/mm-url.el" (19277 34920))
 ;;; Generated autoloads from gnus/mm-url.el

 (autoload 'mm-url-insert-file-contents "mm-url" "\
@@ -17353,7 +17374,7 @@
 ;;;***

 ;;;### (autoloads (mm-uu-dissect-text-parts mm-uu-dissect) "mm-uu"
-;;;;;;  "gnus/mm-uu.el" (19278 4523))
+;;;;;;  "gnus/mm-uu.el" (19277 34920))
 ;;; Generated autoloads from gnus/mm-uu.el

 (autoload 'mm-uu-dissect "mm-uu" "\
@@ -17373,7 +17394,7 @@
 ;;;***

 ;;;### (autoloads (mml1991-sign mml1991-encrypt) "mml1991" "gnus/mml1991.el"
-;;;;;;  (19278 4523))
+;;;;;;  (19362 59593))
 ;;; Generated autoloads from gnus/mml1991.el

 (autoload 'mml1991-encrypt "mml1991" "\
@@ -17390,7 +17411,7 @@

 ;;;### (autoloads (mml2015-self-encrypt mml2015-sign mml2015-encrypt
 ;;;;;;  mml2015-verify-test mml2015-verify mml2015-decrypt-test mml2015-decrypt)
-;;;;;;  "mml2015" "gnus/mml2015.el" (19278 4523))
+;;;;;;  "mml2015" "gnus/mml2015.el" (19362 59593))
 ;;; Generated autoloads from gnus/mml2015.el

 (autoload 'mml2015-decrypt "mml2015" "\
@@ -17431,7 +17452,7 @@
 ;;;***

 ;;;### (autoloads (modula-2-mode) "modula2" "progmodes/modula2.el"
-;;;;;;  (19259 35426))
+;;;;;;  (19267 61659))
 ;;; Generated autoloads from progmodes/modula2.el

 (autoload 'modula-2-mode "modula2" "\
@@ -17463,7 +17484,7 @@
 ;;;***

 ;;;### (autoloads (unmorse-region morse-region) "morse" "play/morse.el"
-;;;;;;  (19278 4527))
+;;;;;;  (19277 34922))
 ;;; Generated autoloads from play/morse.el

 (autoload 'morse-region "morse" "\
@@ -17479,7 +17500,7 @@
 ;;;***

 ;;;### (autoloads (mouse-drag-drag mouse-drag-throw) "mouse-drag"
-;;;;;;  "mouse-drag.el" (19278 4517))
+;;;;;;  "mouse-drag.el" (19277 34917))
 ;;; Generated autoloads from mouse-drag.el

 (autoload 'mouse-drag-throw "mouse-drag" "\
@@ -17526,8 +17547,8 @@

 ;;;***

-;;;### (autoloads (mouse-sel-mode) "mouse-sel" "mouse-sel.el" (19278
-;;;;;;  4517))
+;;;### (autoloads (mouse-sel-mode) "mouse-sel" "mouse-sel.el" (19277
+;;;;;;  34917))
 ;;; Generated autoloads from mouse-sel.el

 (defvar mouse-sel-mode nil "\
@@ -17579,7 +17600,7 @@

 ;;;***

-;;;### (autoloads (mpc) "mpc" "mpc.el" (19278 4517))
+;;;### (autoloads (mpc) "mpc" "mpc.el" (19277 34917))
 ;;; Generated autoloads from mpc.el

 (autoload 'mpc "mpc" "\
@@ -17589,7 +17610,7 @@

 ;;;***

-;;;### (autoloads (mpuz) "mpuz" "play/mpuz.el" (19278 4527))
+;;;### (autoloads (mpuz) "mpuz" "play/mpuz.el" (19277 34922))
 ;;; Generated autoloads from play/mpuz.el

 (autoload 'mpuz "mpuz" "\
@@ -17599,7 +17620,7 @@

 ;;;***

-;;;### (autoloads (msb-mode) "msb" "msb.el" (19278 4517))
+;;;### (autoloads (msb-mode) "msb" "msb.el" (19277 34917))
 ;;; Generated autoloads from msb.el

 (defvar msb-mode nil "\
@@ -17626,7 +17647,7 @@
 ;;;;;;  describe-current-coding-system describe-current-coding-system-briefly
 ;;;;;;  describe-coding-system describe-character-set list-charset-chars
 ;;;;;;  read-charset list-character-sets) "mule-diag" "international/mule-diag.el"
-;;;;;;  (19278 4524))
+;;;;;;  (19277 34920))
 ;;; Generated autoloads from international/mule-diag.el

 (autoload 'list-character-sets "mule-diag" "\
@@ -17763,7 +17784,7 @@
 ;;;;;;  coding-system-translation-table-for-decode coding-system-pre-write-conversion
 ;;;;;;  coding-system-post-read-conversion lookup-nested-alist set-nested-alist
 ;;;;;;  truncate-string-to-width store-substring string-to-sequence)
-;;;;;;  "mule-util" "international/mule-util.el" (19312 40161))
+;;;;;;  "mule-util" "international/mule-util.el" (19312 33528))
 ;;; Generated autoloads from international/mule-util.el

 (autoload 'string-to-sequence "mule-util" "\
@@ -17903,8 +17924,8 @@
 ;;;### (autoloads (network-connection network-connection-to-service
 ;;;;;;  whois-reverse-lookup whois finger ftp run-dig dns-lookup-host
 ;;;;;;  nslookup nslookup-host ping traceroute route arp netstat
-;;;;;;  iwconfig ifconfig) "net-utils" "net/net-utils.el" (19278
-;;;;;;  4525))
+;;;;;;  iwconfig ifconfig) "net-utils" "net/net-utils.el" (19277
+;;;;;;  34921))
 ;;; Generated autoloads from net/net-utils.el

 (autoload 'ifconfig "net-utils" "\
@@ -18003,7 +18024,7 @@
 ;;;;;;  uncomment-region comment-kill comment-set-column comment-indent
 ;;;;;;  comment-indent-default comment-normalize-vars comment-multi-line
 ;;;;;;  comment-padding comment-style comment-column) "newcomment"
-;;;;;;  "newcomment.el" (19278 4517))
+;;;;;;  "newcomment.el" (19277 34917))
 ;;; Generated autoloads from newcomment.el

 (defalias 'indent-for-comment 'comment-indent)
@@ -18203,7 +18224,7 @@
 ;;;***

 ;;;### (autoloads (newsticker-start newsticker-running-p) "newst-backend"
-;;;;;;  "net/newst-backend.el" (19278 4525))
+;;;;;;  "net/newst-backend.el" (19277 34921))
 ;;; Generated autoloads from net/newst-backend.el

 (autoload 'newsticker-running-p "newst-backend" "\
@@ -18225,7 +18246,7 @@
 ;;;***

 ;;;### (autoloads (newsticker-plainview) "newst-plainview" "net/newst-plainview.el"
-;;;;;;  (19278 4525))
+;;;;;;  (19277 34921))
 ;;; Generated autoloads from net/newst-plainview.el

 (autoload 'newsticker-plainview "newst-plainview" "\
@@ -18236,7 +18257,7 @@
 ;;;***

 ;;;### (autoloads (newsticker-show-news) "newst-reader" "net/newst-reader.el"
-;;;;;;  (19278 4525))
+;;;;;;  (19277 34921))
 ;;; Generated autoloads from net/newst-reader.el

 (autoload 'newsticker-show-news "newst-reader" "\
@@ -18247,7 +18268,7 @@
 ;;;***

 ;;;### (autoloads (newsticker-start-ticker newsticker-ticker-running-p)
-;;;;;;  "newst-ticker" "net/newst-ticker.el" (19278 4525))
+;;;;;;  "newst-ticker" "net/newst-ticker.el" (19277 34921))
 ;;; Generated autoloads from net/newst-ticker.el

 (autoload 'newsticker-ticker-running-p "newst-ticker" "\
@@ -18268,7 +18289,7 @@
 ;;;***

 ;;;### (autoloads (newsticker-treeview) "newst-treeview" "net/newst-treeview.el"
-;;;;;;  (19278 4525))
+;;;;;;  (19277 34921))
 ;;; Generated autoloads from net/newst-treeview.el

 (autoload 'newsticker-treeview "newst-treeview" "\
@@ -18279,7 +18300,7 @@
 ;;;***

 ;;;### (autoloads (nndiary-generate-nov-databases) "nndiary" "gnus/nndiary.el"
-;;;;;;  (19279 36173))
+;;;;;;  (19279 53114))
 ;;; Generated autoloads from gnus/nndiary.el

 (autoload 'nndiary-generate-nov-databases "nndiary" "\
@@ -18289,8 +18310,8 @@

 ;;;***

-;;;### (autoloads (nndoc-add-type) "nndoc" "gnus/nndoc.el" (19278
-;;;;;;  4523))
+;;;### (autoloads (nndoc-add-type) "nndoc" "gnus/nndoc.el" (19277
+;;;;;;  34920))
 ;;; Generated autoloads from gnus/nndoc.el

 (autoload 'nndoc-add-type "nndoc" "\
@@ -18305,7 +18326,7 @@
 ;;;***

 ;;;### (autoloads (nnfolder-generate-active-file) "nnfolder" "gnus/nnfolder.el"
-;;;;;;  (19278 4523))
+;;;;;;  (19277 34920))
 ;;; Generated autoloads from gnus/nnfolder.el

 (autoload 'nnfolder-generate-active-file "nnfolder" "\
@@ -18317,7 +18338,7 @@
 ;;;***

 ;;;### (autoloads (nnkiboze-generate-groups) "nnkiboze" "gnus/nnkiboze.el"
-;;;;;;  (19278 4523))
+;;;;;;  (19277 34920))
 ;;; Generated autoloads from gnus/nnkiboze.el

 (autoload 'nnkiboze-generate-groups "nnkiboze" "\
@@ -18329,7 +18350,7 @@
 ;;;***

 ;;;### (autoloads (nnml-generate-nov-databases) "nnml" "gnus/nnml.el"
-;;;;;;  (19279 36173))
+;;;;;;  (19279 53114))
 ;;; Generated autoloads from gnus/nnml.el

 (autoload 'nnml-generate-nov-databases "nnml" "\
@@ -18340,7 +18361,7 @@
 ;;;***

 ;;;### (autoloads (nnsoup-revert-variables nnsoup-set-variables nnsoup-pack-replies)
-;;;;;;  "nnsoup" "gnus/nnsoup.el" (19278 4523))
+;;;;;;  "nnsoup" "gnus/nnsoup.el" (19277 34920))
 ;;; Generated autoloads from gnus/nnsoup.el

 (autoload 'nnsoup-pack-replies "nnsoup" "\
@@ -18361,7 +18382,7 @@
 ;;;***

 ;;;### (autoloads (disable-command enable-command disabled-command-function)
-;;;;;;  "novice" "novice.el" (19278 4517))
+;;;;;;  "novice" "novice.el" (19277 34917))
 ;;; Generated autoloads from novice.el

 (defvar disabled-command-function 'disabled-command-function "\
@@ -18394,7 +18415,7 @@
 ;;;***

 ;;;### (autoloads (nroff-mode) "nroff-mode" "textmodes/nroff-mode.el"
-;;;;;;  (19278 4529))
+;;;;;;  (19277 34923))
 ;;; Generated autoloads from textmodes/nroff-mode.el

 (autoload 'nroff-mode "nroff-mode" "\
@@ -18409,7 +18430,7 @@
 ;;;***

 ;;;### (autoloads (nxml-glyph-display-string) "nxml-glyph" "nxml/nxml-glyph.el"
-;;;;;;  (19278 4526))
+;;;;;;  (19277 34921))
 ;;; Generated autoloads from nxml/nxml-glyph.el

 (autoload 'nxml-glyph-display-string "nxml-glyph" "\
@@ -18421,8 +18442,8 @@

 ;;;***

-;;;### (autoloads (nxml-mode) "nxml-mode" "nxml/nxml-mode.el" (19320
-;;;;;;  55181))
+;;;### (autoloads (nxml-mode) "nxml-mode" "nxml/nxml-mode.el" (19354
+;;;;;;  34807))
 ;;; Generated autoloads from nxml/nxml-mode.el

 (autoload 'nxml-mode "nxml-mode" "\
@@ -18484,7 +18505,7 @@
 ;;;***

 ;;;### (autoloads (nxml-enable-unicode-char-name-sets) "nxml-uchnm"
-;;;;;;  "nxml/nxml-uchnm.el" (19278 4526))
+;;;;;;  "nxml/nxml-uchnm.el" (19277 34921))
 ;;; Generated autoloads from nxml/nxml-uchnm.el

 (autoload 'nxml-enable-unicode-char-name-sets "nxml-uchnm" "\
@@ -18497,7 +18518,7 @@
 ;;;***

 ;;;### (autoloads (inferior-octave) "octave-inf" "progmodes/octave-inf.el"
-;;;;;;  (19278 4528))
+;;;;;;  (19277 34922))
 ;;; Generated autoloads from progmodes/octave-inf.el

 (autoload 'inferior-octave "octave-inf" "\
@@ -18520,7 +18541,7 @@
 ;;;***

 ;;;### (autoloads (octave-mode) "octave-mod" "progmodes/octave-mod.el"
-;;;;;;  (19278 4528))
+;;;;;;  (19277 34922))
 ;;; Generated autoloads from progmodes/octave-mod.el

 (autoload 'octave-mode "octave-mod" "\
@@ -18615,7 +18636,7 @@
 ;;;;;;  org-map-entries org-open-link-from-string org-open-at-point-global
 ;;;;;;  org-insert-link-global org-store-link org-run-like-in-org-mode
 ;;;;;;  turn-on-orgstruct++ turn-on-orgstruct orgstruct-mode org-global-cycle
-;;;;;;  org-mode) "org" "org/org.el" (19278 4526))
+;;;;;;  org-mode) "org" "org/org.el" (19354 34807))
 ;;; Generated autoloads from org/org.el

 (autoload 'org-mode "org" "\
@@ -18828,7 +18849,7 @@
 ;;;;;;  org-diary org-agenda-list-stuck-projects org-tags-view org-todo-list
 ;;;;;;  org-search-view org-agenda-list org-batch-store-agenda-views
 ;;;;;;  org-store-agenda-views org-batch-agenda-csv org-batch-agenda
-;;;;;;  org-agenda) "org-agenda" "org/org-agenda.el" (19278 4526))
+;;;;;;  org-agenda) "org-agenda" "org/org-agenda.el" (19277 34922))
 ;;; Generated autoloads from org/org-agenda.el

 (autoload 'org-agenda "org-agenda" "\
@@ -19091,7 +19112,7 @@

 ;;;### (autoloads (org-archive-subtree-default-with-confirmation
 ;;;;;;  org-archive-subtree-default) "org-archive" "org/org-archive.el"
-;;;;;;  (19278 4526))
+;;;;;;  (19277 34922))
 ;;; Generated autoloads from org/org-archive.el

 (autoload 'org-archive-subtree-default "org-archive" "\
@@ -19110,7 +19131,7 @@

 ;;;### (autoloads (org-export-as-ascii org-export-region-as-ascii
 ;;;;;;  org-replace-region-by-ascii org-export-as-ascii-to-buffer)
-;;;;;;  "org-ascii" "org/org-ascii.el" (19278 4526))
+;;;;;;  "org-ascii" "org/org-ascii.el" (19277 34922))
 ;;; Generated autoloads from org/org-ascii.el

 (autoload 'org-export-as-ascii-to-buffer "org-ascii" "\
@@ -19163,8 +19184,8 @@

 ;;;***

-;;;### (autoloads (org-attach) "org-attach" "org/org-attach.el" (19278
-;;;;;;  4526))
+;;;### (autoloads (org-attach) "org-attach" "org/org-attach.el" (19277
+;;;;;;  34922))
 ;;; Generated autoloads from org/org-attach.el

 (autoload 'org-attach "org-attach" "\
@@ -19176,7 +19197,7 @@
 ;;;***

 ;;;### (autoloads (org-bbdb-anniversaries) "org-bbdb" "org/org-bbdb.el"
-;;;;;;  (19278 4526))
+;;;;;;  (19277 34922))
 ;;; Generated autoloads from org/org-bbdb.el

 (autoload 'org-bbdb-anniversaries "org-bbdb" "\
@@ -19187,7 +19208,7 @@
 ;;;***

 ;;;### (autoloads (org-clock-persistence-insinuate org-get-clocktable)
-;;;;;;  "org-clock" "org/org-clock.el" (19278 4526))
+;;;;;;  "org-clock" "org/org-clock.el" (19277 34922))
 ;;; Generated autoloads from org/org-clock.el

 (autoload 'org-get-clocktable "org-clock" "\
@@ -19207,7 +19228,7 @@
 ;;;### (autoloads (org-export-as-docbook org-export-as-docbook-pdf-and-open
 ;;;;;;  org-export-as-docbook-pdf org-export-region-as-docbook org-replace-region-by-docbook
 ;;;;;;  org-export-as-docbook-to-buffer org-export-as-docbook-batch)
-;;;;;;  "org-docbook" "org/org-docbook.el" (19278 4526))
+;;;;;;  "org-docbook" "org/org-docbook.el" (19277 34922))
 ;;; Generated autoloads from org/org-docbook.el

 (autoload 'org-export-as-docbook-batch "org-docbook" "\
@@ -19284,7 +19305,7 @@

 ;;;### (autoloads (org-insert-export-options-template org-export-as-org
 ;;;;;;  org-export-visible org-export) "org-exp" "org/org-exp.el"
-;;;;;;  (19278 4526))
+;;;;;;  (19277 34922))
 ;;; Generated autoloads from org/org-exp.el

 (autoload 'org-export "org-exp" "\
@@ -19341,8 +19362,8 @@
 ;;;***

 ;;;### (autoloads (org-feed-show-raw-feed org-feed-goto-inbox org-feed-update
-;;;;;;  org-feed-update-all) "org-feed" "org/org-feed.el" (19278
-;;;;;;  4526))
+;;;;;;  org-feed-update-all) "org-feed" "org/org-feed.el" (19277
+;;;;;;  34922))
 ;;; Generated autoloads from org/org-feed.el

 (autoload 'org-feed-update-all "org-feed" "\
@@ -19370,7 +19391,7 @@
 ;;;***

 ;;;### (autoloads (org-footnote-normalize org-footnote-action) "org-footnote"
-;;;;;;  "org/org-footnote.el" (19278 4526))
+;;;;;;  "org/org-footnote.el" (19277 34922))
 ;;; Generated autoloads from org/org-footnote.el

 (autoload 'org-footnote-action "org-footnote" "\
@@ -19397,7 +19418,7 @@
 ;;;### (autoloads (org-freemind-to-org-mode org-freemind-from-org-sparse-tree
 ;;;;;;  org-freemind-from-org-mode org-freemind-from-org-mode-node
 ;;;;;;  org-freemind-show org-export-as-freemind) "org-freemind"
-;;;;;;  "org/org-freemind.el" (19321 2184))
+;;;;;;  "org/org-freemind.el" (19324 55756))
 ;;; Generated autoloads from org/org-freemind.el

 (autoload 'org-export-as-freemind "org-freemind" "\
@@ -19435,7 +19456,7 @@
 ;;;### (autoloads (org-export-htmlize-generate-css org-export-as-html
 ;;;;;;  org-export-region-as-html org-replace-region-by-html org-export-as-html-to-buffer
 ;;;;;;  org-export-as-html-batch org-export-as-html-and-open) "org-html"
-;;;;;;  "org/org-html.el" (19278 4526))
+;;;;;;  "org/org-html.el" (19277 34922))
 ;;; Generated autoloads from org/org-html.el

 (put 'org-export-html-style-include-default 'safe-local-variable 'booleanp)
@@ -19528,7 +19549,7 @@

 ;;;### (autoloads (org-export-icalendar-combine-agenda-files org-export-icalendar-all-agenda-files
 ;;;;;;  org-export-icalendar-this-file) "org-icalendar" "org/org-icalendar.el"
-;;;;;;  (19278 4526))
+;;;;;;  (19277 34922))
 ;;; Generated autoloads from org/org-icalendar.el

 (autoload 'org-export-icalendar-this-file "org-icalendar" "\
@@ -19555,7 +19576,7 @@

 ;;;### (autoloads (org-id-find-id-file org-id-find org-id-goto org-id-get-with-outline-drilling
 ;;;;;;  org-id-get-with-outline-path-completion org-id-get org-id-copy
-;;;;;;  org-id-get-create) "org-id" "org/org-id.el" (19278 4526))
+;;;;;;  org-id-get-create) "org-id" "org/org-id.el" (19277 34922))
 ;;; Generated autoloads from org/org-id.el

 (autoload 'org-id-get-create "org-id" "\
@@ -19619,7 +19640,7 @@
 ;;;***

 ;;;### (autoloads (org-indent-mode) "org-indent" "org/org-indent.el"
-;;;;;;  (19278 4526))
+;;;;;;  (19277 34922))
 ;;; Generated autoloads from org/org-indent.el

 (autoload 'org-indent-mode "org-indent" "\
@@ -19634,7 +19655,7 @@
 ;;;***

 ;;;### (autoloads (org-irc-store-link) "org-irc" "org/org-irc.el"
-;;;;;;  (19278 4526))
+;;;;;;  (19277 34922))
 ;;; Generated autoloads from org/org-irc.el

 (autoload 'org-irc-store-link "org-irc" "\
@@ -19647,7 +19668,7 @@
 ;;;### (autoloads (org-export-as-pdf-and-open org-export-as-pdf org-export-as-latex
 ;;;;;;  org-export-region-as-latex org-replace-region-by-latex org-export-as-latex-to-buffer
 ;;;;;;  org-export-as-latex-batch) "org-latex" "org/org-latex.el"
-;;;;;;  (19278 4526))
+;;;;;;  (19277 34922))
 ;;; Generated autoloads from org/org-latex.el

 (autoload 'org-export-as-latex-batch "org-latex" "\
@@ -19727,8 +19748,8 @@
 ;;;***

 ;;;### (autoloads (org-mobile-create-sumo-agenda org-mobile-pull
-;;;;;;  org-mobile-push) "org-mobile" "org/org-mobile.el" (19278
-;;;;;;  4526))
+;;;;;;  org-mobile-push) "org-mobile" "org/org-mobile.el" (19277
+;;;;;;  34922))
 ;;; Generated autoloads from org/org-mobile.el

 (autoload 'org-mobile-push "org-mobile" "\
@@ -19753,7 +19774,7 @@
 ;;;***

 ;;;### (autoloads (org-plot/gnuplot) "org-plot" "org/org-plot.el"
-;;;;;;  (19278 4526))
+;;;;;;  (19277 34922))
 ;;; Generated autoloads from org/org-plot.el

 (autoload 'org-plot/gnuplot "org-plot" "\
@@ -19767,7 +19788,7 @@

 ;;;### (autoloads (org-publish-current-project org-publish-current-file
 ;;;;;;  org-publish-all org-publish) "org-publish" "org/org-publish.el"
-;;;;;;  (19278 4526))
+;;;;;;  (19277 34922))
 ;;; Generated autoloads from org/org-publish.el

 (defalias 'org-publish-project 'org-publish)
@@ -19801,7 +19822,7 @@

 ;;;### (autoloads (org-remember-handler org-remember org-remember-apply-template
 ;;;;;;  org-remember-annotation org-remember-insinuate) "org-remember"
-;;;;;;  "org/org-remember.el" (19278 4526))
+;;;;;;  "org/org-remember.el" (19277 34922))
 ;;; Generated autoloads from org/org-remember.el

 (autoload 'org-remember-insinuate "org-remember" "\
@@ -19876,7 +19897,7 @@
 ;;;***

 ;;;### (autoloads (org-table-to-lisp orgtbl-mode turn-on-orgtbl)
-;;;;;;  "org-table" "org/org-table.el" (19278 4526))
+;;;;;;  "org-table" "org/org-table.el" (19277 34922))
 ;;; Generated autoloads from org/org-table.el

 (autoload 'turn-on-orgtbl "org-table" "\
@@ -19901,7 +19922,7 @@

 ;;;### (autoloads (org-timer-set-timer org-timer-item org-timer-change-times-in-region
 ;;;;;;  org-timer org-timer-start) "org-timer" "org/org-timer.el"
-;;;;;;  (19278 4526))
+;;;;;;  (19277 34922))
 ;;; Generated autoloads from org/org-timer.el

 (autoload 'org-timer-start "org-timer" "\
@@ -19945,7 +19966,7 @@
 ;;;***

 ;;;### (autoloads (org-export-as-xoxo) "org-xoxo" "org/org-xoxo.el"
-;;;;;;  (19278 4526))
+;;;;;;  (19277 34922))
 ;;; Generated autoloads from org/org-xoxo.el

 (autoload 'org-export-as-xoxo "org-xoxo" "\
@@ -19957,7 +19978,7 @@
 ;;;***

 ;;;### (autoloads (outline-minor-mode outline-mode) "outline" "outline.el"
-;;;;;;  (19322 43174))
+;;;;;;  (19354 34807))
 ;;; Generated autoloads from outline.el
 (put 'outline-regexp 'safe-local-variable 'string-or-null-p)

@@ -20014,7 +20035,7 @@

 ;;;***

-;;;### (autoloads (show-paren-mode) "paren" "paren.el" (19278 4517))
+;;;### (autoloads (show-paren-mode) "paren" "paren.el" (19277 34917))
 ;;; Generated autoloads from paren.el

 (defvar show-paren-mode nil "\
@@ -20039,7 +20060,7 @@
 ;;;***

 ;;;### (autoloads (parse-time-string) "parse-time" "calendar/parse-time.el"
-;;;;;;  (19278 4519))
+;;;;;;  (19277 34918))
 ;;; Generated autoloads from calendar/parse-time.el
 (put 'parse-time-rules 'risky-local-variable t)

@@ -20052,8 +20073,8 @@

 ;;;***

-;;;### (autoloads (pascal-mode) "pascal" "progmodes/pascal.el" (19278
-;;;;;;  4528))
+;;;### (autoloads (pascal-mode) "pascal" "progmodes/pascal.el" (19277
+;;;;;;  34922))
 ;;; Generated autoloads from progmodes/pascal.el

 (autoload 'pascal-mode "pascal" "\
@@ -20105,8 +20126,25 @@

 ;;;***

+;;;### (autoloads (password-cache-expiry password-cache) "password-cache"
+;;;;;;  "password-cache.el" (19362 59593))
+;;; Generated autoloads from password-cache.el
+
+(defvar password-cache t "\
+Whether to cache passwords.")
+
+(custom-autoload 'password-cache "password-cache" t)
+
+(defvar password-cache-expiry 16 "\
+How many seconds passwords are cached, or nil to disable expiring.
+Whether passwords are cached at all is controlled by `password-cache'.")
+
+(custom-autoload 'password-cache-expiry "password-cache" t)
+
+;;;***
+
 ;;;### (autoloads (pc-bindings-mode) "pc-mode" "emulation/pc-mode.el"
-;;;;;;  (19278 4522))
+;;;;;;  (19277 34919))
 ;;; Generated autoloads from emulation/pc-mode.el

 (autoload 'pc-bindings-mode "pc-mode" "\
@@ -20124,7 +20162,7 @@
 ;;;***

 ;;;### (autoloads (pc-selection-mode) "pc-select" "emulation/pc-select.el"
-;;;;;;  (19278 4522))
+;;;;;;  (19354 34807))
 ;;; Generated autoloads from emulation/pc-select.el

 (defvar pc-selection-mode nil "\
@@ -20190,8 +20228,8 @@

 ;;;***

-;;;### (autoloads (pcomplete/cvs) "pcmpl-cvs" "pcmpl-cvs.el" (19278
-;;;;;;  4517))
+;;;### (autoloads (pcomplete/cvs) "pcmpl-cvs" "pcmpl-cvs.el" (19277
+;;;;;;  34917))
 ;;; Generated autoloads from pcmpl-cvs.el

 (autoload 'pcomplete/cvs "pcmpl-cvs" "\
@@ -20202,7 +20240,7 @@
 ;;;***

 ;;;### (autoloads (pcomplete/tar pcomplete/make pcomplete/bzip2 pcomplete/gzip)
-;;;;;;  "pcmpl-gnu" "pcmpl-gnu.el" (19278 4517))
+;;;;;;  "pcmpl-gnu" "pcmpl-gnu.el" (19277 34917))
 ;;; Generated autoloads from pcmpl-gnu.el

 (autoload 'pcomplete/gzip "pcmpl-gnu" "\
@@ -20230,7 +20268,7 @@
 ;;;***

 ;;;### (autoloads (pcomplete/mount pcomplete/umount pcomplete/kill)
-;;;;;;  "pcmpl-linux" "pcmpl-linux.el" (19278 4517))
+;;;;;;  "pcmpl-linux" "pcmpl-linux.el" (19277 34917))
 ;;; Generated autoloads from pcmpl-linux.el

 (autoload 'pcomplete/kill "pcmpl-linux" "\
@@ -20250,8 +20288,8 @@

 ;;;***

-;;;### (autoloads (pcomplete/rpm) "pcmpl-rpm" "pcmpl-rpm.el" (19278
-;;;;;;  4517))
+;;;### (autoloads (pcomplete/rpm) "pcmpl-rpm" "pcmpl-rpm.el" (19277
+;;;;;;  34917))
 ;;; Generated autoloads from pcmpl-rpm.el

 (autoload 'pcomplete/rpm "pcmpl-rpm" "\
@@ -20263,7 +20301,7 @@

 ;;;### (autoloads (pcomplete/scp pcomplete/ssh pcomplete/chgrp pcomplete/chown
 ;;;;;;  pcomplete/which pcomplete/xargs pcomplete/rm pcomplete/rmdir
-;;;;;;  pcomplete/cd) "pcmpl-unix" "pcmpl-unix.el" (19282 9833))
+;;;;;;  pcomplete/cd) "pcmpl-unix" "pcmpl-unix.el" (19286 4503))
 ;;; Generated autoloads from pcmpl-unix.el

 (autoload 'pcomplete/cd "pcmpl-unix" "\
@@ -20320,8 +20358,8 @@

 ;;;### (autoloads (pcomplete-shell-setup pcomplete-comint-setup pcomplete-list
 ;;;;;;  pcomplete-help pcomplete-expand pcomplete-continue pcomplete-expand-and-complete
-;;;;;;  pcomplete-reverse pcomplete) "pcomplete" "pcomplete.el" (19278
-;;;;;;  4517))
+;;;;;;  pcomplete-reverse pcomplete) "pcomplete" "pcomplete.el" (19277
+;;;;;;  34917))
 ;;; Generated autoloads from pcomplete.el

 (autoload 'pcomplete "pcomplete" "\
@@ -20380,7 +20418,7 @@

 ;;;### (autoloads (cvs-dired-use-hook cvs-dired-action cvs-status
 ;;;;;;  cvs-update cvs-examine cvs-quickdir cvs-checkout) "pcvs"
-;;;;;;  "pcvs.el" (19278 4517))
+;;;;;;  "pcvs.el" (19277 34917))
 ;;; Generated autoloads from pcvs.el

 (autoload 'cvs-checkout "pcvs" "\
@@ -20455,7 +20493,7 @@

 ;;;***

-;;;### (autoloads nil "pcvs-defs" "pcvs-defs.el" (19278 4517))
+;;;### (autoloads nil "pcvs-defs" "pcvs-defs.el" (19277 34917))
 ;;; Generated autoloads from pcvs-defs.el

 (defvar cvs-global-menu (let ((m (make-sparse-keymap "PCL-CVS"))) (define-key m [status] `(menu-item ,(purecopy "Directory Status") cvs-status :help ,(purecopy "A more verbose status of a workarea"))) (define-key m [checkout] `(menu-item ,(purecopy "Checkout Module") cvs-checkout :help ,(purecopy "Check out a module from the repository"))) (define-key m [update] `(menu-item ,(purecopy "Update Directory") cvs-update :help ,(purecopy "Fetch updates from the repository"))) (define-key m [examine] `(menu-item ,(purecopy "Examine Directory") cvs-examine :help ,(purecopy "Examine the current state of a workarea"))) (fset 'cvs-global-menu m)))
@@ -20463,7 +20501,7 @@
 ;;;***

 ;;;### (autoloads (perl-mode) "perl-mode" "progmodes/perl-mode.el"
-;;;;;;  (19278 4528))
+;;;;;;  (19277 34922))
 ;;; Generated autoloads from progmodes/perl-mode.el
 (put 'perl-indent-level 'safe-local-variable 'integerp)
 (put 'perl-continued-statement-offset 'safe-local-variable 'integerp)
@@ -20527,7 +20565,7 @@
 ;;;### (autoloads (pgg-snarf-keys pgg-snarf-keys-region pgg-insert-key
 ;;;;;;  pgg-verify pgg-verify-region pgg-sign pgg-sign-region pgg-decrypt
 ;;;;;;  pgg-decrypt-region pgg-encrypt pgg-encrypt-symmetric pgg-encrypt-symmetric-region
-;;;;;;  pgg-encrypt-region) "pgg" "pgg.el" (19278 4517))
+;;;;;;  pgg-encrypt-region) "pgg" "pgg.el" (19277 34917))
 ;;; Generated autoloads from pgg.el

 (autoload 'pgg-encrypt-region "pgg" "\
@@ -20661,7 +20699,7 @@
 ;;;***

 ;;;### (autoloads (pgg-gpg-symmetric-key-p) "pgg-gpg" "pgg-gpg.el"
-;;;;;;  (19278 4517))
+;;;;;;  (19277 34917))
 ;;; Generated autoloads from pgg-gpg.el

 (autoload 'pgg-gpg-symmetric-key-p "pgg-gpg" "\
@@ -20672,7 +20710,7 @@
 ;;;***

 ;;;### (autoloads (picture-mode) "picture" "textmodes/picture.el"
-;;;;;;  (19278 4529))
+;;;;;;  (19354 34807))
 ;;; Generated autoloads from textmodes/picture.el

 (autoload 'picture-mode "picture" "\
@@ -20753,7 +20791,7 @@
 ;;;***

 ;;;### (autoloads (po-find-file-coding-system) "po" "textmodes/po.el"
-;;;;;;  (19278 4529))
+;;;;;;  (19277 34923))
 ;;; Generated autoloads from textmodes/po.el

 (autoload 'po-find-file-coding-system "po" "\
@@ -20764,7 +20802,7 @@

 ;;;***

-;;;### (autoloads (pong) "pong" "play/pong.el" (19278 4527))
+;;;### (autoloads (pong) "pong" "play/pong.el" (19277 34922))
 ;;; Generated autoloads from play/pong.el

 (autoload 'pong "pong" "\
@@ -20782,7 +20820,7 @@

 ;;;### (autoloads (pp-macroexpand-last-sexp pp-eval-last-sexp pp-macroexpand-expression
 ;;;;;;  pp-eval-expression pp pp-buffer pp-to-string) "pp" "emacs-lisp/pp.el"
-;;;;;;  (19278 4521))
+;;;;;;  (19277 34919))
 ;;; Generated autoloads from emacs-lisp/pp.el

 (autoload 'pp-to-string "pp" "\
@@ -20850,7 +20888,7 @@
 ;;;;;;  pr-ps-buffer-print pr-ps-buffer-using-ghostscript pr-ps-buffer-preview
 ;;;;;;  pr-ps-directory-ps-print pr-ps-directory-print pr-ps-directory-using-ghostscript
 ;;;;;;  pr-ps-directory-preview pr-interface) "printing" "printing.el"
-;;;;;;  (19278 4517))
+;;;;;;  (19277 34917))
 ;;; Generated autoloads from printing.el

 (autoload 'pr-interface "printing" "\
@@ -21437,7 +21475,7 @@

 ;;;***

-;;;### (autoloads (proced) "proced" "proced.el" (19278 4517))
+;;;### (autoloads (proced) "proced" "proced.el" (19277 34917))
 ;;; Generated autoloads from proced.el

 (autoload 'proced "proced" "\
@@ -21453,7 +21491,7 @@
 ;;;***

 ;;;### (autoloads (switch-to-prolog prolog-mode) "prolog" "progmodes/prolog.el"
-;;;;;;  (19278 4528))
+;;;;;;  (19277 34922))
 ;;; Generated autoloads from progmodes/prolog.el

 (autoload 'prolog-mode "prolog" "\
@@ -21476,8 +21514,8 @@

 ;;;***

-;;;### (autoloads (bdf-directory-list) "ps-bdf" "ps-bdf.el" (19278
-;;;;;;  4517))
+;;;### (autoloads (bdf-directory-list) "ps-bdf" "ps-bdf.el" (19277
+;;;;;;  34917))
 ;;; Generated autoloads from ps-bdf.el

 (defvar bdf-directory-list (if (memq system-type '(ms-dos windows-nt)) (list (expand-file-name "fonts/bdf" installation-directory)) '("/usr/local/share/emacs/fonts/bdf")) "\
@@ -21488,8 +21526,8 @@

 ;;;***

-;;;### (autoloads (ps-mode) "ps-mode" "progmodes/ps-mode.el" (19278
-;;;;;;  4528))
+;;;### (autoloads (ps-mode) "ps-mode" "progmodes/ps-mode.el" (19277
+;;;;;;  34922))
 ;;; Generated autoloads from progmodes/ps-mode.el

 (autoload 'ps-mode "ps-mode" "\
@@ -21540,8 +21578,8 @@
 ;;;;;;  ps-spool-region ps-spool-buffer-with-faces ps-spool-buffer
 ;;;;;;  ps-print-region-with-faces ps-print-region ps-print-buffer-with-faces
 ;;;;;;  ps-print-buffer ps-print-customize ps-print-color-p ps-paper-type
-;;;;;;  ps-page-dimensions-database) "ps-print" "ps-print.el" (19278
-;;;;;;  4517))
+;;;;;;  ps-page-dimensions-database) "ps-print" "ps-print.el" (19354
+;;;;;;  34807))
 ;;; Generated autoloads from ps-print.el

 (defvar ps-page-dimensions-database (purecopy (list (list 'a4 (/ (* 72 21.0) 2.54) (/ (* 72 29.7) 2.54) "A4") (list 'a3 (/ (* 72 29.7) 2.54) (/ (* 72 42.0) 2.54) "A3") (list 'letter (* 72 8.5) (* 72 11.0) "Letter") (list 'legal (* 72 8.5) (* 72 14.0) "Legal") (list 'letter-small (* 72 7.68) (* 72 10.16) "LetterSmall") (list 'tabloid (* 72 11.0) (* 72 17.0) "Tabloid") (list 'ledger (* 72 17.0) (* 72 11.0) "Ledger") (list 'statement (* 72 5.5) (* 72 8.5) "Statement") (list 'executive (* 72 7.5) (* 72 10.0) "Executive") (list 'a4small (* 72 7.47) (* 72 10.85) "A4Small") (list 'b4 (* 72 10.125) (* 72 14.33) "B4") (list 'b5 (* 72 7.16) (* 72 10.125) "B5") '(addresslarge 236.0 99.0 "AddressLarge") '(addresssmall 236.0 68.0 "AddressSmall") '(cuthanging13 90.0 222.0 "CutHanging13") '(cuthanging15 90.0 114.0 "CutHanging15") '(diskette 181.0 136.0 "Diskette") '(eurofilefolder 139.0 112.0 "EuropeanFilefolder") '(eurofoldernarrow 526.0 107.0 "EuroFolderNarrow") '(eurofolderwide 526.0 136.0 "EuroFolderWide") '(euronamebadge 189.0 108.0 "EuroNameBadge") '(euronamebadgelarge 223.0 136.0 "EuroNameBadgeLarge") '(filefolder 230.0 37.0 "FileFolder") '(jewelry 76.0 136.0 "Jewelry") '(mediabadge 180.0 136.0 "MediaBadge") '(multipurpose 126.0 68.0 "MultiPurpose") '(retaillabel 90.0 104.0 "RetailLabel") '(shipping 271.0 136.0 "Shipping") '(slide35mm 26.0 104.0 "Slide35mm") '(spine8mm 187.0 26.0 "Spine8mm") '(topcoated 425.19685 136.0 "TopCoatedPaper") '(topcoatedpaper 396.0 136.0 "TopcoatedPaper150") '(vhsface 205.0 127.0 "VHSFace") '(vhsspine 400.0 50.0 "VHSSpine") '(zipdisk 156.0 136.0 "ZipDisk"))) "\
@@ -21738,7 +21776,7 @@
 ;;;***

 ;;;### (autoloads (python-shell jython-mode python-mode run-python)
-;;;;;;  "python" "progmodes/python.el" (19336 25572))
+;;;;;;  "python" "progmodes/python.el" (19336 30736))
 ;;; Generated autoloads from progmodes/python.el

 (add-to-list 'interpreter-mode-alist (cons (purecopy "jython") 'jython-mode))
@@ -21854,7 +21892,7 @@
 ;;;***

 ;;;### (autoloads (quoted-printable-decode-region) "qp" "gnus/qp.el"
-;;;;;;  (19278 4523))
+;;;;;;  (19277 34920))
 ;;; Generated autoloads from gnus/qp.el

 (autoload 'quoted-printable-decode-region "qp" "\
@@ -21877,7 +21915,7 @@
 ;;;;;;  quail-defrule quail-install-decode-map quail-install-map
 ;;;;;;  quail-define-rules quail-show-keyboard-layout quail-set-keyboard-layout
 ;;;;;;  quail-define-package quail-use-package quail-title) "quail"
-;;;;;;  "international/quail.el" (19278 4524))
+;;;;;;  "international/quail.el" (19277 34920))
 ;;; Generated autoloads from international/quail.el

 (autoload 'quail-title "quail" "\
@@ -22108,8 +22146,8 @@

 ;;;### (autoloads (quickurl-list quickurl-list-mode quickurl-edit-urls
 ;;;;;;  quickurl-browse-url-ask quickurl-browse-url quickurl-add-url
-;;;;;;  quickurl-ask quickurl) "quickurl" "net/quickurl.el" (19278
-;;;;;;  4526))
+;;;;;;  quickurl-ask quickurl) "quickurl" "net/quickurl.el" (19277
+;;;;;;  34921))
 ;;; Generated autoloads from net/quickurl.el

 (defconst quickurl-reread-hook-postfix "\n;; Local Variables:\n;; eval: (progn (require 'quickurl) (add-hook 'local-write-file-hooks (lambda () (quickurl-read) nil)))\n;; End:\n" "\
@@ -22181,7 +22219,7 @@
 ;;;***

 ;;;### (autoloads (rcirc-track-minor-mode rcirc-connect rcirc) "rcirc"
-;;;;;;  "net/rcirc.el" (19278 4526))
+;;;;;;  "net/rcirc.el" (19277 34921))
 ;;; Generated autoloads from net/rcirc.el

 (autoload 'rcirc "rcirc" "\
@@ -22216,8 +22254,8 @@

 ;;;***

-;;;### (autoloads (remote-compile) "rcompile" "net/rcompile.el" (19278
-;;;;;;  4526))
+;;;### (autoloads (remote-compile) "rcompile" "net/rcompile.el" (19277
+;;;;;;  34921))
 ;;; Generated autoloads from net/rcompile.el

 (autoload 'remote-compile "rcompile" "\
@@ -22229,7 +22267,7 @@
 ;;;***

 ;;;### (autoloads (re-builder) "re-builder" "emacs-lisp/re-builder.el"
-;;;;;;  (19278 4521))
+;;;;;;  (19277 34919))
 ;;; Generated autoloads from emacs-lisp/re-builder.el

 (defalias 'regexp-builder 're-builder)
@@ -22241,7 +22279,7 @@

 ;;;***

-;;;### (autoloads (recentf-mode) "recentf" "recentf.el" (19278 4517))
+;;;### (autoloads (recentf-mode) "recentf" "recentf.el" (19277 34917))
 ;;; Generated autoloads from recentf.el

 (defvar recentf-mode nil "\
@@ -22268,8 +22306,8 @@
 ;;;### (autoloads (clear-rectangle string-insert-rectangle string-rectangle
 ;;;;;;  delete-whitespace-rectangle open-rectangle insert-rectangle
 ;;;;;;  yank-rectangle kill-rectangle extract-rectangle delete-extract-rectangle
-;;;;;;  delete-rectangle move-to-column-force) "rect" "rect.el" (19278
-;;;;;;  4517))
+;;;;;;  delete-rectangle move-to-column-force) "rect" "rect.el" (19277
+;;;;;;  34917))
 ;;; Generated autoloads from rect.el
  (define-key ctl-x-r-map "c" 'clear-rectangle)
  (define-key ctl-x-r-map "k" 'kill-rectangle)
@@ -22403,8 +22441,8 @@

 ;;;***

-;;;### (autoloads (refill-mode) "refill" "textmodes/refill.el" (19278
-;;;;;;  4529))
+;;;### (autoloads (refill-mode) "refill" "textmodes/refill.el" (19277
+;;;;;;  34923))
 ;;; Generated autoloads from textmodes/refill.el

 (autoload 'refill-mode "refill" "\
@@ -22420,7 +22458,7 @@
 ;;;***

 ;;;### (autoloads (reftex-reset-scanning-information reftex-mode
-;;;;;;  turn-on-reftex) "reftex" "textmodes/reftex.el" (19278 4529))
+;;;;;;  turn-on-reftex) "reftex" "textmodes/reftex.el" (19277 34923))
 ;;; Generated autoloads from textmodes/reftex.el

 (autoload 'turn-on-reftex "reftex" "\
@@ -22470,7 +22508,7 @@
 ;;;***

 ;;;### (autoloads (reftex-citation) "reftex-cite" "textmodes/reftex-cite.el"
-;;;;;;  (19278 4529))
+;;;;;;  (19277 34923))
 ;;; Generated autoloads from textmodes/reftex-cite.el

 (autoload 'reftex-citation "reftex-cite" "\
@@ -22500,7 +22538,7 @@
 ;;;***

 ;;;### (autoloads (reftex-isearch-minor-mode) "reftex-global" "textmodes/reftex-global.el"
-;;;;;;  (19278 4529))
+;;;;;;  (19277 34923))
 ;;; Generated autoloads from textmodes/reftex-global.el

 (autoload 'reftex-isearch-minor-mode "reftex-global" "\
@@ -22517,7 +22555,7 @@
 ;;;***

 ;;;### (autoloads (reftex-index-phrases-mode) "reftex-index" "textmodes/reftex-index.el"
-;;;;;;  (19278 4529))
+;;;;;;  (19277 34923))
 ;;; Generated autoloads from textmodes/reftex-index.el

 (autoload 'reftex-index-phrases-mode "reftex-index" "\
@@ -22550,7 +22588,7 @@
 ;;;***

 ;;;### (autoloads (reftex-all-document-files) "reftex-parse" "textmodes/reftex-parse.el"
-;;;;;;  (19278 4529))
+;;;;;;  (19277 34923))
 ;;; Generated autoloads from textmodes/reftex-parse.el

 (autoload 'reftex-all-document-files "reftex-parse" "\
@@ -22562,8 +22600,8 @@

 ;;;***

-;;;### (autoloads nil "reftex-vars" "textmodes/reftex-vars.el" (19278
-;;;;;;  4529))
+;;;### (autoloads nil "reftex-vars" "textmodes/reftex-vars.el" (19277
+;;;;;;  34923))
 ;;; Generated autoloads from textmodes/reftex-vars.el
 (put 'reftex-vref-is-default 'safe-local-variable (lambda (x) (or (stringp x) (symbolp x))))
 (put 'reftex-fref-is-default 'safe-local-variable (lambda (x) (or (stringp x) (symbolp x))))
@@ -22573,7 +22611,7 @@
 ;;;***

 ;;;### (autoloads (regexp-opt-depth regexp-opt) "regexp-opt" "emacs-lisp/regexp-opt.el"
-;;;;;;  (19278 4521))
+;;;;;;  (19277 34919))
 ;;; Generated autoloads from emacs-lisp/regexp-opt.el

 (autoload 'regexp-opt "regexp-opt" "\
@@ -22602,7 +22640,7 @@

 ;;;### (autoloads (remember-diary-extract-entries remember-clipboard
 ;;;;;;  remember-other-frame remember) "remember" "textmodes/remember.el"
-;;;;;;  (19278 4529))
+;;;;;;  (19277 34923))
 ;;; Generated autoloads from textmodes/remember.el

 (autoload 'remember "remember" "\
@@ -22633,7 +22671,7 @@

 ;;;***

-;;;### (autoloads (repeat) "repeat" "repeat.el" (19278 4517))
+;;;### (autoloads (repeat) "repeat" "repeat.el" (19277 34917))
 ;;; Generated autoloads from repeat.el

 (autoload 'repeat "repeat" "\
@@ -22656,7 +22694,7 @@
 ;;;***

 ;;;### (autoloads (reporter-submit-bug-report) "reporter" "mail/reporter.el"
-;;;;;;  (19278 4525))
+;;;;;;  (19277 34921))
 ;;; Generated autoloads from mail/reporter.el

 (autoload 'reporter-submit-bug-report "reporter" "\
@@ -22688,7 +22726,7 @@
 ;;;***

 ;;;### (autoloads (reposition-window) "reposition" "reposition.el"
-;;;;;;  (19278 4517))
+;;;;;;  (19277 34917))
 ;;; Generated autoloads from reposition.el

 (autoload 'reposition-window "reposition" "\
@@ -22715,7 +22753,7 @@
 ;;;***

 ;;;### (autoloads (global-reveal-mode reveal-mode) "reveal" "reveal.el"
-;;;;;;  (19278 4517))
+;;;;;;  (19354 34807))
 ;;; Generated autoloads from reveal.el

 (autoload 'reveal-mode "reveal" "\
@@ -22750,7 +22788,7 @@
 ;;;***

 ;;;### (autoloads (make-ring ring-p) "ring" "emacs-lisp/ring.el"
-;;;;;;  (19278 4521))
+;;;;;;  (19277 34919))
 ;;; Generated autoloads from emacs-lisp/ring.el

 (autoload 'ring-p "ring" "\
@@ -22765,7 +22803,7 @@

 ;;;***

-;;;### (autoloads (rlogin) "rlogin" "net/rlogin.el" (19278 4526))
+;;;### (autoloads (rlogin) "rlogin" "net/rlogin.el" (19277 34921))
 ;;; Generated autoloads from net/rlogin.el
  (add-hook 'same-window-regexps (purecopy "^\\*rlogin-.*\\*\\(\\|<[0-9]+>\\)"))

@@ -22815,8 +22853,8 @@
 ;;;;;;  rmail-secondary-file-directory rmail-primary-inbox-list rmail-highlighted-headers
 ;;;;;;  rmail-retry-ignored-headers rmail-displayed-headers rmail-ignored-headers
 ;;;;;;  rmail-dont-reply-to-names rmail-user-mail-address-regexp
-;;;;;;  rmail-movemail-variant-p) "rmail" "mail/rmail.el" (19307
-;;;;;;  36715))
+;;;;;;  rmail-movemail-variant-p) "rmail" "mail/rmail.el" (19306
+;;;;;;  22782))
 ;;; Generated autoloads from mail/rmail.el

 (autoload 'rmail-movemail-variant-p "rmail" "\
@@ -23010,7 +23048,7 @@
 ;;;***

 ;;;### (autoloads (rmail-output-body-to-file rmail-output-as-seen
-;;;;;;  rmail-output) "rmailout" "mail/rmailout.el" (19278 4525))
+;;;;;;  rmail-output) "rmailout" "mail/rmailout.el" (19277 34921))
 ;;; Generated autoloads from mail/rmailout.el
 (put 'rmail-output-file-alist 'risky-local-variable t)

@@ -23075,7 +23113,7 @@
 ;;;***

 ;;;### (autoloads (rng-c-load-schema) "rng-cmpct" "nxml/rng-cmpct.el"
-;;;;;;  (19278 4526))
+;;;;;;  (19277 34921))
 ;;; Generated autoloads from nxml/rng-cmpct.el

 (autoload 'rng-c-load-schema "rng-cmpct" "\
@@ -23087,7 +23125,7 @@
 ;;;***

 ;;;### (autoloads (rng-nxml-mode-init) "rng-nxml" "nxml/rng-nxml.el"
-;;;;;;  (19278 4526))
+;;;;;;  (19277 34921))
 ;;; Generated autoloads from nxml/rng-nxml.el

 (autoload 'rng-nxml-mode-init "rng-nxml" "\
@@ -23100,7 +23138,7 @@
 ;;;***

 ;;;### (autoloads (rng-validate-mode) "rng-valid" "nxml/rng-valid.el"
-;;;;;;  (19278 4526))
+;;;;;;  (19277 34921))
 ;;; Generated autoloads from nxml/rng-valid.el

 (autoload 'rng-validate-mode "rng-valid" "\
@@ -23130,8 +23168,8 @@

 ;;;***

-;;;### (autoloads (rng-xsd-compile) "rng-xsd" "nxml/rng-xsd.el" (19278
-;;;;;;  4526))
+;;;### (autoloads (rng-xsd-compile) "rng-xsd" "nxml/rng-xsd.el" (19277
+;;;;;;  34921))
 ;;; Generated autoloads from nxml/rng-xsd.el

 (put 'http://www\.w3\.org/2001/XMLSchema-datatypes 'rng-dt-compile 'rng-xsd-compile)
@@ -23159,7 +23197,7 @@
 ;;;***

 ;;;### (autoloads (robin-use-package robin-modify-package robin-define-package)
-;;;;;;  "robin" "international/robin.el" (19278 4524))
+;;;;;;  "robin" "international/robin.el" (19277 34920))
 ;;; Generated autoloads from international/robin.el

 (autoload 'robin-define-package "robin" "\
@@ -23192,7 +23230,7 @@
 ;;;***

 ;;;### (autoloads (toggle-rot13-mode rot13-other-window rot13-region
-;;;;;;  rot13-string rot13) "rot13" "rot13.el" (19278 4518))
+;;;;;;  rot13-string rot13) "rot13" "rot13.el" (19277 34917))
 ;;; Generated autoloads from rot13.el

 (autoload 'rot13 "rot13" "\
@@ -23230,7 +23268,7 @@
 ;;;***

 ;;;### (autoloads (rst-minor-mode rst-mode) "rst" "textmodes/rst.el"
-;;;;;;  (19278 4529))
+;;;;;;  (19277 34923))
 ;;; Generated autoloads from textmodes/rst.el
  (add-to-list 'auto-mode-alist (purecopy '("\\.re?st\\'" . rst-mode)))

@@ -23268,7 +23306,7 @@
 ;;;***

 ;;;### (autoloads (ruby-mode) "ruby-mode" "progmodes/ruby-mode.el"
-;;;;;;  (19278 4528))
+;;;;;;  (19277 34922))
 ;;; Generated autoloads from progmodes/ruby-mode.el

 (autoload 'ruby-mode "ruby-mode" "\
@@ -23289,8 +23327,8 @@

 ;;;***

-;;;### (autoloads (ruler-mode) "ruler-mode" "ruler-mode.el" (19278
-;;;;;;  4518))
+;;;### (autoloads (ruler-mode) "ruler-mode" "ruler-mode.el" (19277
+;;;;;;  34917))
 ;;; Generated autoloads from ruler-mode.el

 (autoload 'ruler-mode "ruler-mode" "\
@@ -23300,8 +23338,8 @@

 ;;;***

-;;;### (autoloads (rx rx-to-string) "rx" "emacs-lisp/rx.el" (19278
-;;;;;;  4521))
+;;;### (autoloads (rx rx-to-string) "rx" "emacs-lisp/rx.el" (19277
+;;;;;;  34919))
 ;;; Generated autoloads from emacs-lisp/rx.el

 (autoload 'rx-to-string "rx" "\
@@ -23611,7 +23649,7 @@
 ;;;***

 ;;;### (autoloads (savehist-mode savehist-mode) "savehist" "savehist.el"
-;;;;;;  (19278 4518))
+;;;;;;  (19277 34917))
 ;;; Generated autoloads from savehist.el

 (defvar savehist-mode nil "\
@@ -23637,7 +23675,7 @@
 ;;;***

 ;;;### (autoloads (dsssl-mode scheme-mode) "scheme" "progmodes/scheme.el"
-;;;;;;  (19278 4528))
+;;;;;;  (19277 34922))
 ;;; Generated autoloads from progmodes/scheme.el

 (autoload 'scheme-mode "scheme" "\
@@ -23679,7 +23717,7 @@
 ;;;***

 ;;;### (autoloads (gnus-score-mode) "score-mode" "gnus/score-mode.el"
-;;;;;;  (19278 4523))
+;;;;;;  (19277 34920))
 ;;; Generated autoloads from gnus/score-mode.el

 (autoload 'gnus-score-mode "score-mode" "\
@@ -23693,7 +23731,7 @@
 ;;;***

 ;;;### (autoloads (scroll-all-mode) "scroll-all" "scroll-all.el"
-;;;;;;  (19278 4518))
+;;;;;;  (19277 34917))
 ;;; Generated autoloads from scroll-all.el

 (defvar scroll-all-mode nil "\
@@ -23716,7 +23754,7 @@
 ;;;***

 ;;;### (autoloads (scroll-lock-mode) "scroll-lock" "scroll-lock.el"
-;;;;;;  (19278 4518))
+;;;;;;  (19277 34917))
 ;;; Generated autoloads from scroll-lock.el

 (autoload 'scroll-lock-mode "scroll-lock" "\
@@ -23731,7 +23769,7 @@
 ;;;***

 ;;;### (autoloads (semantic-mode semantic-default-submodes) "semantic"
-;;;;;;  "cedet/semantic.el" (19322 11780))
+;;;;;;  "cedet/semantic.el" (19324 55755))
 ;;; Generated autoloads from cedet/semantic.el

 (defvar semantic-default-submodes '(global-semantic-idle-scheduler-mode global-semanticdb-minor-mode) "\
@@ -23783,7 +23821,7 @@
 ;;;;;;  mail-alias-file mail-default-reply-to mail-archive-file-name
 ;;;;;;  mail-header-separator send-mail-function mail-interactive
 ;;;;;;  mail-self-blind mail-specify-envelope-from mail-from-style)
-;;;;;;  "sendmail" "mail/sendmail.el" (19335 63611))
+;;;;;;  "sendmail" "mail/sendmail.el" (19335 12589))
 ;;; Generated autoloads from mail/sendmail.el

 (defvar mail-from-style 'default "\
@@ -24080,8 +24118,8 @@
 ;;;***

 ;;;### (autoloads (server-save-buffers-kill-terminal server-mode
-;;;;;;  server-force-delete server-start) "server" "server.el" (19278
-;;;;;;  4518))
+;;;;;;  server-force-delete server-start) "server" "server.el" (19277
+;;;;;;  34917))
 ;;; Generated autoloads from server.el

 (autoload 'server-start "server" "\
@@ -24135,7 +24173,7 @@

 ;;;***

-;;;### (autoloads (ses-mode) "ses" "ses.el" (19278 4518))
+;;;### (autoloads (ses-mode) "ses" "ses.el" (19277 34917))
 ;;; Generated autoloads from ses.el

 (autoload 'ses-mode "ses" "\
@@ -24154,7 +24192,7 @@
 ;;;***

 ;;;### (autoloads (html-mode sgml-mode) "sgml-mode" "textmodes/sgml-mode.el"
-;;;;;;  (19288 23971))
+;;;;;;  (19294 23005))
 ;;; Generated autoloads from textmodes/sgml-mode.el

 (autoload 'sgml-mode "sgml-mode" "\
@@ -24220,7 +24258,7 @@
 ;;;***

 ;;;### (autoloads (sh-mode) "sh-script" "progmodes/sh-script.el"
-;;;;;;  (19278 4528))
+;;;;;;  (19339 10551))
 ;;; Generated autoloads from progmodes/sh-script.el
 (put 'sh-shell 'safe-local-variable 'symbolp)

@@ -24284,7 +24322,7 @@

 ;;;***

-;;;### (autoloads (sha1) "sha1" "sha1.el" (19278 4518))
+;;;### (autoloads (sha1) "sha1" "sha1.el" (19277 34917))
 ;;; Generated autoloads from sha1.el

 (autoload 'sha1 "sha1" "\
@@ -24299,7 +24337,7 @@
 ;;;***

 ;;;### (autoloads (list-load-path-shadows) "shadow" "emacs-lisp/shadow.el"
-;;;;;;  (19278 4521))
+;;;;;;  (19277 34919))
 ;;; Generated autoloads from emacs-lisp/shadow.el

 (autoload 'list-load-path-shadows "shadow" "\
@@ -24349,8 +24387,8 @@
 ;;;***

 ;;;### (autoloads (shadow-initialize shadow-define-regexp-group shadow-define-literal-group
-;;;;;;  shadow-define-cluster) "shadowfile" "shadowfile.el" (19278
-;;;;;;  4518))
+;;;;;;  shadow-define-cluster) "shadowfile" "shadowfile.el" (19277
+;;;;;;  34917))
 ;;; Generated autoloads from shadowfile.el

 (autoload 'shadow-define-cluster "shadowfile" "\
@@ -24389,7 +24427,7 @@
 ;;;***

 ;;;### (autoloads (shell shell-dumb-shell-regexp) "shell" "shell.el"
-;;;;;;  (19278 4518))
+;;;;;;  (19277 34917))
 ;;; Generated autoloads from shell.el

 (defvar shell-dumb-shell-regexp (purecopy "cmd\\(proxy\\)?\\.exe") "\
@@ -24439,7 +24477,7 @@
 ;;;***

 ;;;### (autoloads (sieve-upload-and-bury sieve-upload sieve-manage)
-;;;;;;  "sieve" "gnus/sieve.el" (19278 4523))
+;;;;;;  "sieve" "gnus/sieve.el" (19277 34920))
 ;;; Generated autoloads from gnus/sieve.el

 (autoload 'sieve-manage "sieve" "\
@@ -24460,7 +24498,7 @@
 ;;;***

 ;;;### (autoloads (sieve-mode) "sieve-mode" "gnus/sieve-mode.el"
-;;;;;;  (19278 4523))
+;;;;;;  (19362 59593))
 ;;; Generated autoloads from gnus/sieve-mode.el

 (autoload 'sieve-mode "sieve-mode" "\
@@ -24475,8 +24513,8 @@

 ;;;***

-;;;### (autoloads (simula-mode) "simula" "progmodes/simula.el" (19278
-;;;;;;  4528))
+;;;### (autoloads (simula-mode) "simula" "progmodes/simula.el" (19277
+;;;;;;  34922))
 ;;; Generated autoloads from progmodes/simula.el

 (autoload 'simula-mode "simula" "\
@@ -24525,7 +24563,7 @@
 ;;;***

 ;;;### (autoloads (skeleton-pair-insert-maybe skeleton-insert skeleton-proxy-new
-;;;;;;  define-skeleton) "skeleton" "skeleton.el" (19278 4518))
+;;;;;;  define-skeleton) "skeleton" "skeleton.el" (19277 34917))
 ;;; Generated autoloads from skeleton.el

 (defvar skeleton-filter-function 'identity "\
@@ -24635,7 +24673,7 @@
 ;;;***

 ;;;### (autoloads (smerge-start-session smerge-mode smerge-ediff)
-;;;;;;  "smerge-mode" "smerge-mode.el" (19278 4518))
+;;;;;;  "smerge-mode" "smerge-mode.el" (19277 34917))
 ;;; Generated autoloads from smerge-mode.el

 (autoload 'smerge-ediff "smerge-mode" "\
@@ -24660,7 +24698,7 @@
 ;;;***

 ;;;### (autoloads (smiley-buffer smiley-region) "smiley" "gnus/smiley.el"
-;;;;;;  (19278 4523))
+;;;;;;  (19277 34920))
 ;;; Generated autoloads from gnus/smiley.el

 (autoload 'smiley-region "smiley" "\
@@ -24678,7 +24716,7 @@
 ;;;***

 ;;;### (autoloads (smtpmail-send-queued-mail smtpmail-send-it) "smtpmail"
-;;;;;;  "mail/smtpmail.el" (19278 4525))
+;;;;;;  "mail/smtpmail.el" (19277 34921))
 ;;; Generated autoloads from mail/smtpmail.el

 (autoload 'smtpmail-send-it "smtpmail" "\
@@ -24693,7 +24731,7 @@

 ;;;***

-;;;### (autoloads (snake) "snake" "play/snake.el" (19278 4527))
+;;;### (autoloads (snake) "snake" "play/snake.el" (19277 34922))
 ;;; Generated autoloads from play/snake.el

 (autoload 'snake "snake" "\
@@ -24717,7 +24755,7 @@
 ;;;***

 ;;;### (autoloads (snmpv2-mode snmp-mode) "snmp-mode" "net/snmp-mode.el"
-;;;;;;  (19278 4526))
+;;;;;;  (19277 34921))
 ;;; Generated autoloads from net/snmp-mode.el

 (autoload 'snmp-mode "snmp-mode" "\
@@ -24746,8 +24784,8 @@

 ;;;***

-;;;### (autoloads (sunrise-sunset) "solar" "calendar/solar.el" (19278
-;;;;;;  4519))
+;;;### (autoloads (sunrise-sunset) "solar" "calendar/solar.el" (19277
+;;;;;;  34918))
 ;;; Generated autoloads from calendar/solar.el

 (autoload 'sunrise-sunset "solar" "\
@@ -24762,8 +24800,8 @@

 ;;;***

-;;;### (autoloads (solitaire) "solitaire" "play/solitaire.el" (19278
-;;;;;;  4527))
+;;;### (autoloads (solitaire) "solitaire" "play/solitaire.el" (19277
+;;;;;;  34922))
 ;;; Generated autoloads from play/solitaire.el

 (autoload 'solitaire "solitaire" "\
@@ -24840,7 +24878,7 @@

 ;;;### (autoloads (reverse-region sort-columns sort-regexp-fields
 ;;;;;;  sort-fields sort-numeric-fields sort-pages sort-paragraphs
-;;;;;;  sort-lines sort-subr) "sort" "sort.el" (19278 4518))
+;;;;;;  sort-lines sort-subr) "sort" "sort.el" (19277 34917))
 ;;; Generated autoloads from sort.el
 (put 'sort-fold-case 'safe-local-variable 'booleanp)

@@ -24984,8 +25022,8 @@

 ;;;***

-;;;### (autoloads (spam-initialize) "spam" "gnus/spam.el" (19278
-;;;;;;  4523))
+;;;### (autoloads (spam-initialize) "spam" "gnus/spam.el" (19277
+;;;;;;  34920))
 ;;; Generated autoloads from gnus/spam.el

 (autoload 'spam-initialize "spam" "\
@@ -25001,7 +25039,7 @@

 ;;;### (autoloads (spam-report-deagentize spam-report-agentize spam-report-url-to-file
 ;;;;;;  spam-report-url-ping-mm-url spam-report-process-queue) "spam-report"
-;;;;;;  "gnus/spam-report.el" (19278 4523))
+;;;;;;  "gnus/spam-report.el" (19277 34920))
 ;;; Generated autoloads from gnus/spam-report.el

 (autoload 'spam-report-process-queue "spam-report" "\
@@ -25044,7 +25082,7 @@
 ;;;***

 ;;;### (autoloads (speedbar-get-focus speedbar-frame-mode) "speedbar"
-;;;;;;  "speedbar.el" (19278 4518))
+;;;;;;  "speedbar.el" (19277 34917))
 ;;; Generated autoloads from speedbar.el

 (defalias 'speedbar 'speedbar-frame-mode)
@@ -25069,7 +25107,7 @@
 ;;;***

 ;;;### (autoloads (spell-string spell-region spell-word spell-buffer)
-;;;;;;  "spell" "textmodes/spell.el" (19278 4529))
+;;;;;;  "spell" "textmodes/spell.el" (19277 34923))
 ;;; Generated autoloads from textmodes/spell.el

 (put 'spell-filter 'risky-local-variable t)
@@ -25113,8 +25151,8 @@

 ;;;***

-;;;### (autoloads (snarf-spooks spook) "spook" "play/spook.el" (19278
-;;;;;;  4527))
+;;;### (autoloads (snarf-spooks spook) "spook" "play/spook.el" (19277
+;;;;;;  34922))
 ;;; Generated autoloads from play/spook.el

 (autoload 'spook "spook" "\
@@ -25132,8 +25170,8 @@
 ;;;### (autoloads (sql-linter sql-db2 sql-interbase sql-postgres
 ;;;;;;  sql-ms sql-ingres sql-solid sql-mysql sql-sqlite sql-informix
 ;;;;;;  sql-sybase sql-oracle sql-product-interactive sql-mode sql-help
-;;;;;;  sql-add-product-keywords) "sql" "progmodes/sql.el" (19278
-;;;;;;  4528))
+;;;;;;  sql-add-product-keywords) "sql" "progmodes/sql.el" (19277
+;;;;;;  34923))
 ;;; Generated autoloads from progmodes/sql.el

 (autoload 'sql-add-product-keywords "sql" "\
@@ -25560,7 +25598,7 @@
 ;;;***

 ;;;### (autoloads (srecode-template-mode) "srecode/srt-mode" "cedet/srecode/srt-mode.el"
-;;;;;;  (19278 4521))
+;;;;;;  (19277 34919))
 ;;; Generated autoloads from cedet/srecode/srt-mode.el

 (autoload 'srecode-template-mode "srecode/srt-mode" "\
@@ -25576,8 +25614,8 @@
 ;;;;;;  strokes-mode strokes-list-strokes strokes-load-user-strokes
 ;;;;;;  strokes-help strokes-describe-stroke strokes-do-complex-stroke
 ;;;;;;  strokes-do-stroke strokes-read-complex-stroke strokes-read-stroke
-;;;;;;  strokes-global-set-stroke) "strokes" "strokes.el" (19278
-;;;;;;  4518))
+;;;;;;  strokes-global-set-stroke) "strokes" "strokes.el" (19277
+;;;;;;  34917))
 ;;; Generated autoloads from strokes.el

 (autoload 'strokes-global-set-stroke "strokes" "\
@@ -25687,7 +25725,7 @@
 ;;;***

 ;;;### (autoloads (studlify-buffer studlify-word studlify-region)
-;;;;;;  "studly" "play/studly.el" (19259 35430))
+;;;;;;  "studly" "play/studly.el" (19267 61660))
 ;;; Generated autoloads from play/studly.el

 (autoload 'studlify-region "studly" "\
@@ -25708,7 +25746,7 @@
 ;;;***

 ;;;### (autoloads (global-subword-mode subword-mode) "subword" "progmodes/subword.el"
-;;;;;;  (19278 4528))
+;;;;;;  (19277 34923))
 ;;; Generated autoloads from progmodes/subword.el

 (autoload 'subword-mode "subword" "\
@@ -25756,7 +25794,7 @@
 ;;;***

 ;;;### (autoloads (sc-cite-original) "supercite" "mail/supercite.el"
-;;;;;;  (19278 4525))
+;;;;;;  (19361 52486))
 ;;; Generated autoloads from mail/supercite.el

 (autoload 'sc-cite-original "supercite" "\
@@ -25788,8 +25826,8 @@

 ;;;***

-;;;### (autoloads (gpm-mouse-mode) "t-mouse" "t-mouse.el" (19278
-;;;;;;  4518))
+;;;### (autoloads (gpm-mouse-mode) "t-mouse" "t-mouse.el" (19277
+;;;;;;  34917))
 ;;; Generated autoloads from t-mouse.el

 (define-obsolete-function-alias 't-mouse-mode 'gpm-mouse-mode "23.1")
@@ -25816,7 +25854,7 @@

 ;;;***

-;;;### (autoloads (tabify untabify) "tabify" "tabify.el" (19278 4518))
+;;;### (autoloads (tabify untabify) "tabify" "tabify.el" (19277 34917))
 ;;; Generated autoloads from tabify.el

 (autoload 'untabify "tabify" "\
@@ -25851,7 +25889,7 @@
 ;;;;;;  table-recognize table-insert-row-column table-insert-column
 ;;;;;;  table-insert-row table-insert table-point-left-cell-hook
 ;;;;;;  table-point-entered-cell-hook table-load-hook table-cell-map-hook)
-;;;;;;  "table" "textmodes/table.el" (19278 4529))
+;;;;;;  "table" "textmodes/table.el" (19354 34807))
 ;;; Generated autoloads from textmodes/table.el

 (defvar table-cell-map-hook nil "\
@@ -26439,7 +26477,7 @@

 ;;;***

-;;;### (autoloads (talk talk-connect) "talk" "talk.el" (19278 4518))
+;;;### (autoloads (talk talk-connect) "talk" "talk.el" (19277 34917))
 ;;; Generated autoloads from talk.el

 (autoload 'talk-connect "talk" "\
@@ -26454,7 +26492,7 @@

 ;;;***

-;;;### (autoloads (tar-mode) "tar-mode" "tar-mode.el" (19278 4518))
+;;;### (autoloads (tar-mode) "tar-mode" "tar-mode.el" (19277 34917))
 ;;; Generated autoloads from tar-mode.el

 (autoload 'tar-mode "tar-mode" "\
@@ -26478,7 +26516,7 @@
 ;;;***

 ;;;### (autoloads (tcl-help-on-word inferior-tcl tcl-mode) "tcl"
-;;;;;;  "progmodes/tcl.el" (19278 4528))
+;;;;;;  "progmodes/tcl.el" (19277 34923))
 ;;; Generated autoloads from progmodes/tcl.el

 (autoload 'tcl-mode "tcl" "\
@@ -26529,7 +26567,7 @@

 ;;;***

-;;;### (autoloads (rsh telnet) "telnet" "net/telnet.el" (19278 4526))
+;;;### (autoloads (rsh telnet) "telnet" "net/telnet.el" (19277 34921))
 ;;; Generated autoloads from net/telnet.el
  (add-hook 'same-window-regexps (purecopy "\\*telnet-.*\\*\\(\\|<[0-9]+>\\)"))

@@ -26557,7 +26595,7 @@
 ;;;***

 ;;;### (autoloads (serial-term ansi-term term make-term) "term" "term.el"
-;;;;;;  (19287 14689))
+;;;;;;  (19294 23005))
 ;;; Generated autoloads from term.el

 (autoload 'make-term "term" "\
@@ -26599,8 +26637,8 @@

 ;;;***

-;;;### (autoloads (terminal-emulator) "terminal" "terminal.el" (19278
-;;;;;;  4518))
+;;;### (autoloads (terminal-emulator) "terminal" "terminal.el" (19277
+;;;;;;  34917))
 ;;; Generated autoloads from terminal.el

 (autoload 'terminal-emulator "terminal" "\
@@ -26637,7 +26675,7 @@
 ;;;***

 ;;;### (autoloads (testcover-this-defun) "testcover" "emacs-lisp/testcover.el"
-;;;;;;  (19278 4521))
+;;;;;;  (19277 34919))
 ;;; Generated autoloads from emacs-lisp/testcover.el

 (autoload 'testcover-this-defun "testcover" "\
@@ -26647,7 +26685,7 @@

 ;;;***

-;;;### (autoloads (tetris) "tetris" "play/tetris.el" (19278 4527))
+;;;### (autoloads (tetris) "tetris" "play/tetris.el" (19277 34922))
 ;;; Generated autoloads from play/tetris.el

 (autoload 'tetris "tetris" "\
@@ -26678,7 +26716,7 @@
 ;;;;;;  tex-start-commands tex-start-options slitex-run-command latex-run-command
 ;;;;;;  tex-run-command tex-offer-save tex-main-file tex-first-line-header-regexp
 ;;;;;;  tex-directory tex-shell-file-name) "tex-mode" "textmodes/tex-mode.el"
-;;;;;;  (19322 43578))
+;;;;;;  (19321 40838))
 ;;; Generated autoloads from textmodes/tex-mode.el

 (defvar tex-shell-file-name nil "\
@@ -26980,7 +27018,7 @@
 ;;;***

 ;;;### (autoloads (texi2info texinfo-format-region texinfo-format-buffer)
-;;;;;;  "texinfmt" "textmodes/texinfmt.el" (19278 4529))
+;;;;;;  "texinfmt" "textmodes/texinfmt.el" (19277 34923))
 ;;; Generated autoloads from textmodes/texinfmt.el

 (autoload 'texinfo-format-buffer "texinfmt" "\
@@ -27020,7 +27058,7 @@
 ;;;***

 ;;;### (autoloads (texinfo-mode texinfo-close-quote texinfo-open-quote)
-;;;;;;  "texinfo" "textmodes/texinfo.el" (19278 4529))
+;;;;;;  "texinfo" "textmodes/texinfo.el" (19277 34923))
 ;;; Generated autoloads from textmodes/texinfo.el

 (defvar texinfo-open-quote (purecopy "``") "\
@@ -27106,7 +27144,7 @@

 ;;;### (autoloads (thai-composition-function thai-compose-buffer
 ;;;;;;  thai-compose-string thai-compose-region) "thai-util" "language/thai-util.el"
-;;;;;;  (19278 4524))
+;;;;;;  (19277 34921))
 ;;; Generated autoloads from language/thai-util.el

 (autoload 'thai-compose-region "thai-util" "\
@@ -27135,7 +27173,7 @@

 ;;;### (autoloads (list-at-point number-at-point symbol-at-point
 ;;;;;;  sexp-at-point thing-at-point bounds-of-thing-at-point forward-thing)
-;;;;;;  "thingatpt" "thingatpt.el" (19278 4518))
+;;;;;;  "thingatpt" "thingatpt.el" (19277 34917))
 ;;; Generated autoloads from thingatpt.el

 (autoload 'forward-thing "thingatpt" "\
@@ -27192,7 +27230,7 @@

 ;;;### (autoloads (thumbs-dired-setroot thumbs-dired-show thumbs-dired-show-marked
 ;;;;;;  thumbs-show-from-dir thumbs-find-thumb) "thumbs" "thumbs.el"
-;;;;;;  (19278 4518))
+;;;;;;  (19277 34917))
 ;;; Generated autoloads from thumbs.el

 (autoload 'thumbs-find-thumb "thumbs" "\
@@ -27230,8 +27268,8 @@
 ;;;;;;  tibetan-post-read-conversion tibetan-compose-buffer tibetan-decompose-buffer
 ;;;;;;  tibetan-decompose-string tibetan-decompose-region tibetan-compose-region
 ;;;;;;  tibetan-compose-string tibetan-transcription-to-tibetan tibetan-tibetan-to-transcription
-;;;;;;  tibetan-char-p) "tibet-util" "language/tibet-util.el" (19278
-;;;;;;  4524))
+;;;;;;  tibetan-char-p) "tibet-util" "language/tibet-util.el" (19277
+;;;;;;  34921))
 ;;; Generated autoloads from language/tibet-util.el

 (autoload 'tibetan-char-p "tibet-util" "\
@@ -27305,7 +27343,7 @@
 ;;;***

 ;;;### (autoloads (tildify-buffer tildify-region) "tildify" "textmodes/tildify.el"
-;;;;;;  (19278 4529))
+;;;;;;  (19277 34923))
 ;;; Generated autoloads from textmodes/tildify.el

 (autoload 'tildify-region "tildify" "\
@@ -27330,7 +27368,7 @@

 ;;;### (autoloads (emacs-init-time emacs-uptime display-time-world
 ;;;;;;  display-time-mode display-time display-time-day-and-date)
-;;;;;;  "time" "time.el" (19278 4518))
+;;;;;;  "time" "time.el" (19277 34917))
 ;;; Generated autoloads from time.el

 (defvar display-time-day-and-date nil "\
@@ -27393,7 +27431,7 @@
 ;;;;;;  time-to-day-in-year date-leap-year-p days-between date-to-day
 ;;;;;;  time-add time-subtract time-since days-to-time time-less-p
 ;;;;;;  seconds-to-time date-to-time) "time-date" "calendar/time-date.el"
-;;;;;;  (19284 35750))
+;;;;;;  (19286 4503))
 ;;; Generated autoloads from calendar/time-date.el

 (autoload 'date-to-time "time-date" "\
@@ -27506,7 +27544,7 @@
 ;;;***

 ;;;### (autoloads (time-stamp-toggle-active time-stamp) "time-stamp"
-;;;;;;  "time-stamp.el" (19278 4518))
+;;;;;;  "time-stamp.el" (19277 34917))
 ;;; Generated autoloads from time-stamp.el
 (put 'time-stamp-format 'safe-local-variable 'stringp)
 (put 'time-stamp-time-zone 'safe-local-variable 'string-or-null-p)
@@ -27550,7 +27588,7 @@
 ;;;;;;  timeclock-workday-remaining-string timeclock-reread-log timeclock-query-out
 ;;;;;;  timeclock-change timeclock-status-string timeclock-out timeclock-in
 ;;;;;;  timeclock-modeline-display) "timeclock" "calendar/timeclock.el"
-;;;;;;  (19278 4519))
+;;;;;;  (19277 34918))
 ;;; Generated autoloads from calendar/timeclock.el

 (autoload 'timeclock-modeline-display "timeclock" "\
@@ -27650,7 +27688,7 @@
 ;;;***

 ;;;### (autoloads (batch-titdic-convert titdic-convert) "titdic-cnv"
-;;;;;;  "international/titdic-cnv.el" (19278 4524))
+;;;;;;  "international/titdic-cnv.el" (19277 34920))
 ;;; Generated autoloads from international/titdic-cnv.el

 (autoload 'titdic-convert "titdic-cnv" "\
@@ -27673,7 +27711,7 @@
 ;;;***

 ;;;### (autoloads (tmm-prompt tmm-menubar-mouse tmm-menubar) "tmm"
-;;;;;;  "tmm.el" (19278 4518))
+;;;;;;  "tmm.el" (19277 34917))
 ;;; Generated autoloads from tmm.el
  (define-key global-map "\M-`" 'tmm-menubar)
  (define-key global-map [menu-bar mouse-1] 'tmm-menubar-mouse)
@@ -27713,7 +27751,7 @@

 ;;;### (autoloads (todo-show todo-cp todo-mode todo-print todo-top-priorities
 ;;;;;;  todo-insert-item todo-add-item-non-interactively todo-add-category)
-;;;;;;  "todo-mode" "calendar/todo-mode.el" (19278 4519))
+;;;;;;  "todo-mode" "calendar/todo-mode.el" (19277 34918))
 ;;; Generated autoloads from calendar/todo-mode.el

 (autoload 'todo-add-category "todo-mode" "\
@@ -27775,7 +27813,7 @@

 ;;;### (autoloads (tool-bar-local-item-from-menu tool-bar-add-item-from-menu
 ;;;;;;  tool-bar-local-item tool-bar-add-item toggle-tool-bar-mode-from-frame)
-;;;;;;  "tool-bar" "tool-bar.el" (19278 4518))
+;;;;;;  "tool-bar" "tool-bar.el" (19277 34917))
 ;;; Generated autoloads from tool-bar.el

 (autoload 'toggle-tool-bar-mode-from-frame "tool-bar" "\
@@ -27848,7 +27886,7 @@
 ;;;***

 ;;;### (autoloads (tpu-edt-on tpu-edt-mode) "tpu-edt" "emulation/tpu-edt.el"
-;;;;;;  (19278 4522))
+;;;;;;  (19279 53114))
 ;;; Generated autoloads from emulation/tpu-edt.el

 (defvar tpu-edt-mode nil "\
@@ -27875,7 +27913,7 @@
 ;;;***

 ;;;### (autoloads (tpu-mapper) "tpu-mapper" "emulation/tpu-mapper.el"
-;;;;;;  (19278 4522))
+;;;;;;  (19277 34919))
 ;;; Generated autoloads from emulation/tpu-mapper.el

 (autoload 'tpu-mapper "tpu-mapper" "\
@@ -27909,7 +27947,7 @@

 ;;;***

-;;;### (autoloads (tq-create) "tq" "emacs-lisp/tq.el" (19278 4521))
+;;;### (autoloads (tq-create) "tq" "emacs-lisp/tq.el" (19277 34919))
 ;;; Generated autoloads from emacs-lisp/tq.el

 (autoload 'tq-create "tq" "\
@@ -27923,7 +27961,7 @@
 ;;;***

 ;;;### (autoloads (trace-function-background trace-function trace-buffer)
-;;;;;;  "trace" "emacs-lisp/trace.el" (19278 4521))
+;;;;;;  "trace" "emacs-lisp/trace.el" (19277 34919))
 ;;; Generated autoloads from emacs-lisp/trace.el

 (defvar trace-buffer (purecopy "*trace-output*") "\
@@ -27960,7 +27998,7 @@
 ;;;### (autoloads (tramp-unload-tramp tramp-completion-handle-file-name-completion
 ;;;;;;  tramp-completion-handle-file-name-all-completions tramp-unload-file-name-handlers
 ;;;;;;  tramp-file-name-handler tramp-syntax tramp-mode) "tramp"
-;;;;;;  "net/tramp.el" (19330 42052))
+;;;;;;  "net/tramp.el" (19360 14173))
 ;;; Generated autoloads from net/tramp.el

 (defvar tramp-mode t "\
@@ -28093,7 +28131,7 @@
 ;;;***

 ;;;### (autoloads (tramp-ftp-enable-ange-ftp) "tramp-ftp" "net/tramp-ftp.el"
-;;;;;;  (19278 4526))
+;;;;;;  (19277 34921))
 ;;; Generated autoloads from net/tramp-ftp.el

 (autoload 'tramp-ftp-enable-ange-ftp "tramp-ftp" "\
@@ -28103,8 +28141,8 @@

 ;;;***

-;;;### (autoloads (help-with-tutorial) "tutorial" "tutorial.el" (19278
-;;;;;;  4518))
+;;;### (autoloads (help-with-tutorial) "tutorial" "tutorial.el" (19277
+;;;;;;  34917))
 ;;; Generated autoloads from tutorial.el

 (autoload 'help-with-tutorial "tutorial" "\
@@ -28129,7 +28167,7 @@
 ;;;***

 ;;;### (autoloads (tai-viet-composition-function) "tv-util" "language/tv-util.el"
-;;;;;;  (19278 4524))
+;;;;;;  (19277 34921))
 ;;; Generated autoloads from language/tv-util.el

 (autoload 'tai-viet-composition-function "tv-util" "\
@@ -28140,7 +28178,7 @@
 ;;;***

 ;;;### (autoloads (2C-split 2C-associate-buffer 2C-two-columns) "two-column"
-;;;;;;  "textmodes/two-column.el" (19278 4529))
+;;;;;;  "textmodes/two-column.el" (19277 34923))
 ;;; Generated autoloads from textmodes/two-column.el
  (autoload '2C-command "two-column" () t 'keymap)
  (global-set-key "\C-x6" '2C-command)
@@ -28191,7 +28229,7 @@
 ;;;;;;  type-break type-break-mode type-break-keystroke-threshold
 ;;;;;;  type-break-good-break-interval type-break-good-rest-interval
 ;;;;;;  type-break-interval type-break-mode) "type-break" "type-break.el"
-;;;;;;  (19278 4518))
+;;;;;;  (19277 34917))
 ;;; Generated autoloads from type-break.el

 (defvar type-break-mode nil "\
@@ -28373,7 +28411,7 @@

 ;;;***

-;;;### (autoloads (uce-reply-to-uce) "uce" "mail/uce.el" (19278 4525))
+;;;### (autoloads (uce-reply-to-uce) "uce" "mail/uce.el" (19277 34921))
 ;;; Generated autoloads from mail/uce.el

 (autoload 'uce-reply-to-uce "uce" "\
@@ -28391,7 +28429,7 @@
 ;;;;;;  ucs-normalize-NFKC-string ucs-normalize-NFKC-region ucs-normalize-NFKD-string
 ;;;;;;  ucs-normalize-NFKD-region ucs-normalize-NFC-string ucs-normalize-NFC-region
 ;;;;;;  ucs-normalize-NFD-string ucs-normalize-NFD-region) "ucs-normalize"
-;;;;;;  "international/ucs-normalize.el" (19278 4524))
+;;;;;;  "international/ucs-normalize.el" (19277 34920))
 ;;; Generated autoloads from international/ucs-normalize.el

 (autoload 'ucs-normalize-NFD-region "ucs-normalize" "\
@@ -28457,7 +28495,7 @@
 ;;;***

 ;;;### (autoloads (ununderline-region underline-region) "underline"
-;;;;;;  "textmodes/underline.el" (19278 4529))
+;;;;;;  "textmodes/underline.el" (19277 34923))
 ;;; Generated autoloads from textmodes/underline.el

 (autoload 'underline-region "underline" "\
@@ -28478,7 +28516,7 @@
 ;;;***

 ;;;### (autoloads (unrmail batch-unrmail) "unrmail" "mail/unrmail.el"
-;;;;;;  (19278 4525))
+;;;;;;  (19277 34921))
 ;;; Generated autoloads from mail/unrmail.el

 (autoload 'batch-unrmail "unrmail" "\
@@ -28497,8 +28535,8 @@

 ;;;***

-;;;### (autoloads (unsafep) "unsafep" "emacs-lisp/unsafep.el" (19278
-;;;;;;  4521))
+;;;### (autoloads (unsafep) "unsafep" "emacs-lisp/unsafep.el" (19277
+;;;;;;  34919))
 ;;; Generated autoloads from emacs-lisp/unsafep.el

 (autoload 'unsafep "unsafep" "\
@@ -28511,7 +28549,7 @@
 ;;;***

 ;;;### (autoloads (url-retrieve-synchronously url-retrieve) "url"
-;;;;;;  "url/url.el" (19278 4529))
+;;;;;;  "url/url.el" (19362 59593))
 ;;; Generated autoloads from url/url.el

 (autoload 'url-retrieve "url" "\
@@ -28551,7 +28589,7 @@
 ;;;***

 ;;;### (autoloads (url-register-auth-scheme url-get-authentication)
-;;;;;;  "url-auth" "url/url-auth.el" (19278 4529))
+;;;;;;  "url-auth" "url/url-auth.el" (19277 34923))
 ;;; Generated autoloads from url/url-auth.el

 (autoload 'url-get-authentication "url-auth" "\
@@ -28593,8 +28631,8 @@
 ;;;***

 ;;;### (autoloads (url-cache-expired url-cache-extract url-is-cached
-;;;;;;  url-store-in-cache) "url-cache" "url/url-cache.el" (19278
-;;;;;;  4529))
+;;;;;;  url-store-in-cache) "url-cache" "url/url-cache.el" (19277
+;;;;;;  34923))
 ;;; Generated autoloads from url/url-cache.el

 (autoload 'url-store-in-cache "url-cache" "\
@@ -28619,7 +28657,7 @@

 ;;;***

-;;;### (autoloads (url-cid) "url-cid" "url/url-cid.el" (19278 4529))
+;;;### (autoloads (url-cid) "url-cid" "url/url-cid.el" (19277 34923))
 ;;; Generated autoloads from url/url-cid.el

 (autoload 'url-cid "url-cid" "\
@@ -28630,7 +28668,7 @@
 ;;;***

 ;;;### (autoloads (url-dav-vc-registered url-dav-supported-p) "url-dav"
-;;;;;;  "url/url-dav.el" (19278 4529))
+;;;;;;  "url/url-dav.el" (19277 34923))
 ;;; Generated autoloads from url/url-dav.el

 (autoload 'url-dav-supported-p "url-dav" "\
@@ -28645,8 +28683,8 @@

 ;;;***

-;;;### (autoloads (url-file) "url-file" "url/url-file.el" (19278
-;;;;;;  4529))
+;;;### (autoloads (url-file) "url-file" "url/url-file.el" (19277
+;;;;;;  34923))
 ;;; Generated autoloads from url/url-file.el

 (autoload 'url-file "url-file" "\
@@ -28657,7 +28695,7 @@
 ;;;***

 ;;;### (autoloads (url-open-stream url-gateway-nslookup-host) "url-gw"
-;;;;;;  "url/url-gw.el" (19278 4529))
+;;;;;;  "url/url-gw.el" (19277 34923))
 ;;; Generated autoloads from url/url-gw.el

 (autoload 'url-gateway-nslookup-host "url-gw" "\
@@ -28677,7 +28715,7 @@

 ;;;### (autoloads (url-insert-file-contents url-file-local-copy url-copy-file
 ;;;;;;  url-file-handler url-handler-mode) "url-handlers" "url/url-handlers.el"
-;;;;;;  (19278 4529))
+;;;;;;  (19277 34923))
 ;;; Generated autoloads from url/url-handlers.el

 (defvar url-handler-mode nil "\
@@ -28729,7 +28767,7 @@
 ;;;***

 ;;;### (autoloads (url-http-options url-http-file-attributes url-http-file-exists-p
-;;;;;;  url-http) "url-http" "url/url-http.el" (19278 4529))
+;;;;;;  url-http) "url-http" "url/url-http.el" (19277 34923))
 ;;; Generated autoloads from url/url-http.el

 (autoload 'url-http "url-http" "\
@@ -28795,7 +28833,7 @@

 ;;;***

-;;;### (autoloads (url-irc) "url-irc" "url/url-irc.el" (19278 4529))
+;;;### (autoloads (url-irc) "url-irc" "url/url-irc.el" (19277 34923))
 ;;; Generated autoloads from url/url-irc.el

 (autoload 'url-irc "url-irc" "\
@@ -28805,8 +28843,8 @@

 ;;;***

-;;;### (autoloads (url-ldap) "url-ldap" "url/url-ldap.el" (19278
-;;;;;;  4529))
+;;;### (autoloads (url-ldap) "url-ldap" "url/url-ldap.el" (19277
+;;;;;;  34923))
 ;;; Generated autoloads from url/url-ldap.el

 (autoload 'url-ldap "url-ldap" "\
@@ -28820,7 +28858,7 @@
 ;;;***

 ;;;### (autoloads (url-mailto url-mail) "url-mailto" "url/url-mailto.el"
-;;;;;;  (19278 4529))
+;;;;;;  (19277 34923))
 ;;; Generated autoloads from url/url-mailto.el

 (autoload 'url-mail "url-mailto" "\
@@ -28836,7 +28874,7 @@
 ;;;***

 ;;;### (autoloads (url-data url-generic-emulator-loader url-info
-;;;;;;  url-man) "url-misc" "url/url-misc.el" (19278 4529))
+;;;;;;  url-man) "url-misc" "url/url-misc.el" (19277 34923))
 ;;; Generated autoloads from url/url-misc.el

 (autoload 'url-man "url-misc" "\
@@ -28868,7 +28906,7 @@
 ;;;***

 ;;;### (autoloads (url-snews url-news) "url-news" "url/url-news.el"
-;;;;;;  (19278 4529))
+;;;;;;  (19277 34923))
 ;;; Generated autoloads from url/url-news.el

 (autoload 'url-news "url-news" "\
@@ -28885,7 +28923,7 @@

 ;;;### (autoloads (url-ns-user-pref url-ns-prefs isInNet isResolvable
 ;;;;;;  dnsResolve dnsDomainIs isPlainHostName) "url-ns" "url/url-ns.el"
-;;;;;;  (19278 4529))
+;;;;;;  (19277 34923))
 ;;; Generated autoloads from url/url-ns.el

 (autoload 'isPlainHostName "url-ns" "\
@@ -28926,7 +28964,7 @@
 ;;;***

 ;;;### (autoloads (url-generic-parse-url url-recreate-url) "url-parse"
-;;;;;;  "url/url-parse.el" (19278 4529))
+;;;;;;  "url/url-parse.el" (19277 34923))
 ;;; Generated autoloads from url/url-parse.el

 (autoload 'url-recreate-url "url-parse" "\
@@ -28944,7 +28982,7 @@
 ;;;***

 ;;;### (autoloads (url-setup-privacy-info) "url-privacy" "url/url-privacy.el"
-;;;;;;  (19278 4529))
+;;;;;;  (19277 34923))
 ;;; Generated autoloads from url/url-privacy.el

 (autoload 'url-setup-privacy-info "url-privacy" "\
@@ -28960,7 +28998,7 @@
 ;;;;;;  url-pretty-length url-strip-leading-spaces url-eat-trailing-space
 ;;;;;;  url-get-normalized-date url-lazy-message url-normalize-url
 ;;;;;;  url-insert-entities-in-string url-parse-args url-debug url-debug)
-;;;;;;  "url-util" "url/url-util.el" (19291 31989))
+;;;;;;  "url-util" "url/url-util.el" (19294 23005))
 ;;; Generated autoloads from url/url-util.el

 (defvar url-debug nil "\
@@ -29096,7 +29134,7 @@
 ;;;***

 ;;;### (autoloads (ask-user-about-supersession-threat ask-user-about-lock)
-;;;;;;  "userlock" "userlock.el" (19278 4518))
+;;;;;;  "userlock" "userlock.el" (19277 34917))
 ;;; Generated autoloads from userlock.el

 (autoload 'ask-user-about-lock "userlock" "\
@@ -29126,7 +29164,7 @@

 ;;;### (autoloads (utf-7-imap-pre-write-conversion utf-7-pre-write-conversion
 ;;;;;;  utf-7-imap-post-read-conversion utf-7-post-read-conversion)
-;;;;;;  "utf-7" "international/utf-7.el" (19278 4524))
+;;;;;;  "utf-7" "international/utf-7.el" (19277 34920))
 ;;; Generated autoloads from international/utf-7.el

 (autoload 'utf-7-post-read-conversion "utf-7" "\
@@ -29153,7 +29191,7 @@

 ;;;### (autoloads (uudecode-decode-region uudecode-decode-region-internal
 ;;;;;;  uudecode-decode-region-external) "uudecode" "mail/uudecode.el"
-;;;;;;  (19278 4525))
+;;;;;;  (19277 34921))
 ;;; Generated autoloads from mail/uudecode.el

 (autoload 'uudecode-decode-region-external "uudecode" "\
@@ -29183,7 +29221,7 @@
 ;;;;;;  vc-create-tag vc-merge vc-insert-headers vc-revision-other-window
 ;;;;;;  vc-root-diff vc-diff vc-version-diff vc-register vc-next-action
 ;;;;;;  vc-before-checkin-hook vc-checkin-hook vc-checkout-hook)
-;;;;;;  "vc" "vc.el" (19283 36396))
+;;;;;;  "vc" "vc.el" (19286 4503))
 ;;; Generated autoloads from vc.el

 (defvar vc-checkout-hook nil "\
@@ -29416,8 +29454,8 @@

 ;;;***

-;;;### (autoloads (vc-annotate) "vc-annotate" "vc-annotate.el" (19293
-;;;;;;  49653))
+;;;### (autoloads (vc-annotate) "vc-annotate" "vc-annotate.el" (19354
+;;;;;;  34807))
 ;;; Generated autoloads from vc-annotate.el

 (autoload 'vc-annotate "vc-annotate" "\
@@ -29452,7 +29490,7 @@

 ;;;***

-;;;### (autoloads nil "vc-arch" "vc-arch.el" (19279 36173))
+;;;### (autoloads nil "vc-arch" "vc-arch.el" (19279 53114))
 ;;; Generated autoloads from vc-arch.el
  (defun vc-arch-registered (file)
   (if (vc-find-root file "{arch}/=tagging-method")
@@ -29462,7 +29500,7 @@

 ;;;***

-;;;### (autoloads nil "vc-bzr" "vc-bzr.el" (19324 59407))
+;;;### (autoloads nil "vc-bzr" "vc-bzr.el" (19353 62839))
 ;;; Generated autoloads from vc-bzr.el

 (defconst vc-bzr-admin-dirname ".bzr" "\
@@ -29477,7 +29515,7 @@

 ;;;***

-;;;### (autoloads nil "vc-cvs" "vc-cvs.el" (19327 809))
+;;;### (autoloads nil "vc-cvs" "vc-cvs.el" (19325 42040))
 ;;; Generated autoloads from vc-cvs.el
  (defun vc-cvs-registered (f)
   (when (file-readable-p (expand-file-name
@@ -29487,7 +29525,7 @@

 ;;;***

-;;;### (autoloads (vc-dir) "vc-dir" "vc-dir.el" (19283 36396))
+;;;### (autoloads (vc-dir) "vc-dir" "vc-dir.el" (19354 34807))
 ;;; Generated autoloads from vc-dir.el

 (autoload 'vc-dir "vc-dir" "\
@@ -29512,7 +29550,7 @@
 ;;;***

 ;;;### (autoloads (vc-do-command) "vc-dispatcher" "vc-dispatcher.el"
-;;;;;;  (19282 12605))
+;;;;;;  (19286 4503))
 ;;; Generated autoloads from vc-dispatcher.el

 (autoload 'vc-do-command "vc-dispatcher" "\
@@ -29535,18 +29573,18 @@

 ;;;***

-;;;### (autoloads nil "vc-git" "vc-git.el" (19293 49653))
+;;;### (autoloads nil "vc-git" "vc-git.el" (19351 60435))
 ;;; Generated autoloads from vc-git.el
  (defun vc-git-registered (file)
   "Return non-nil if FILE is registered with git."
-  (if (vc-find-root file ".git")       ; short cut
+  (if (vc-find-root file ".git")       ; Short cut.
       (progn
         (load "vc-git")
         (vc-git-registered file))))

 ;;;***

-;;;### (autoloads nil "vc-hg" "vc-hg.el" (19278 4518))
+;;;### (autoloads nil "vc-hg" "vc-hg.el" (19277 34917))
 ;;; Generated autoloads from vc-hg.el
  (defun vc-hg-registered (file)
   "Return non-nil if FILE is registered with hg."
@@ -29557,7 +29595,7 @@

 ;;;***

-;;;### (autoloads nil "vc-mtn" "vc-mtn.el" (19278 4518))
+;;;### (autoloads nil "vc-mtn" "vc-mtn.el" (19277 34917))
 ;;; Generated autoloads from vc-mtn.el

 (defconst vc-mtn-admin-dir "_MTN")
@@ -29572,7 +29610,7 @@
 ;;;***

 ;;;### (autoloads (vc-rcs-master-templates) "vc-rcs" "vc-rcs.el"
-;;;;;;  (19278 4518))
+;;;;;;  (19277 34917))
 ;;; Generated autoloads from vc-rcs.el

 (defvar vc-rcs-master-templates (purecopy '("%sRCS/%s,v" "%s%s,v" "%sRCS/%s")) "\
@@ -29586,7 +29624,7 @@
 ;;;***

 ;;;### (autoloads (vc-sccs-master-templates) "vc-sccs" "vc-sccs.el"
-;;;;;;  (19278 4518))
+;;;;;;  (19277 34917))
 ;;; Generated autoloads from vc-sccs.el

 (defvar vc-sccs-master-templates (purecopy '("%sSCCS/s.%s" "%ss.%s" vc-sccs-search-project-dir)) "\
@@ -29603,7 +29641,7 @@

 ;;;***

-;;;### (autoloads nil "vc-svn" "vc-svn.el" (19308 49976))
+;;;### (autoloads nil "vc-svn" "vc-svn.el" (19310 6402))
 ;;; Generated autoloads from vc-svn.el
  (defun vc-svn-registered (f)
   (let ((admin-dir (cond ((and (eq system-type 'windows-nt)
@@ -29619,7 +29657,7 @@
 ;;;***

 ;;;### (autoloads (vera-mode) "vera-mode" "progmodes/vera-mode.el"
-;;;;;;  (19278 4528))
+;;;;;;  (19277 34923))
 ;;; Generated autoloads from progmodes/vera-mode.el
  (add-to-list 'auto-mode-alist (cons (purecopy "\\.vr[hi]?\\'")  'vera-mode))

@@ -29677,7 +29715,7 @@
 ;;;***

 ;;;### (autoloads (verilog-mode) "verilog-mode" "progmodes/verilog-mode.el"
-;;;;;;  (19278 4528))
+;;;;;;  (19277 34923))
 ;;; Generated autoloads from progmodes/verilog-mode.el

 (autoload 'verilog-mode "verilog-mode" "\
@@ -29814,7 +29852,7 @@
 ;;;***

 ;;;### (autoloads (vhdl-mode) "vhdl-mode" "progmodes/vhdl-mode.el"
-;;;;;;  (19278 4528))
+;;;;;;  (19277 34923))
 ;;; Generated autoloads from progmodes/vhdl-mode.el

 (autoload 'vhdl-mode "vhdl-mode" "\
@@ -30355,7 +30393,7 @@

 ;;;***

-;;;### (autoloads (vi-mode) "vi" "emulation/vi.el" (19259 35432))
+;;;### (autoloads (vi-mode) "vi" "emulation/vi.el" (19267 61660))
 ;;; Generated autoloads from emulation/vi.el

 (autoload 'vi-mode "vi" "\
@@ -30410,7 +30448,7 @@
 ;;;### (autoloads (viqr-pre-write-conversion viqr-post-read-conversion
 ;;;;;;  viet-encode-viqr-buffer viet-encode-viqr-region viet-decode-viqr-buffer
 ;;;;;;  viet-decode-viqr-region viet-encode-viscii-char) "viet-util"
-;;;;;;  "language/viet-util.el" (19278 4524))
+;;;;;;  "language/viet-util.el" (19277 34921))
 ;;; Generated autoloads from language/viet-util.el

 (autoload 'viet-encode-viscii-char "viet-util" "\
@@ -30458,7 +30496,7 @@
 ;;;;;;  view-mode view-buffer-other-frame view-buffer-other-window
 ;;;;;;  view-buffer view-file-other-frame view-file-other-window
 ;;;;;;  view-file kill-buffer-if-not-modified view-remove-frame-by-deleting)
-;;;;;;  "view" "view.el" (19278 4518))
+;;;;;;  "view" "view.el" (19354 34807))
 ;;; Generated autoloads from view.el

 (defvar view-remove-frame-by-deleting t "\
@@ -30704,8 +30742,8 @@

 ;;;***

-;;;### (autoloads (vip-mode vip-setup) "vip" "emulation/vip.el" (19278
-;;;;;;  4522))
+;;;### (autoloads (vip-mode vip-setup) "vip" "emulation/vip.el" (19277
+;;;;;;  34919))
 ;;; Generated autoloads from emulation/vip.el

 (autoload 'vip-setup "vip" "\
@@ -30721,7 +30759,7 @@
 ;;;***

 ;;;### (autoloads (viper-mode toggle-viper-mode) "viper" "emulation/viper.el"
-;;;;;;  (19278 4522))
+;;;;;;  (19277 34919))
 ;;; Generated autoloads from emulation/viper.el

 (autoload 'toggle-viper-mode "viper" "\
@@ -30738,7 +30776,7 @@
 ;;;***

 ;;;### (autoloads (warn lwarn display-warning) "warnings" "emacs-lisp/warnings.el"
-;;;;;;  (19320 64906))
+;;;;;;  (19277 34919))
 ;;; Generated autoloads from emacs-lisp/warnings.el

 (defvar warning-prefix-function nil "\
@@ -30828,7 +30866,7 @@
 ;;;***

 ;;;### (autoloads (wdired-change-to-wdired-mode) "wdired" "wdired.el"
-;;;;;;  (19278 4518))
+;;;;;;  (19277 34917))
 ;;; Generated autoloads from wdired.el

 (autoload 'wdired-change-to-wdired-mode "wdired" "\
@@ -30844,7 +30882,7 @@

 ;;;***

-;;;### (autoloads (webjump) "webjump" "net/webjump.el" (19278 4526))
+;;;### (autoloads (webjump) "webjump" "net/webjump.el" (19277 34921))
 ;;; Generated autoloads from net/webjump.el

 (autoload 'webjump "webjump" "\
@@ -30861,7 +30899,7 @@
 ;;;***

 ;;;### (autoloads (which-function-mode) "which-func" "progmodes/which-func.el"
-;;;;;;  (19278 4528))
+;;;;;;  (19277 34923))
 ;;; Generated autoloads from progmodes/which-func.el
  (put 'which-func-format 'risky-local-variable t)
  (put 'which-func-current 'risky-local-variable t)
@@ -30892,7 +30930,7 @@
 ;;;### (autoloads (whitespace-report-region whitespace-report whitespace-cleanup-region
 ;;;;;;  whitespace-cleanup global-whitespace-toggle-options whitespace-toggle-options
 ;;;;;;  global-whitespace-newline-mode global-whitespace-mode whitespace-newline-mode
-;;;;;;  whitespace-mode) "whitespace" "whitespace.el" (19284 35872))
+;;;;;;  whitespace-mode) "whitespace" "whitespace.el" (19354 34807))
 ;;; Generated autoloads from whitespace.el

 (autoload 'whitespace-mode "whitespace" "\
@@ -31291,7 +31329,7 @@
 ;;;***

 ;;;### (autoloads (widget-minor-mode widget-browse-other-window widget-browse
-;;;;;;  widget-browse-at) "wid-browse" "wid-browse.el" (19278 4518))
+;;;;;;  widget-browse-at) "wid-browse" "wid-browse.el" (19277 34917))
 ;;; Generated autoloads from wid-browse.el

 (autoload 'widget-browse-at "wid-browse" "\
@@ -31318,8 +31356,8 @@
 ;;;***

 ;;;### (autoloads (widget-setup widget-insert widget-delete widget-create
-;;;;;;  widget-prompt-value widgetp) "wid-edit" "wid-edit.el" (19280
-;;;;;;  40239))
+;;;;;;  widget-prompt-value widgetp) "wid-edit" "wid-edit.el" (19360
+;;;;;;  14173))
 ;;; Generated autoloads from wid-edit.el

 (autoload 'widgetp "wid-edit" "\
@@ -31362,8 +31400,8 @@
 ;;;***

 ;;;### (autoloads (windmove-default-keybindings windmove-down windmove-right
-;;;;;;  windmove-up windmove-left) "windmove" "windmove.el" (19278
-;;;;;;  4518))
+;;;;;;  windmove-up windmove-left) "windmove" "windmove.el" (19277
+;;;;;;  34917))
 ;;; Generated autoloads from windmove.el

 (autoload 'windmove-left "windmove" "\
@@ -31416,7 +31454,7 @@
 ;;;***

 ;;;### (autoloads (winner-mode winner-mode) "winner" "winner.el"
-;;;;;;  (19278 4518))
+;;;;;;  (19277 34917))
 ;;; Generated autoloads from winner.el

 (defvar winner-mode nil "\
@@ -31435,7 +31473,7 @@
 ;;;***

 ;;;### (autoloads (woman-find-file woman-dired-find-file woman woman-locale)
-;;;;;;  "woman" "woman.el" (19278 4518))
+;;;;;;  "woman" "woman.el" (19277 34917))
 ;;; Generated autoloads from woman.el

 (defvar woman-locale nil "\
@@ -31479,7 +31517,7 @@
 ;;;***

 ;;;### (autoloads (wordstar-mode) "ws-mode" "emulation/ws-mode.el"
-;;;;;;  (19278 4522))
+;;;;;;  (19277 34919))
 ;;; Generated autoloads from emulation/ws-mode.el

 (autoload 'wordstar-mode "ws-mode" "\
@@ -31591,7 +31629,7 @@

 ;;;***

-;;;### (autoloads (xesam-search) "xesam" "net/xesam.el" (19278 4526))
+;;;### (autoloads (xesam-search) "xesam" "net/xesam.el" (19360 14173))
 ;;; Generated autoloads from net/xesam.el

 (autoload 'xesam-search "xesam" "\
@@ -31611,7 +31649,7 @@
 ;;;***

 ;;;### (autoloads (xml-parse-region xml-parse-file) "xml" "xml.el"
-;;;;;;  (19278 4518))
+;;;;;;  (19277 34917))
 ;;; Generated autoloads from xml.el

 (autoload 'xml-parse-file "xml" "\
@@ -31637,7 +31675,7 @@
 ;;;***

 ;;;### (autoloads (xmltok-get-declared-encoding-position) "xmltok"
-;;;;;;  "nxml/xmltok.el" (19278 4526))
+;;;;;;  "nxml/xmltok.el" (19277 34921))
 ;;; Generated autoloads from nxml/xmltok.el

 (autoload 'xmltok-get-declared-encoding-position "xmltok" "\
@@ -31655,8 +31693,8 @@

 ;;;***

-;;;### (autoloads (xterm-mouse-mode) "xt-mouse" "xt-mouse.el" (19278
-;;;;;;  4518))
+;;;### (autoloads (xterm-mouse-mode) "xt-mouse" "xt-mouse.el" (19277
+;;;;;;  34917))
 ;;; Generated autoloads from xt-mouse.el

 (defvar xterm-mouse-mode nil "\
@@ -31685,7 +31723,7 @@
 ;;;***

 ;;;### (autoloads (yenc-extract-filename yenc-decode-region) "yenc"
-;;;;;;  "gnus/yenc.el" (19278 4523))
+;;;;;;  "gnus/yenc.el" (19277 34920))
 ;;; Generated autoloads from gnus/yenc.el

 (autoload 'yenc-decode-region "yenc" "\
@@ -31701,7 +31739,7 @@
 ;;;***

 ;;;### (autoloads (psychoanalyze-pinhead apropos-zippy insert-zippyism
-;;;;;;  yow) "yow" "play/yow.el" (19278 4527))
+;;;;;;  yow) "yow" "play/yow.el" (19277 34922))
 ;;; Generated autoloads from play/yow.el

 (autoload 'yow "yow" "\
@@ -31727,7 +31765,7 @@

 ;;;***

-;;;### (autoloads (zone) "zone" "play/zone.el" (19278 4527))
+;;;### (autoloads (zone) "zone" "play/zone.el" (19277 34922))
 ;;; Generated autoloads from play/zone.el

 (autoload 'zone "zone" "\
@@ -31743,46 +31781,45 @@
 ;;;;;;  "calc/calc-fin.el" "calc/calc-forms.el" "calc/calc-frac.el"
 ;;;;;;  "calc/calc-funcs.el" "calc/calc-graph.el" "calc/calc-help.el"
 ;;;;;;  "calc/calc-incom.el" "calc/calc-keypd.el" "calc/calc-lang.el"
-;;;;;;  "calc/calc-loaddefs.el" "calc/calc-macs.el" "calc/calc-map.el"
-;;;;;;  "calc/calc-math.el" "calc/calc-menu.el" "calc/calc-misc.el"
-;;;;;;  "calc/calc-mode.el" "calc/calc-mtx.el" "calc/calc-nlfit.el"
-;;;;;;  "calc/calc-poly.el" "calc/calc-prog.el" "calc/calc-rewr.el"
-;;;;;;  "calc/calc-rules.el" "calc/calc-sel.el" "calc/calc-stat.el"
-;;;;;;  "calc/calc-store.el" "calc/calc-stuff.el" "calc/calc-trail.el"
-;;;;;;  "calc/calc-undo.el" "calc/calc-units.el" "calc/calc-vec.el"
-;;;;;;  "calc/calc-yank.el" "calc/calcalg2.el" "calc/calcalg3.el"
-;;;;;;  "calc/calccomp.el" "calc/calcsel2.el" "calendar/cal-bahai.el"
-;;;;;;  "calendar/cal-coptic.el" "calendar/cal-french.el" "calendar/cal-html.el"
-;;;;;;  "calendar/cal-islam.el" "calendar/cal-iso.el" "calendar/cal-julian.el"
-;;;;;;  "calendar/cal-loaddefs.el" "calendar/cal-mayan.el" "calendar/cal-menu.el"
-;;;;;;  "calendar/cal-move.el" "calendar/cal-persia.el" "calendar/cal-tex.el"
-;;;;;;  "calendar/cal-x.el" "calendar/diary-loaddefs.el" "calendar/hol-loaddefs.el"
-;;;;;;  "cdl.el" "cedet/cedet-cscope.el" "cedet/cedet-files.el" "cedet/cedet-global.el"
+;;;;;;  "calc/calc-macs.el" "calc/calc-map.el" "calc/calc-math.el"
+;;;;;;  "calc/calc-menu.el" "calc/calc-misc.el" "calc/calc-mode.el"
+;;;;;;  "calc/calc-mtx.el" "calc/calc-nlfit.el" "calc/calc-poly.el"
+;;;;;;  "calc/calc-prog.el" "calc/calc-rewr.el" "calc/calc-rules.el"
+;;;;;;  "calc/calc-sel.el" "calc/calc-stat.el" "calc/calc-store.el"
+;;;;;;  "calc/calc-stuff.el" "calc/calc-trail.el" "calc/calc-undo.el"
+;;;;;;  "calc/calc-units.el" "calc/calc-vec.el" "calc/calc-yank.el"
+;;;;;;  "calc/calcalg2.el" "calc/calcalg3.el" "calc/calccomp.el"
+;;;;;;  "calc/calcsel2.el" "calendar/cal-bahai.el" "calendar/cal-coptic.el"
+;;;;;;  "calendar/cal-french.el" "calendar/cal-html.el" "calendar/cal-islam.el"
+;;;;;;  "calendar/cal-iso.el" "calendar/cal-julian.el" "calendar/cal-loaddefs.el"
+;;;;;;  "calendar/cal-mayan.el" "calendar/cal-menu.el" "calendar/cal-move.el"
+;;;;;;  "calendar/cal-persia.el" "calendar/cal-tex.el" "calendar/cal-x.el"
+;;;;;;  "calendar/diary-loaddefs.el" "calendar/hol-loaddefs.el" "cdl.el"
+;;;;;;  "cedet/cedet-cscope.el" "cedet/cedet-files.el" "cedet/cedet-global.el"
 ;;;;;;  "cedet/cedet-idutils.el" "cedet/cedet.el" "cedet/ede/autoconf-edit.el"
 ;;;;;;  "cedet/ede/cpp-root.el" "cedet/ede/dired.el" "cedet/ede/emacs.el"
-;;;;;;  "cedet/ede/files.el" "cedet/ede/linux.el" "cedet/ede/loaddefs.el"
-;;;;;;  "cedet/ede/locate.el" "cedet/ede/make.el" "cedet/ede/makefile-edit.el"
-;;;;;;  "cedet/ede/pconf.el" "cedet/ede/pmake.el" "cedet/ede/proj-archive.el"
-;;;;;;  "cedet/ede/proj-aux.el" "cedet/ede/proj-comp.el" "cedet/ede/proj-elisp.el"
-;;;;;;  "cedet/ede/proj-info.el" "cedet/ede/proj-misc.el" "cedet/ede/proj-obj.el"
-;;;;;;  "cedet/ede/proj-prog.el" "cedet/ede/proj-scheme.el" "cedet/ede/proj-shared.el"
-;;;;;;  "cedet/ede/proj.el" "cedet/ede/project-am.el" "cedet/ede/shell.el"
-;;;;;;  "cedet/ede/simple.el" "cedet/ede/source.el" "cedet/ede/speedbar.el"
-;;;;;;  "cedet/ede/srecode.el" "cedet/ede/system.el" "cedet/ede/util.el"
-;;;;;;  "cedet/inversion.el" "cedet/mode-local.el" "cedet/pulse.el"
-;;;;;;  "cedet/semantic/analyze.el" "cedet/semantic/analyze/complete.el"
-;;;;;;  "cedet/semantic/analyze/debug.el" "cedet/semantic/analyze/fcn.el"
-;;;;;;  "cedet/semantic/analyze/refs.el" "cedet/semantic/bovine.el"
-;;;;;;  "cedet/semantic/bovine/c-by.el" "cedet/semantic/bovine/c.el"
-;;;;;;  "cedet/semantic/bovine/debug.el" "cedet/semantic/bovine/el.el"
-;;;;;;  "cedet/semantic/bovine/gcc.el" "cedet/semantic/bovine/make-by.el"
-;;;;;;  "cedet/semantic/bovine/make.el" "cedet/semantic/bovine/scm-by.el"
-;;;;;;  "cedet/semantic/bovine/scm.el" "cedet/semantic/chart.el"
-;;;;;;  "cedet/semantic/complete.el" "cedet/semantic/ctxt.el" "cedet/semantic/db-debug.el"
-;;;;;;  "cedet/semantic/db-ebrowse.el" "cedet/semantic/db-el.el"
-;;;;;;  "cedet/semantic/db-file.el" "cedet/semantic/db-find.el" "cedet/semantic/db-global.el"
-;;;;;;  "cedet/semantic/db-javascript.el" "cedet/semantic/db-mode.el"
-;;;;;;  "cedet/semantic/db-ref.el" "cedet/semantic/db-typecache.el"
+;;;;;;  "cedet/ede/files.el" "cedet/ede/linux.el" "cedet/ede/locate.el"
+;;;;;;  "cedet/ede/make.el" "cedet/ede/makefile-edit.el" "cedet/ede/pconf.el"
+;;;;;;  "cedet/ede/pmake.el" "cedet/ede/proj-archive.el" "cedet/ede/proj-aux.el"
+;;;;;;  "cedet/ede/proj-comp.el" "cedet/ede/proj-elisp.el" "cedet/ede/proj-info.el"
+;;;;;;  "cedet/ede/proj-misc.el" "cedet/ede/proj-obj.el" "cedet/ede/proj-prog.el"
+;;;;;;  "cedet/ede/proj-scheme.el" "cedet/ede/proj-shared.el" "cedet/ede/proj.el"
+;;;;;;  "cedet/ede/project-am.el" "cedet/ede/shell.el" "cedet/ede/simple.el"
+;;;;;;  "cedet/ede/source.el" "cedet/ede/speedbar.el" "cedet/ede/srecode.el"
+;;;;;;  "cedet/ede/system.el" "cedet/ede/util.el" "cedet/inversion.el"
+;;;;;;  "cedet/mode-local.el" "cedet/pulse.el" "cedet/semantic/analyze.el"
+;;;;;;  "cedet/semantic/analyze/complete.el" "cedet/semantic/analyze/debug.el"
+;;;;;;  "cedet/semantic/analyze/fcn.el" "cedet/semantic/analyze/refs.el"
+;;;;;;  "cedet/semantic/bovine.el" "cedet/semantic/bovine/c-by.el"
+;;;;;;  "cedet/semantic/bovine/c.el" "cedet/semantic/bovine/debug.el"
+;;;;;;  "cedet/semantic/bovine/el.el" "cedet/semantic/bovine/gcc.el"
+;;;;;;  "cedet/semantic/bovine/make-by.el" "cedet/semantic/bovine/make.el"
+;;;;;;  "cedet/semantic/bovine/scm-by.el" "cedet/semantic/bovine/scm.el"
+;;;;;;  "cedet/semantic/chart.el" "cedet/semantic/complete.el" "cedet/semantic/ctxt.el"
+;;;;;;  "cedet/semantic/db-debug.el" "cedet/semantic/db-ebrowse.el"
+;;;;;;  "cedet/semantic/db-el.el" "cedet/semantic/db-file.el" "cedet/semantic/db-find.el"
+;;;;;;  "cedet/semantic/db-global.el" "cedet/semantic/db-javascript.el"
+;;;;;;  "cedet/semantic/db-mode.el" "cedet/semantic/db-ref.el" "cedet/semantic/db-typecache.el"
 ;;;;;;  "cedet/semantic/db.el" "cedet/semantic/debug.el" "cedet/semantic/decorate.el"
 ;;;;;;  "cedet/semantic/decorate/include.el" "cedet/semantic/decorate/mode.el"
 ;;;;;;  "cedet/semantic/dep.el" "cedet/semantic/doc.el" "cedet/semantic/ede-grammar.el"
@@ -31790,7 +31827,7 @@
 ;;;;;;  "cedet/semantic/fw.el" "cedet/semantic/grammar-wy.el" "cedet/semantic/grammar.el"
 ;;;;;;  "cedet/semantic/html.el" "cedet/semantic/ia-sb.el" "cedet/semantic/ia.el"
 ;;;;;;  "cedet/semantic/idle.el" "cedet/semantic/java.el" "cedet/semantic/lex-spp.el"
-;;;;;;  "cedet/semantic/lex.el" "cedet/semantic/loaddefs.el" "cedet/semantic/mru-bookmark.el"
+;;;;;;  "cedet/semantic/lex.el" "cedet/semantic/mru-bookmark.el"
 ;;;;;;  "cedet/semantic/sb.el" "cedet/semantic/scope.el" "cedet/semantic/senator.el"
 ;;;;;;  "cedet/semantic/sort.el" "cedet/semantic/symref.el" "cedet/semantic/symref/cscope.el"
 ;;;;;;  "cedet/semantic/symref/filter.el" "cedet/semantic/symref/global.el"
@@ -31808,18 +31845,18 @@
 ;;;;;;  "cedet/srecode/el.el" "cedet/srecode/expandproto.el" "cedet/srecode/extract.el"
 ;;;;;;  "cedet/srecode/fields.el" "cedet/srecode/filters.el" "cedet/srecode/find.el"
 ;;;;;;  "cedet/srecode/getset.el" "cedet/srecode/insert.el" "cedet/srecode/java.el"
-;;;;;;  "cedet/srecode/loaddefs.el" "cedet/srecode/map.el" "cedet/srecode/mode.el"
-;;;;;;  "cedet/srecode/semantic.el" "cedet/srecode/srt-wy.el" "cedet/srecode/srt.el"
-;;;;;;  "cedet/srecode/table.el" "cedet/srecode/template.el" "cedet/srecode/texi.el"
-;;;;;;  "cus-dep.el" "cus-load.el" "dframe.el" "dired-aux.el" "dired-x.el"
-;;;;;;  "dos-fns.el" "dos-vars.el" "dos-w32.el" "ediff-diff.el" "ediff-init.el"
-;;;;;;  "ediff-merg.el" "ediff-ptch.el" "ediff-vers.el" "ediff-wind.el"
-;;;;;;  "electric.el" "emacs-lisp/assoc.el" "emacs-lisp/authors.el"
-;;;;;;  "emacs-lisp/avl-tree.el" "emacs-lisp/bindat.el" "emacs-lisp/byte-opt.el"
-;;;;;;  "emacs-lisp/chart.el" "emacs-lisp/cl-compat.el" "emacs-lisp/cl-extra.el"
-;;;;;;  "emacs-lisp/cl-loaddefs.el" "emacs-lisp/cl-macs.el" "emacs-lisp/cl-seq.el"
-;;;;;;  "emacs-lisp/cl-specs.el" "emacs-lisp/cust-print.el" "emacs-lisp/eieio-base.el"
-;;;;;;  "emacs-lisp/eieio-comp.el" "emacs-lisp/eieio-custom.el" "emacs-lisp/eieio-datadebug.el"
+;;;;;;  "cedet/srecode/map.el" "cedet/srecode/mode.el" "cedet/srecode/semantic.el"
+;;;;;;  "cedet/srecode/srt-wy.el" "cedet/srecode/srt.el" "cedet/srecode/table.el"
+;;;;;;  "cedet/srecode/template.el" "cedet/srecode/texi.el" "cus-dep.el"
+;;;;;;  "dframe.el" "dired-aux.el" "dired-x.el" "dos-fns.el" "dos-vars.el"
+;;;;;;  "dos-w32.el" "ediff-diff.el" "ediff-init.el" "ediff-merg.el"
+;;;;;;  "ediff-ptch.el" "ediff-vers.el" "ediff-wind.el" "electric.el"
+;;;;;;  "emacs-lisp/assoc.el" "emacs-lisp/authors.el" "emacs-lisp/avl-tree.el"
+;;;;;;  "emacs-lisp/bindat.el" "emacs-lisp/byte-opt.el" "emacs-lisp/chart.el"
+;;;;;;  "emacs-lisp/cl-compat.el" "emacs-lisp/cl-extra.el" "emacs-lisp/cl-loaddefs.el"
+;;;;;;  "emacs-lisp/cl-macs.el" "emacs-lisp/cl-seq.el" "emacs-lisp/cl-specs.el"
+;;;;;;  "emacs-lisp/cust-print.el" "emacs-lisp/eieio-base.el" "emacs-lisp/eieio-comp.el"
+;;;;;;  "emacs-lisp/eieio-custom.el" "emacs-lisp/eieio-datadebug.el"
 ;;;;;;  "emacs-lisp/eieio-opt.el" "emacs-lisp/eieio-speedbar.el"
 ;;;;;;  "emacs-lisp/eieio.el" "emacs-lisp/find-gc.el" "emacs-lisp/gulp.el"
 ;;;;;;  "emacs-lisp/lisp-mnt.el" "emacs-lisp/lmenu.el" "emacs-lisp/regi.el"
@@ -31836,19 +31873,18 @@
 ;;;;;;  "eshell/em-pred.el" "eshell/em-prompt.el" "eshell/em-rebind.el"
 ;;;;;;  "eshell/em-script.el" "eshell/em-smart.el" "eshell/em-term.el"
 ;;;;;;  "eshell/em-unix.el" "eshell/em-xtra.el" "eshell/esh-arg.el"
-;;;;;;  "eshell/esh-cmd.el" "eshell/esh-ext.el" "eshell/esh-groups.el"
-;;;;;;  "eshell/esh-io.el" "eshell/esh-module.el" "eshell/esh-opt.el"
-;;;;;;  "eshell/esh-proc.el" "eshell/esh-util.el" "eshell/esh-var.el"
-;;;;;;  "ezimage.el" "finder-inf.el" "foldout.el" "font-setting.el"
-;;;;;;  "format-spec.el" "forms-d2.el" "forms-pass.el" "fringe.el"
-;;;;;;  "generic-x.el" "gnus/auth-source.el" "gnus/compface.el" "gnus/gnus-async.el"
-;;;;;;  "gnus/gnus-bcklg.el" "gnus/gnus-cite.el" "gnus/gnus-cus.el"
-;;;;;;  "gnus/gnus-demon.el" "gnus/gnus-dup.el" "gnus/gnus-eform.el"
-;;;;;;  "gnus/gnus-ems.el" "gnus/gnus-int.el" "gnus/gnus-logic.el"
-;;;;;;  "gnus/gnus-mh.el" "gnus/gnus-salt.el" "gnus/gnus-score.el"
-;;;;;;  "gnus/gnus-setup.el" "gnus/gnus-srvr.el" "gnus/gnus-sum.el"
-;;;;;;  "gnus/gnus-topic.el" "gnus/gnus-undo.el" "gnus/gnus-util.el"
-;;;;;;  "gnus/gnus-uu.el" "gnus/gnus-vm.el" "gnus/ietf-drums.el"
+;;;;;;  "eshell/esh-cmd.el" "eshell/esh-ext.el" "eshell/esh-io.el"
+;;;;;;  "eshell/esh-module.el" "eshell/esh-opt.el" "eshell/esh-proc.el"
+;;;;;;  "eshell/esh-util.el" "eshell/esh-var.el" "ezimage.el" "foldout.el"
+;;;;;;  "font-setting.el" "format-spec.el" "forms-d2.el" "forms-pass.el"
+;;;;;;  "fringe.el" "generic-x.el" "gnus/auth-source.el" "gnus/compface.el"
+;;;;;;  "gnus/gnus-async.el" "gnus/gnus-bcklg.el" "gnus/gnus-cite.el"
+;;;;;;  "gnus/gnus-cus.el" "gnus/gnus-demon.el" "gnus/gnus-dup.el"
+;;;;;;  "gnus/gnus-eform.el" "gnus/gnus-ems.el" "gnus/gnus-int.el"
+;;;;;;  "gnus/gnus-logic.el" "gnus/gnus-mh.el" "gnus/gnus-salt.el"
+;;;;;;  "gnus/gnus-score.el" "gnus/gnus-setup.el" "gnus/gnus-srvr.el"
+;;;;;;  "gnus/gnus-sum.el" "gnus/gnus-topic.el" "gnus/gnus-undo.el"
+;;;;;;  "gnus/gnus-util.el" "gnus/gnus-uu.el" "gnus/gnus-vm.el" "gnus/ietf-drums.el"
 ;;;;;;  "gnus/legacy-gnus-agent.el" "gnus/mail-parse.el" "gnus/mail-prsvr.el"
 ;;;;;;  "gnus/mail-source.el" "gnus/mailcap.el" "gnus/messcompat.el"
 ;;;;;;  "gnus/mm-bodies.el" "gnus/mm-decode.el" "gnus/mm-encode.el"
@@ -31893,45 +31929,46 @@
 ;;;;;;  "net/hmac-def.el" "net/hmac-md5.el" "net/imap-hash.el" "net/imap.el"
 ;;;;;;  "net/ldap.el" "net/mairix.el" "net/netrc.el" "net/newsticker.el"
 ;;;;;;  "net/ntlm.el" "net/sasl-cram.el" "net/sasl-digest.el" "net/sasl-ntlm.el"
-;;;;;;  "net/sasl.el" "net/socks.el" "net/tls.el" "net/tramp-cache.el"
-;;;;;;  "net/tramp-cmds.el" "net/tramp-compat.el" "net/tramp-fish.el"
-;;;;;;  "net/tramp-gvfs.el" "net/tramp-gw.el" "net/tramp-imap.el"
-;;;;;;  "net/tramp-smb.el" "net/tramp-uu.el" "net/trampver.el" "net/zeroconf.el"
-;;;;;;  "nxml/nxml-enc.el" "nxml/nxml-maint.el" "nxml/nxml-ns.el"
-;;;;;;  "nxml/nxml-outln.el" "nxml/nxml-parse.el" "nxml/nxml-rap.el"
-;;;;;;  "nxml/nxml-util.el" "nxml/rng-dt.el" "nxml/rng-loc.el" "nxml/rng-maint.el"
-;;;;;;  "nxml/rng-match.el" "nxml/rng-parse.el" "nxml/rng-pttrn.el"
-;;;;;;  "nxml/rng-uri.el" "nxml/rng-util.el" "nxml/xsd-regexp.el"
-;;;;;;  "org/org-bibtex.el" "org/org-colview.el" "org/org-compat.el"
-;;;;;;  "org/org-crypt.el" "org/org-datetree.el" "org/org-exp-blocks.el"
-;;;;;;  "org/org-faces.el" "org/org-gnus.el" "org/org-habit.el" "org/org-info.el"
-;;;;;;  "org/org-inlinetask.el" "org/org-install.el" "org/org-jsinfo.el"
-;;;;;;  "org/org-list.el" "org/org-mac-message.el" "org/org-macs.el"
-;;;;;;  "org/org-mew.el" "org/org-mhe.el" "org/org-mouse.el" "org/org-protocol.el"
+;;;;;;  "net/sasl.el" "net/secrets.el" "net/socks.el" "net/tls.el"
+;;;;;;  "net/tramp-cache.el" "net/tramp-cmds.el" "net/tramp-compat.el"
+;;;;;;  "net/tramp-fish.el" "net/tramp-gvfs.el" "net/tramp-gw.el"
+;;;;;;  "net/tramp-imap.el" "net/tramp-smb.el" "net/tramp-uu.el"
+;;;;;;  "net/trampver.el" "net/zeroconf.el" "nxml/nxml-enc.el" "nxml/nxml-maint.el"
+;;;;;;  "nxml/nxml-ns.el" "nxml/nxml-outln.el" "nxml/nxml-parse.el"
+;;;;;;  "nxml/nxml-rap.el" "nxml/nxml-util.el" "nxml/rng-dt.el" "nxml/rng-loc.el"
+;;;;;;  "nxml/rng-maint.el" "nxml/rng-match.el" "nxml/rng-parse.el"
+;;;;;;  "nxml/rng-pttrn.el" "nxml/rng-uri.el" "nxml/rng-util.el"
+;;;;;;  "nxml/xsd-regexp.el" "org/org-bibtex.el" "org/org-colview.el"
+;;;;;;  "org/org-compat.el" "org/org-crypt.el" "org/org-datetree.el"
+;;;;;;  "org/org-exp-blocks.el" "org/org-faces.el" "org/org-gnus.el"
+;;;;;;  "org/org-habit.el" "org/org-info.el" "org/org-inlinetask.el"
+;;;;;;  "org/org-install.el" "org/org-jsinfo.el" "org/org-list.el"
+;;;;;;  "org/org-mac-message.el" "org/org-macs.el" "org/org-mew.el"
+;;;;;;  "org/org-mhe.el" "org/org-mouse.el" "org/org-protocol.el"
 ;;;;;;  "org/org-rmail.el" "org/org-src.el" "org/org-vm.el" "org/org-w3m.el"
-;;;;;;  "org/org-wl.el" "password-cache.el" "patcomp.el" "pcvs-info.el"
-;;;;;;  "pcvs-parse.el" "pcvs-util.el" "pgg-def.el" "pgg-parse.el"
-;;;;;;  "pgg-pgp.el" "pgg-pgp5.el" "play/gamegrid.el" "play/gametree.el"
-;;;;;;  "play/meese.el" "progmodes/ada-prj.el" "progmodes/cc-align.el"
-;;;;;;  "progmodes/cc-awk.el" "progmodes/cc-bytecomp.el" "progmodes/cc-cmds.el"
-;;;;;;  "progmodes/cc-defs.el" "progmodes/cc-fonts.el" "progmodes/cc-langs.el"
-;;;;;;  "progmodes/cc-menus.el" "progmodes/ebnf-abn.el" "progmodes/ebnf-bnf.el"
-;;;;;;  "progmodes/ebnf-dtd.el" "progmodes/ebnf-ebx.el" "progmodes/ebnf-iso.el"
-;;;;;;  "progmodes/ebnf-otz.el" "progmodes/ebnf-yac.el" "progmodes/idlw-complete-structtag.el"
-;;;;;;  "progmodes/idlw-help.el" "progmodes/idlw-toolbar.el" "progmodes/mantemp.el"
-;;;;;;  "progmodes/xscheme.el" "ps-def.el" "ps-mule.el" "ps-samp.el"
-;;;;;;  "s-region.el" "saveplace.el" "sb-image.el" "scroll-bar.el"
-;;;;;;  "select.el" "soundex.el" "subdirs.el" "tempo.el" "textmodes/bib-mode.el"
-;;;;;;  "textmodes/makeinfo.el" "textmodes/page-ext.el" "textmodes/refbib.el"
-;;;;;;  "textmodes/refer.el" "textmodes/reftex-auc.el" "textmodes/reftex-dcr.el"
-;;;;;;  "textmodes/reftex-ref.el" "textmodes/reftex-sel.el" "textmodes/reftex-toc.el"
-;;;;;;  "textmodes/texnfo-upd.el" "timezone.el" "tooltip.el" "tree-widget.el"
-;;;;;;  "uniquify.el" "url/url-about.el" "url/url-cookie.el" "url/url-dired.el"
+;;;;;;  "org/org-wl.el" "patcomp.el" "pcvs-info.el" "pcvs-parse.el"
+;;;;;;  "pcvs-util.el" "pgg-def.el" "pgg-parse.el" "pgg-pgp.el" "pgg-pgp5.el"
+;;;;;;  "play/gamegrid.el" "play/gametree.el" "play/meese.el" "progmodes/ada-prj.el"
+;;;;;;  "progmodes/cc-align.el" "progmodes/cc-awk.el" "progmodes/cc-bytecomp.el"
+;;;;;;  "progmodes/cc-cmds.el" "progmodes/cc-defs.el" "progmodes/cc-fonts.el"
+;;;;;;  "progmodes/cc-langs.el" "progmodes/cc-menus.el" "progmodes/ebnf-abn.el"
+;;;;;;  "progmodes/ebnf-bnf.el" "progmodes/ebnf-dtd.el" "progmodes/ebnf-ebx.el"
+;;;;;;  "progmodes/ebnf-iso.el" "progmodes/ebnf-otz.el" "progmodes/ebnf-yac.el"
+;;;;;;  "progmodes/idlw-complete-structtag.el" "progmodes/idlw-help.el"
+;;;;;;  "progmodes/idlw-toolbar.el" "progmodes/mantemp.el" "progmodes/xscheme.el"
+;;;;;;  "ps-def.el" "ps-mule.el" "ps-samp.el" "s-region.el" "saveplace.el"
+;;;;;;  "sb-image.el" "scroll-bar.el" "select.el" "soundex.el" "subdirs.el"
+;;;;;;  "tempo.el" "textmodes/bib-mode.el" "textmodes/makeinfo.el"
+;;;;;;  "textmodes/page-ext.el" "textmodes/refbib.el" "textmodes/refer.el"
+;;;;;;  "textmodes/reftex-auc.el" "textmodes/reftex-dcr.el" "textmodes/reftex-ref.el"
+;;;;;;  "textmodes/reftex-sel.el" "textmodes/reftex-toc.el" "textmodes/texnfo-upd.el"
+;;;;;;  "timezone.el" "tooltip.el" "tree-widget.el" "uniquify.el"
+;;;;;;  "url/url-about.el" "url/url-cookie.el" "url/url-dired.el"
 ;;;;;;  "url/url-expand.el" "url/url-ftp.el" "url/url-history.el"
 ;;;;;;  "url/url-imap.el" "url/url-methods.el" "url/url-nfs.el" "url/url-proxy.el"
 ;;;;;;  "url/url-vars.el" "vc-dav.el" "vcursor.el" "vt-control.el"
-;;;;;;  "vt100-led.el" "w32-fns.el" "w32-vars.el" "x-dnd.el") (19336
-;;;;;;  35929 287335))
+;;;;;;  "vt100-led.el" "w32-fns.el" "w32-vars.el" "x-dnd.el") (19362
+;;;;;;  59828 549715))

 ;;;***
--- a/lisp/log-edit.el	Thu Mar 18 12:56:23 2010 +0100
+++ b/lisp/log-edit.el	Mon Mar 22 08:34:25 2010 +0100
@@ -188,6 +188,25 @@
 (defvar log-edit-callback nil)
 (defvar log-edit-diff-function nil)
 (defvar log-edit-listfun nil)
+(defvar log-edit-extra-flags nil
+  "List of extra flags to pass to the check in command.")
+(defvar log-edit-before-checkin-process nil
+  "Alist that contains instructions for processing the commit message before check in.
+
+The format is: (REGEXP . INSTRUCTIONS).
+
+All lines matching REGEXP are removed.
+
+For example:
+
+(\"^#.*\" . nil)
+means: just remove all lines starting with #.  This can be used
+to insert lines in the commit buffer that contain, for example, the
+list of files to be committed.
+
+(\"Author: \\(.*\\)\" . (list \"--author\" (match-string 1)))
+means: append (list \"--author\" (match-string 1)) to
+`log-edit-extra-flags'.")
 (defvar log-edit-parent-buffer nil)

 ;;; Originally taken from VC-Log mode
@@ -318,9 +337,10 @@
      (2 font-lock-function-name-face))))

 ;;;###autoload
-(defun log-edit (callback &optional setup params buffer &rest ignore)
+(defun log-edit (callback &optional setup params buffer mode &rest ignore)
   "Setup a buffer to enter a log message.
-\\<log-edit-mode-map>The buffer will be put in `log-edit-mode'.
+\\<log-edit-mode-map>The buffer will be put in mode MODE or `log-edit-mode'
+if MODE is nil.
 If SETUP is non-nil, the buffer is then erased and `log-edit-hook' is run.
 Mark and point will be set around the entire contents of the buffer so
 that it is easy to kill the contents of the buffer with \\[kill-region].
@@ -341,7 +361,9 @@
     (when (and log-edit-setup-invert (not (eq setup 'force)))
       (setq setup (not setup)))
     (when setup (erase-buffer))
-    (log-edit-mode)
+    (if mode
+	(funcall mode)
+      (log-edit-mode))
     (set (make-local-variable 'log-edit-callback) callback)
     (if (listp params)
 	(dolist (crt params)
@@ -711,6 +733,17 @@
       (log-edit-changelog-insert-entries (car buffer-entry) (cdr buffer-entry))
       (when (cdr buffer-entry) (newline)))))

+(defun log-view-process-buffer ()
+  (when log-edit-before-checkin-process
+    (dolist (crt log-edit-before-checkin-process)
+      ;; Remove all lines matching (car crt)
+      ;; Append to `log-edit-extra-flags' the results of (cdr crt).
+      (goto-char (point-min))
+      (while (re-search-forward (car crt) nil t)
+	(when (cdr crt)
+	  (setq log-edit-extra-flags (append log-edit-extra-flags (eval (cdr crt)))))
+	(replace-match "" nil t)))))
+
 (provide 'log-edit)

 ;; arch-tag: 8089b39c-983b-4e83-93cd-ed0a64c7fdcc
--- a/lisp/net/secrets.el	Thu Mar 18 12:56:23 2010 +0100
+++ b/lisp/net/secrets.el	Mon Mar 22 08:34:25 2010 +0100
@@ -149,7 +149,7 @@
 (require 'dbus)

 (defvar secrets-enabled nil
-  "Whether there is a daemon offering the Secret Service API."
+  "Whether there is a daemon offering the Secret Service API.")

 (defvar secrets-debug t
   "Write debug messages")
@@ -693,7 +693,7 @@

   ;; We shall inform, whether the secret service is enabled on this
   ;; machine.
-  (setq secrets-enabled t)))
+  (setq secrets-enabled t))

 (provide 'secrets)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lisp/obsolete/s-region.el	Mon Mar 22 08:34:25 2010 +0100
@@ -0,0 +1,125 @@
+;;; s-region.el --- set region using shift key
+
+;; Copyright (C) 1994, 1995, 2001, 2002, 2003, 2004,
+;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+
+;; Author: Morten Welinder <terra@diku.dk>
+;; Keywords: terminals
+;; Favourite-brand-of-beer: None, I hate beer.
+;; Obsolete-since: 24.1
+
+;; 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:
+
+;; Having loaded this code you can set the region by holding down the
+;; shift key and move the cursor to the other end of the region.  The
+;; functionality provided by this code is similar to that provided by
+;; the editors of Borland International's compilers for ms-dos.
+
+;; Currently, s-region-move may be bound only to events that are vectors
+;; of length one and whose last element is a symbol.  Also, the functions
+;; that are given this kind of overlay should be (interactive "p")
+;; functions.
+
+;; If the following keys are not already bound then...
+;; C-insert is bound to copy-region-as-kill
+;; S-delete is bound to kill-region
+;; S-insert is bound to yank
+
+;;; Code:
+
+(defvar s-region-overlay (make-overlay 1 1))
+(overlay-put s-region-overlay 'face 'region)
+(overlay-put s-region-overlay 'priority 1000000) ; for hilit19
+
+(defun s-region-unshift (key)
+  "Remove shift modifier from last keypress KEY and return that as a key."
+  (if (vectorp key)
+      (let ((last (aref key (1- (length key)))))
+	(if (symbolp last)
+	    (let* ((keyname (symbol-name last))
+		   (pos (string-match "S-" keyname)))
+	      (if pos
+		  ;; We skip all initial parts of the event assuming that
+		  ;; those are setting up the prefix argument to the command.
+		  (vector (intern (concat (substring keyname 0 pos)
+					  (substring keyname (+ 2 pos)))))
+		(error "Non-shifted key: %S" key)))
+	  (error "Key does not end in a symbol: %S" key)))
+    (error "Non-vector key: %S" key)))
+
+(defun s-region-move-p1 (&rest arg)
+  "This is an overlay function to point-moving keys that are interactive \"p\"."
+  (interactive "p")
+  (apply (function s-region-move) arg))
+
+(defun s-region-move-p2 (&rest arg)
+  "This is an overlay function to point-moving keys that are interactive \"P\"."
+  (interactive "P")
+  (apply (function s-region-move) arg))
+
+(defun s-region-move (&rest arg)
+  (if (if mark-active (not (equal last-command 's-region-move)) t)
+      (set-mark-command nil)
+    (message "")) ; delete the "Mark set" message
+  (setq this-command 's-region-move)
+  (apply (key-binding (s-region-unshift (this-command-keys))) arg)
+  (move-overlay s-region-overlay (mark) (point) (current-buffer))
+  (sit-for 1)
+  (delete-overlay s-region-overlay))
+
+(defun s-region-bind (keylist &optional map)
+  "Bind shifted keys in KEYLIST to `s-region-move-p1' or `s-region-move-p2'.
+Each key in KEYLIST is shifted and bound to one of the `s-region-move'
+functions provided it is already bound to some command or other.
+Optional second argument MAP specifies keymap to add binding to, defaulting
+to global keymap."
+  (let ((p2 (list 'scroll-up 'scroll-down
+		  'beginning-of-buffer 'end-of-buffer)))
+    (or map (setq map global-map))
+    (while keylist
+      (let* ((key (car keylist))
+	     (binding (key-binding key)))
+	(if (commandp binding)
+	    (define-key
+	      map
+	      (vector (intern (concat "S-" (symbol-name (aref key 0)))))
+	      (cond ((memq binding p2)
+		     's-region-move-p2)
+		    (t 's-region-move-p1)))))
+      (setq keylist (cdr keylist)))))
+
+;; Single keys (plus modifiers) only!
+(s-region-bind
+ (list [right] [left] [up] [down]
+       [C-left] [C-right] [C-up] [C-down]
+       [M-left] [M-right] [M-up] [M-down]
+       [next] [previous] [home] [end]
+       [C-next] [C-previous] [C-home] [C-end]
+       [M-next] [M-previous] [M-home] [M-end]))
+
+(or (global-key-binding [C-insert])
+    (global-set-key [C-insert] 'copy-region-as-kill))
+(or (global-key-binding [S-delete])
+    (global-set-key [S-delete] 'kill-region))
+(or (global-key-binding [S-insert])
+    (global-set-key [S-insert] 'yank))
+
+(provide 's-region)
+
+;; arch-tag: a471e912-18d7-4247-a29b-2100bca180ff
+;;; s-region.el ends here
--- a/lisp/outline.el	Thu Mar 18 12:56:23 2010 +0100
+++ b/lisp/outline.el	Mon Mar 22 08:34:25 2010 +0100
@@ -915,7 +915,11 @@
        (lambda ()
 	 (if (<= (funcall outline-level) levels)
 	     (outline-show-heading)))
-       beg end)))
+       beg end)
+      ;; Finally unhide any trailing newline.
+      (goto-char (point-max))
+      (if (and (bolp) (not (bobp)) (outline-invisible-p (1- (point))))
+          (outline-flag-region (1- (point)) (point) nil))))
   (run-hooks 'outline-view-change-hook))

 (defun hide-other ()
--- a/lisp/password-cache.el	Thu Mar 18 12:56:23 2010 +0100
+++ b/lisp/password-cache.el	Mon Mar 22 08:34:25 2010 +0100
@@ -1,7 +1,7 @@
 ;;; password-cache.el --- Read passwords, possibly using a password cache.

-;; Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+;;   2010  Free Software Foundation, Inc.

 ;; Author: Simon Josefsson <simon@josefsson.org>
 ;; Created: 2003-12-21
@@ -51,11 +51,15 @@

 ;;; Code:

+;; Options are autoloaded since they are used by eg mml-sec.el.
+
+;;;###autoload
 (defcustom password-cache t
   "Whether to cache passwords."
   :group 'password
   :type 'boolean)

+;;;###autoload
 (defcustom password-cache-expiry 16
   "How many seconds passwords are cached, or nil to disable expiring.
 Whether passwords are cached at all is controlled by `password-cache'."
--- a/lisp/replace.el	Thu Mar 18 12:56:23 2010 +0100
+++ b/lisp/replace.el	Mon Mar 22 08:34:25 2010 +0100
@@ -1166,12 +1166,15 @@
 		      (not (eq occur-excluded-properties t)))))
 	  (let* ((bufcount (length active-bufs))
 		 (diff (- (length bufs) bufcount)))
-	    (message "Searched %d buffer%s%s; %s match%s for `%s'"
+	    (message "Searched %d buffer%s%s; %s match%s%s"
 		     bufcount (if (= bufcount 1) "" "s")
 		     (if (zerop diff) "" (format " (%d killed)" diff))
 		     (if (zerop count) "no" (format "%d" count))
 		     (if (= count 1) "" "es")
-		     regexp))
+		     ;; Don't display regexp if with remaining text
+		     ;; it is longer than window-width.
+		     (if (> (+ (length regexp) 42) (window-width))
+			 "" (format " for `%s'" (query-replace-descr regexp)))))
 	  (setq occur-revert-arguments (list regexp nlines bufs))
           (if (= count 0)
               (kill-buffer occur-buf)
@@ -1298,9 +1301,13 @@
 		(goto-char headerpt)
 		(let ((beg (point))
 		      end)
-		  (insert (format "%d match%s for \"%s\" in buffer: %s\n"
+		  (insert (format "%d match%s%s in buffer: %s\n"
 				  matches (if (= matches 1) "" "es")
-				  regexp (buffer-name buf)))
+				  ;; Don't display regexp for multi-buffer.
+				  (if (> (length buffers) 1)
+				      "" (format " for \"%s\""
+						 (query-replace-descr regexp)))
+				  (buffer-name buf)))
 		  (setq end (point))
 		  (add-text-properties beg end
 				       (append
@@ -1308,6 +1315,18 @@
 					  `(font-lock-face ,title-face))
 					`(occur-title ,buf))))
 		(goto-char (point-min)))))))
+      ;; Display total match count and regexp for multi-buffer.
+      (when (and (not (zerop globalcount)) (> (length buffers) 1))
+	(goto-char (point-min))
+	(let ((beg (point))
+	      end)
+	  (insert (format "%d match%s total for \"%s\":\n"
+			  globalcount (if (= globalcount 1) "" "es")
+			  (query-replace-descr regexp)))
+	  (setq end (point))
+	  (add-text-properties beg end (when title-face
+					 `(font-lock-face ,title-face))))
+	(goto-char (point-min)))
       (if coding
 	  ;; CODING is buffer-file-coding-system of the first buffer
 	  ;; that locally binds it.  Let's use it also for the output
--- a/lisp/s-region.el	Thu Mar 18 12:56:23 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,124 +0,0 @@
-;;; s-region.el --- set region using shift key
-
-;; Copyright (C) 1994, 1995, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-
-;; Author: Morten Welinder <terra@diku.dk>
-;; Keywords: terminals
-;; Favourite-brand-of-beer: None, I hate beer.
-
-;; 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:
-
-;; Having loaded this code you can set the region by holding down the
-;; shift key and move the cursor to the other end of the region.  The
-;; functionality provided by this code is similar to that provided by
-;; the editors of Borland International's compilers for ms-dos.
-
-;; Currently, s-region-move may be bound only to events that are vectors
-;; of length one and whose last element is a symbol.  Also, the functions
-;; that are given this kind of overlay should be (interactive "p")
-;; functions.
-
-;; If the following keys are not already bound then...
-;; C-insert is bound to copy-region-as-kill
-;; S-delete is bound to kill-region
-;; S-insert is bound to yank
-
-;;; Code:
-
-(defvar s-region-overlay (make-overlay 1 1))
-(overlay-put s-region-overlay 'face 'region)
-(overlay-put s-region-overlay 'priority 1000000) ; for hilit19
-
-(defun s-region-unshift (key)
-  "Remove shift modifier from last keypress KEY and return that as a key."
-  (if (vectorp key)
-      (let ((last (aref key (1- (length key)))))
-	(if (symbolp last)
-	    (let* ((keyname (symbol-name last))
-		   (pos (string-match "S-" keyname)))
-	      (if pos
-		  ;; We skip all initial parts of the event assuming that
-		  ;; those are setting up the prefix argument to the command.
-		  (vector (intern (concat (substring keyname 0 pos)
-					  (substring keyname (+ 2 pos)))))
-		(error "Non-shifted key: %S" key)))
-	  (error "Key does not end in a symbol: %S" key)))
-    (error "Non-vector key: %S" key)))
-
-(defun s-region-move-p1 (&rest arg)
-  "This is an overlay function to point-moving keys that are interactive \"p\"."
-  (interactive "p")
-  (apply (function s-region-move) arg))
-
-(defun s-region-move-p2 (&rest arg)
-  "This is an overlay function to point-moving keys that are interactive \"P\"."
-  (interactive "P")
-  (apply (function s-region-move) arg))
-
-(defun s-region-move (&rest arg)
-  (if (if mark-active (not (equal last-command 's-region-move)) t)
-      (set-mark-command nil)
-    (message "")) ; delete the "Mark set" message
-  (setq this-command 's-region-move)
-  (apply (key-binding (s-region-unshift (this-command-keys))) arg)
-  (move-overlay s-region-overlay (mark) (point) (current-buffer))
-  (sit-for 1)
-  (delete-overlay s-region-overlay))
-
-(defun s-region-bind (keylist &optional map)
-  "Bind shifted keys in KEYLIST to `s-region-move-p1' or `s-region-move-p2'.
-Each key in KEYLIST is shifted and bound to one of the `s-region-move'
-functions provided it is already bound to some command or other.
-Optional second argument MAP specifies keymap to add binding to, defaulting
-to global keymap."
-  (let ((p2 (list 'scroll-up 'scroll-down
-		  'beginning-of-buffer 'end-of-buffer)))
-    (or map (setq map global-map))
-    (while keylist
-      (let* ((key (car keylist))
-	     (binding (key-binding key)))
-	(if (commandp binding)
-	    (define-key
-	      map
-	      (vector (intern (concat "S-" (symbol-name (aref key 0)))))
-	      (cond ((memq binding p2)
-		     's-region-move-p2)
-		    (t 's-region-move-p1)))))
-      (setq keylist (cdr keylist)))))
-
-;; Single keys (plus modifiers) only!
-(s-region-bind
- (list [right] [left] [up] [down]
-       [C-left] [C-right] [C-up] [C-down]
-       [M-left] [M-right] [M-up] [M-down]
-       [next] [previous] [home] [end]
-       [C-next] [C-previous] [C-home] [C-end]
-       [M-next] [M-previous] [M-home] [M-end]))
-
-(or (global-key-binding [C-insert])
-    (global-set-key [C-insert] 'copy-region-as-kill))
-(or (global-key-binding [S-delete])
-    (global-set-key [S-delete] 'kill-region))
-(or (global-key-binding [S-insert])
-    (global-set-key [S-insert] 'yank))
-
-(provide 's-region)
-
-;; arch-tag: a471e912-18d7-4247-a29b-2100bca180ff
-;;; s-region.el ends here
--- a/lisp/textmodes/rst.el	Thu Mar 18 12:56:23 2010 +0100
+++ b/lisp/textmodes/rst.el	Mon Mar 22 08:34:25 2010 +0100
@@ -2585,62 +2585,132 @@
   :group 'faces
   :version "21.1")

-(defcustom rst-block-face 'font-lock-keyword-face
+(defface rst-block '((t :inherit font-lock-keyword-face))
+  "Face used for all syntax marking up a special block."
+  :version "24.1"
+  :group 'rst-faces)
+
+(defcustom rst-block-face 'rst-block
   "All syntax marking up a special block."
+  :version "24.1"
   :group 'rst-faces
   :type '(face))
-
-(defcustom rst-external-face 'font-lock-type-face
+(make-obsolete-variable 'rst-block-face
+                        "customize the face `rst-block' instead."
+                        "24.1")
+
+(defface rst-external '((t :inherit font-lock-type-face))
+  "Face used for field names and interpreted text."
+  :version "24.1"
+  :group 'rst-faces)
+
+(defcustom rst-external-face 'rst-external
   "Field names and interpreted text."
+  :version "24.1"
   :group 'rst-faces
   :type '(face))
-
-(defcustom rst-definition-face 'font-lock-function-name-face
+(make-obsolete-variable 'rst-external-face
+                        "customize the face `rst-external' instead."
+                        "24.1")
+
+(defface rst-definition '((t :inherit font-lock-function-name-face))
+  "Face used for all other defining constructs."
+  :version "24.1"
+  :group 'rst-faces)
+
+(defcustom rst-definition-face 'rst-definition
   "All other defining constructs."
+  :version "24.1"
   :group 'rst-faces
   :type '(face))
-
-(defcustom rst-directive-face
-  ;; XEmacs compatibility
-  (if (boundp 'font-lock-builtin-face)
-      'font-lock-builtin-face
-    'font-lock-preprocessor-face)
+(make-obsolete-variable 'rst-definition-face
+                        "customize the face `rst-definition' instead."
+                        "24.1")
+
+;; XEmacs compatibility (?).
+(defface rst-directive (if (boundp 'font-lock-builtin-face)
+                           '((t :inherit font-lock-builtin-face))
+                         '((t :inherit font-lock-preprocessor-face)))
+  "Face used for directives and roles."
+  :version "24.1"
+  :group 'rst-faces)
+
+(defcustom rst-directive-face 'rst-directive
   "Directives and roles."
   :group 'rst-faces
   :type '(face))
-
-(defcustom rst-comment-face 'font-lock-comment-face
+(make-obsolete-variable 'rst-directive-face
+                        "customize the face `rst-directive' instead."
+                        "24.1")
+
+(defface rst-comment '((t :inherit font-lock-comment-face))
+  "Face used for comments."
+  :version "24.1"
+  :group 'rst-faces)
+
+(defcustom rst-comment-face 'rst-comment
   "Comments."
+  :version "24.1"
   :group 'rst-faces
   :type '(face))
-
-(defcustom rst-emphasis1-face
-  ;; XEmacs compatibility
-  (if (facep 'italic)
-      ''italic
-    'italic)
+(make-obsolete-variable 'rst-comment-face
+                        "customize the face `rst-comment' instead."
+                        "24.1")
+
+(defface rst-emphasis1 '((t :inherit italic))
+  "Face used for simple emphasis."
+  :version "24.1"
+  :group 'rst-faces)
+
+(defcustom rst-emphasis1-face 'rst-emphasis1
   "Simple emphasis."
+  :version "24.1"
   :group 'rst-faces
   :type '(face))
-
-(defcustom rst-emphasis2-face
-  ;; XEmacs compatibility
-  (if (facep 'bold)
-      ''bold
-    'bold)
+(make-obsolete-variable 'rst-emphasis1-face
+                        "customize the face `rst-emphasis1' instead."
+                        "24.1")
+
+(defface rst-emphasis2 '((t :inherit bold))
+  "Face used for double emphasis."
+  :version "24.1"
+  :group 'rst-faces)
+
+(defcustom rst-emphasis2-face 'rst-emphasis2
   "Double emphasis."
   :group 'rst-faces
   :type '(face))
-
-(defcustom rst-literal-face 'font-lock-string-face
+(make-obsolete-variable 'rst-emphasis2-face
+                        "customize the face `rst-emphasis2' instead."
+                        "24.1")
+
+(defface rst-literal '((t :inherit font-lock-string-face))
+  "Face used for literal text."
+  :version "24.1"
+  :group 'rst-faces)
+
+(defcustom rst-literal-face 'rst-literal
   "Literal text."
+  :version "24.1"
   :group 'rst-faces
   :type '(face))
-
-(defcustom rst-reference-face 'font-lock-variable-name-face
+(make-obsolete-variable 'rst-literal-face
+                        "customize the face `rst-literal' instead."
+                        "24.1")
+
+(defface rst-reference '((t :inherit font-lock-variable-name-face))
+  "Face used for references to a definition."
+  :version "24.1"
+  :group 'rst-faces)
+
+(defcustom rst-reference-face 'rst-reference
   "References to a definition."
+  :version "24.1"
   :group 'rst-faces
   :type '(face))
+(make-obsolete-variable 'rst-reference-face
+                        "customize the face `rst-reference' instead."
+                        "24.1")

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

@@ -2818,94 +2888,76 @@

      ;; Simple `Body Elements`_
      ;; `Bullet Lists`_
-     (list
-      (concat re-bol "\\([-*+]" re-blksep1 "\\)")
-      1 rst-block-face)
+     `(,(concat re-bol "\\([-*+]" re-blksep1 "\\)")
+       1 rst-block-face)
      ;; `Enumerated Lists`_
-     (list
-      (concat re-bol "\\((?\\(#\\|[0-9]+\\|[A-Za-z]\\|[IVXLCMivxlcm]+\\)[.)]"
-	      re-blksep1 "\\)")
-      1 rst-block-face)
+     `(,(concat re-bol "\\((?\\(#\\|[0-9]+\\|[A-Za-z]\\|[IVXLCMivxlcm]+\\)[.)]"
+                re-blksep1 "\\)")
+       1 rst-block-face)
      ;; `Definition Lists`_ FIXME: missing
      ;; `Field Lists`_
-     (list
-      (concat re-bol "\\(:[^:\n]+:\\)" re-blksep1)
-      1 rst-external-face)
+     `(,(concat re-bol "\\(:[^:\n]+:\\)" re-blksep1)
+       1 rst-external-face)
      ;; `Option Lists`_
-     (list
-      (concat re-bol "\\(\\(\\(\\([-+/]\\|--\\)\\sw\\(-\\|\\sw\\)*"
-	      "\\([ =]\\S +\\)?\\)\\(,[\t ]\\)?\\)+\\)\\($\\|[\t ]\\{2\\}\\)")
-      1 rst-block-face)
+     `(,(concat re-bol "\\(\\(\\(\\([-+/]\\|--\\)\\sw\\(-\\|\\sw\\)*"
+               "\\([ =]\\S +\\)?\\)\\(,[\t ]\\)?\\)+\\)\\($\\|[\t ]\\{2\\}\\)")
+       1 rst-block-face)

      ;; `Tables`_ FIXME: missing

      ;; All the `Explicit Markup Blocks`_
      ;; `Footnotes`_ / `Citations`_
-     (list
-      (concat re-bol "\\(" re-ems "\\[[^[\n]+\\]\\)" re-blksep1)
+     `(,(concat re-bol "\\(" re-ems "\\[[^[\n]+\\]\\)" re-blksep1)
       1 rst-definition-face)
      ;; `Directives`_ / `Substitution Definitions`_
-     (list
-      (concat re-bol "\\(" re-ems "\\)\\(\\(|[^|\n]+|[\t ]+\\)?\\)\\("
-	      re-sym1 "+::\\)" re-blksep1)
-      (list 1 rst-directive-face)
-      (list 2 rst-definition-face)
-      (list 4 rst-directive-face))
+     `(,(concat re-bol "\\(" re-ems "\\)\\(\\(|[^|\n]+|[\t ]+\\)?\\)\\("
+                re-sym1 "+::\\)" re-blksep1)
+       (1 rst-directive-face)
+       (2 rst-definition-face)
+       (4 rst-directive-face))
      ;; `Hyperlink Targets`_
-     (list
-      (concat re-bol "\\(" re-ems "_\\([^:\\`\n]\\|\\\\.\\|`[^`\n]+`\\)+:\\)"
-	      re-blksep1)
-      1 rst-definition-face)
-     (list
-      (concat re-bol "\\(__\\)" re-blksep1)
-      1 rst-definition-face)
+     `(,(concat re-bol "\\(" re-ems "_\\([^:\\`\n]\\|\\\\.\\|`[^`\n]+`\\)+:\\)"
+                re-blksep1)
+       1 rst-definition-face)
+     `(,(concat re-bol "\\(__\\)" re-blksep1)
+       1 rst-definition-face)

      ;; All `Inline Markup`_
      ;; FIXME: Condition 5 preventing fontification of e.g. "*" not implemented
      ;; `Strong Emphasis`_
-     (list
-      (concat re-imp1 "\\(\\*\\*" re-ima2 "\\*\\*\\)" re-ims1)
-      2 rst-emphasis2-face)
+     `(,(concat re-imp1 "\\(\\*\\*" re-ima2 "\\*\\*\\)" re-ims1)
+       2 rst-emphasis2-face)
      ;; `Emphasis`_
-     (list
-      (concat re-imp1 "\\(\\*" re-ima2 "\\*\\)" re-ims1)
-      2 rst-emphasis1-face)
+     `(,(concat re-imp1 "\\(\\*" re-ima2 "\\*\\)" re-ims1)
+       2 rst-emphasis1-face)
      ;; `Inline Literals`_
-     (list
-      (concat re-imp1 "\\(``" re-imb2 "``\\)" re-ims1)
-      2 rst-literal-face)
+     `(,(concat re-imp1 "\\(``" re-imb2 "``\\)" re-ims1)
+       2 rst-literal-face)
      ;; `Inline Internal Targets`_
-     (list
-      (concat re-imp1 "\\(_`" re-imb2 "`\\)" re-ims1)
-      2 rst-definition-face)
+     `(,(concat re-imp1 "\\(_`" re-imb2 "`\\)" re-ims1)
+       2 rst-definition-face)
      ;; `Hyperlink References`_
      ;; FIXME: `Embedded URIs`_ not considered
-     (list
-      (concat re-imp1 "\\(\\(`" re-imb2 "`\\|\\(\\sw\\(\\sw\\|-\\)+\\sw\\)\\)__?\\)" re-ims1)
+     `(,(concat re-imp1 "\\(\\(`" re-imb2 "`\\|\\(\\sw\\(\\sw\\|-\\)+\\sw\\)\\)__?\\)" re-ims1)
       2 rst-reference-face)
      ;; `Interpreted Text`_
-     (list
-      (concat re-imp1 "\\(\\(:" re-sym1 "+:\\)?\\)\\(`" re-imb2 "`\\)\\(\\(:"
-	      re-sym1 "+:\\)?\\)" re-ims1)
-      (list 2 rst-directive-face)
-      (list 5 rst-external-face)
-      (list 8 rst-directive-face))
+     `(,(concat re-imp1 "\\(\\(:" re-sym1 "+:\\)?\\)\\(`" re-imb2 "`\\)\\(\\(:"
+                re-sym1 "+:\\)?\\)" re-ims1)
+       (2 rst-directive-face)
+       (5 rst-external-face)
+       (8 rst-directive-face))
      ;; `Footnote References`_ / `Citation References`_
-     (list
-      (concat re-imp1 "\\(\\[[^]]+\\]_\\)" re-ims1)
-      2 rst-reference-face)
+     `(,(concat re-imp1 "\\(\\[[^]]+\\]_\\)" re-ims1)
+       2 rst-reference-face)
      ;; `Substitution References`_
-     (list
-      (concat re-imp1 "\\(|" re-imv2 "|\\)" re-ims1)
-      2 rst-reference-face)
+     `(,(concat re-imp1 "\\(|" re-imv2 "|\\)" re-ims1)
+       2 rst-reference-face)
      ;; `Standalone Hyperlinks`_
-     (list
-      ;; FIXME: This takes it easy by using a whitespace as delimiter
-      (concat re-imp1 "\\(" re-uris1 ":\\S +\\)" re-ims1)
-      2 rst-definition-face)
-     (list
-      (concat re-imp1 "\\(" re-sym1 "+@" re-sym1 "+\\)" re-ims1)
-      2 rst-definition-face)
+     `(;; FIXME: This takes it easy by using a whitespace as delimiter
+       ,(concat re-imp1 "\\(" re-uris1 ":\\S +\\)" re-ims1)
+       2 rst-definition-face)
+     `(,(concat re-imp1 "\\(" re-sym1 "+@" re-sym1 "+\\)" re-ims1)
+       2 rst-definition-face)

      ;; Do all block fontification as late as possible so 'append works

@@ -2914,7 +2966,7 @@
       (list
        re-ado2)
       (if (not rst-mode-lazy)
-	  (list 1 rst-block-face)
+	  '(1 rst-block-face)
 	(list
 	 (list 'rst-font-lock-handle-adornment
 	       '(progn
@@ -2934,7 +2986,7 @@
       (list
        (concat re-bol "\\(" re-ems "\\)\[^[|_]\\([^:\n]\\|:\\([^:\n]\\|$\\)\\)*$")

-       (list 1 rst-comment-face))
+       '(1 rst-comment-face))
       (if rst-mode-lazy
 	  (list
 	   (list 'rst-font-lock-find-unindented-line
@@ -2942,12 +2994,12 @@
 		    (setq rst-font-lock-indentation-point (match-end 1))
 		    (point-max))
 		 nil
-		 (list 0 rst-comment-face 'append)))))
+		 '(0 rst-comment-face append)))))
      (append
       (list
        (concat re-bol "\\(" re-emt "\\)\\(\\s *\\)$")
-       (list 1 rst-comment-face)
-       (list 2 rst-comment-face))
+       '(1 rst-comment-face)
+       '(2 rst-comment-face))
       (if rst-mode-lazy
 	  (list
 	   (list 'rst-font-lock-find-unindented-line
@@ -2955,13 +3007,13 @@
 		    (setq rst-font-lock-indentation-point 'next)
 		    (point-max))
 		 nil
-		 (list 0 rst-comment-face 'append)))))
+		 '(0 rst-comment-face append)))))

      ;; `Literal Blocks`_
      (append
       (list
        (concat re-bol "\\(\\([^.\n]\\|\\.[^.\n]\\).*\\)?\\(::\\)$")
-       (list 3 rst-block-face))
+       '(3 rst-block-face))
       (if rst-mode-lazy
 	  (list
 	   (list 'rst-font-lock-find-unindented-line
@@ -2969,14 +3021,14 @@
 		    (setq rst-font-lock-indentation-point t)
 		    (point-max))
 		 nil
-		 (list 0 rst-literal-face 'append)))))
+		 '(0 rst-literal-face append)))))

     ;; `Doctest Blocks`_
     (append
      (list
       (concat re-bol "\\(>>>\\|\\.\\.\\.\\)\\(.+\\)")
-      (list 1 rst-block-face)
-      (list 2 rst-literal-face)))
+      '(1 rst-block-face)
+      '(2 rst-literal-face)))
     )))
--- a/lisp/url/ChangeLog	Thu Mar 18 12:56:23 2010 +0100
+++ b/lisp/url/ChangeLog	Mon Mar 22 08:34:25 2010 +0100
@@ -1,3 +1,7 @@
+2010-03-19  Glenn Morris  <rgm@gnu.org>
+
+	* url.el: Move mailcap require earlier in the file.
+
 2010-03-12  Chong Yidong  <cyd@stupidchicken.com>

 	* url-vars.el (url): Put in comm group.
--- a/lisp/url/url.el	Thu Mar 18 12:56:23 2010 +0100
+++ b/lisp/url/url.el	Mon Mar 22 08:34:25 2010 +0100
@@ -1,7 +1,7 @@
 ;;; url.el --- Uniform Resource Locator retrieval tool

-;; Copyright (C) 1996, 1997, 1998, 1999, 2001, 2004,
-;;   2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2001, 2004, 2005, 2006, 2007,
+;;   2008, 2009, 2010  Free Software Foundation, Inc.

 ;; Author: Bill Perry <wmperry@gnu.org>
 ;; Keywords: comm, data, processes, hypermedia
@@ -29,11 +29,12 @@

 (eval-when-compile (require 'cl))

+(require 'mailcap)
+
 (eval-when-compile
   (require 'mm-decode)
   (require 'mm-view))

-(require 'mailcap)
 (require 'url-vars)
 (require 'url-cookie)
 (require 'url-history)
--- a/lisp/vc-arch.el	Thu Mar 18 12:56:23 2010 +0100
+++ b/lisp/vc-arch.el	Mon Mar 22 08:34:25 2010 +0100
@@ -428,7 +428,7 @@
 	(message "There are unresolved conflicts in %s"
 		 (file-name-nondirectory rej))))))

-(defun vc-arch-checkin (files rev comment)
+(defun vc-arch-checkin (files rev comment  &optional extra-args-ignored)
   (if rev (error "Committing to a specific revision is unsupported"))
   ;; FIXME: This implementation probably only works for singleton filesets
   (let ((summary (file-relative-name (car files) (vc-arch-root (car files)))))
--- a/lisp/vc-bzr.el	Thu Mar 18 12:56:23 2010 +0100
+++ b/lisp/vc-bzr.el	Mon Mar 22 08:34:25 2010 +0100
@@ -451,11 +451,11 @@
   "Unregister FILE from bzr."
   (vc-bzr-command "remove" nil 0 file "--keep"))

-(defun vc-bzr-checkin (files rev comment)
+(defun vc-bzr-checkin (files rev comment &optional extra-args)
   "Check FILE in to bzr with log message COMMENT.
 REV non-nil gets an error."
   (if rev (error "Can't check in a specific revision with bzr"))
-  (vc-bzr-command "commit" nil 0 files "-m" comment))
+  (apply 'vc-bzr-command "commit" nil 0 files (append (list "-m" comment) extra-args)))

 (defun vc-bzr-find-revision (file rev buffer)
   "Fetch revision REV of file FILE and put it into BUFFER."
@@ -545,6 +545,20 @@
 	(goto-char (point-min)))
       found)))

+(defvar log-edit-extra-flags)
+(defvar log-edit-before-checkin-process)
+
+(define-derived-mode vc-bzr-log-edit-mode log-edit-mode "Bzr-Log-Edit"
+  "Mode for editing Bzr commit logs.
+If a line like:
+Author: NAME
+is present in the log, it is removed, and
+--author NAME
+is passed to the bzr commit command."
+  (set (make-local-variable 'log-edit-extra-flags) nil)
+  (set (make-local-variable 'log-edit-before-checkin-process)
+       '(("^Author:[ \t]+\\(.*\\)[ \t]*$" . (list "--author" (match-string 1))))))
+
 (defun vc-bzr-diff (files &optional rev1 rev2 buffer)
   "VC bzr backend for diff."
   ;; `bzr diff' exits with code 1 if diff is non-empty.
--- a/lisp/vc-cvs.el	Thu Mar 18 12:56:23 2010 +0100
+++ b/lisp/vc-cvs.el	Mon Mar 22 08:34:25 2010 +0100
@@ -313,7 +313,7 @@
                   (directory-file-name dir))))
     (eq dir t)))

-(defun vc-cvs-checkin (files rev comment)
+(defun vc-cvs-checkin (files rev comment  &optional extra-args-ignored)
   "CVS-specific version of `vc-backend-checkin'."
   (unless (or (not rev) (vc-cvs-valid-revision-number-p rev))
     (if (not (vc-cvs-valid-symbolic-tag-name-p rev))
--- a/lisp/vc-dispatcher.el	Thu Mar 18 12:56:23 2010 +0100
+++ b/lisp/vc-dispatcher.el	Mon Mar 22 08:34:25 2010 +0100
@@ -318,16 +318,9 @@
 	    (status 0))
 	(when files
 	  (setq squeezed (nconc squeezed files)))
-	(let ((exec-path (append vc-path exec-path))
-	      ;; Add vc-path to PATH for the execution of this command.
-	      ;; Also, since some functions need to parse the output
+	(let (;; Since some functions need to parse the output
 	      ;; from external commands, set LC_MESSAGES to C.
-	      (process-environment
-	       (cons (concat "PATH=" (getenv "PATH")
-			     path-separator
-			     (mapconcat 'identity vc-path path-separator))
-		     (cons "LC_MESSAGES=C"
-			   process-environment)))
+	      (process-environment (cons "LC_MESSAGES=C" process-environment))
 	      (w32-quote-process-args t))
 	  (if (eq okstatus 'async)
 	      ;; Run asynchronously.
@@ -522,20 +515,22 @@

 ;; Set up key bindings for use while editing log messages

-(defun vc-log-edit (fileset)
+(defun vc-log-edit (fileset mode)
   "Set up `log-edit' for use on FILE."
   (setq default-directory
 	(with-current-buffer vc-parent-buffer default-directory))
   (log-edit 'vc-finish-logentry
 	    nil
 	    `((log-edit-listfun . (lambda () ',fileset))
-	      (log-edit-diff-function . (lambda () (vc-diff nil)))))
+	      (log-edit-diff-function . (lambda () (vc-diff nil))))
+	    nil
+	    mode)
   (set (make-local-variable 'vc-log-fileset) fileset)
   (make-local-variable 'vc-log-extra)
   (set-buffer-modified-p nil)
   (setq buffer-file-name nil))

-(defun vc-start-logentry (files extra comment initial-contents msg logbuf action &optional after-hook)
+(defun vc-start-logentry (files extra comment initial-contents msg logbuf mode action &optional after-hook)
   "Accept a comment for an operation on FILES with extra data EXTRA.
 If COMMENT is nil, pop up a LOGBUF buffer, emit MSG, and set the
 action on close to ACTION.  If COMMENT is a string and
@@ -560,7 +555,7 @@
     (set (make-local-variable 'vc-parent-buffer) parent)
     (set (make-local-variable 'vc-parent-buffer-name)
 	 (concat " from " (buffer-name vc-parent-buffer)))
-    (vc-log-edit files)
+    (vc-log-edit files mode)
     (make-local-variable 'vc-log-after-operation-hook)
     (when after-hook
       (setq vc-log-after-operation-hook after-hook))
@@ -590,12 +585,16 @@
     (or (vc-dispatcher-browsing) (vc-buffer-sync)))
   (unless vc-log-operation
     (error "No log operation is pending"))
+
+  (log-view-process-buffer)
+
   ;; save the parameters held in buffer-local variables
   (let ((logbuf (current-buffer))
 	(log-operation vc-log-operation)
 	(log-fileset vc-log-fileset)
 	(log-extra vc-log-extra)
 	(log-entry (buffer-string))
+	(extra-flags log-edit-extra-flags)
 	(after-hook vc-log-after-operation-hook)
 	(tmp-vc-parent-buffer vc-parent-buffer))
     (pop-to-buffer vc-parent-buffer)
@@ -604,7 +603,9 @@
       (funcall log-operation
 	       log-fileset
 	       log-extra
-	       log-entry))
+	       log-entry
+	       extra-flags
+	       ))
     ;; Remove checkin window (after the checkin so that if that fails
     ;; we don't zap the log buffer and the typing therein).
     ;; -- IMO this should be replaced with quit-window
--- a/lisp/vc-git.el	Thu Mar 18 12:56:23 2010 +0100
+++ b/lisp/vc-git.el	Mon Mar 22 08:34:25 2010 +0100
@@ -541,7 +541,7 @@
   (vc-git-command nil 0 file "rm" "-f" "--cached" "--"))


-(defun vc-git-checkin (files rev comment)
+(defun vc-git-checkin (files rev comment  &optional extra-args-ignored)
   (let ((coding-system-for-write git-commits-coding-system))
     (vc-git-command nil 0 files "commit"
 		    "-m" comment "--only" "--")))
--- a/lisp/vc-hg.el	Thu Mar 18 12:56:23 2010 +0100
+++ b/lisp/vc-hg.el	Mon Mar 22 08:34:25 2010 +0100
@@ -279,6 +279,20 @@
           ("^date: \\(.+\\)" (1 'change-log-date))
             ("^summary:[ \t]+\\(.+\\)" (1 'log-view-message)))))))

+(defvar log-edit-extra-flags)
+(defvar log-edit-before-checkin-process)
+
+(define-derived-mode vc-hg-log-edit-mode log-edit-mode "Hg-log-edit"
+  "Mode for editing Hg commit logs.
+If a line like:
+Author: NAME
+is present in the log, it is removed, and
+--author NAME
+is passed to the hg commit command."
+  (set (make-local-variable 'log-edit-extra-flags) nil)
+  (set (make-local-variable 'log-edit-before-checkin-process)
+       '(("^Author:[ \t]+\\(.*\\)[ \t]*$" . (list "--user" (match-string 1))))))
+
 (defun vc-hg-diff (files &optional oldvers newvers buffer)
   "Get a difference report using hg between two revisions of FILES."
   (let* ((firstfile (car files))
@@ -401,10 +415,10 @@
 ;;   "Unregister FILE from hg."
 ;;   (vc-hg-command nil nil file "remove"))

-(defun vc-hg-checkin (files rev comment)
+(defun vc-hg-checkin (files rev comment &optional extra-args)
   "Hg-specific version of `vc-backend-checkin'.
 REV is ignored."
-  (vc-hg-command nil 0 files  "commit" "-m" comment))
+  (apply 'vc-hg-command nil 0 files  (append (list "commit" "-m" comment) extra-args)))

 (defun vc-hg-find-revision (file rev buffer)
   (let ((coding-system-for-read 'binary)
--- a/lisp/vc-hooks.el	Thu Mar 18 12:56:23 2010 +0100
+++ b/lisp/vc-hooks.el	Mon Mar 22 08:34:25 2010 +0100
@@ -84,13 +84,6 @@
   :type '(repeat string)
   :group 'vc)

-(defcustom vc-path nil
-  "List of extra directories to search for version control commands."
-  :type '(repeat directory)
-  :group 'vc)
-
-(make-obsolete-variable 'vc-path "should not be necessary anymore." "23.2")
-
 (defcustom vc-make-backup-files nil
   "If non-nil, backups of registered files are made as with other files.
 If nil (the default), files covered by version control don't get backups."
--- a/lisp/vc-mtn.el	Thu Mar 18 12:56:23 2010 +0100
+++ b/lisp/vc-mtn.el	Mon Mar 22 08:34:25 2010 +0100
@@ -172,7 +172,7 @@
 (defun vc-mtn-responsible-p (file) (vc-mtn-root file))
 (defun vc-mtn-could-register (file) (vc-mtn-root file))

-(defun vc-mtn-checkin (files rev comment)
+(defun vc-mtn-checkin (files rev comment  &optional extra-args-ignored)
   (vc-mtn-command nil 0 files "commit" "-m" comment))

 (defun vc-mtn-find-revision (file rev buffer)
--- a/lisp/vc-rcs.el	Thu Mar 18 12:56:23 2010 +0100
+++ b/lisp/vc-rcs.el	Mon Mar 22 08:34:25 2010 +0100
@@ -348,7 +348,7 @@
 	 (yes-or-no-p (format "Directory %s is empty; remove it? " dir))
 	 (delete-directory dir))))

-(defun vc-rcs-checkin (files rev comment)
+(defun vc-rcs-checkin (files rev comment &optional extra-args-ignored)
   "RCS-specific version of `vc-backend-checkin'."
   (let ((switches (vc-switches 'RCS 'checkin)))
     ;; Now operate on the files
--- a/lisp/vc-sccs.el	Thu Mar 18 12:56:23 2010 +0100
+++ b/lisp/vc-sccs.el	Mon Mar 22 08:34:25 2010 +0100
@@ -235,7 +235,7 @@
       (stringp (vc-sccs-search-project-dir (or (file-name-directory file) "")
 					   (file-name-nondirectory file)))))

-(defun vc-sccs-checkin (files rev comment)
+(defun vc-sccs-checkin (files rev comment &optional extra-args-ignored)
   "SCCS-specific version of `vc-backend-checkin'."
   (dolist (file (vc-expand-dirs files))
     (apply 'vc-sccs-do-command nil 0 "delta" (vc-name file)
--- a/lisp/vc-svn.el	Thu Mar 18 12:56:23 2010 +0100
+++ b/lisp/vc-svn.el	Mon Mar 22 08:34:25 2010 +0100
@@ -282,7 +282,7 @@
   "Return non-nil if FILE could be registered in SVN.
 This is only possible if SVN is responsible for FILE's directory.")

-(defun vc-svn-checkin (files rev comment)
+(defun vc-svn-checkin (files rev comment &optional extra-args-ignored)
   "SVN-specific version of `vc-backend-checkin'."
   (if rev (error "Committing to a specific revision is unsupported in SVN"))
   (let ((status (apply
--- a/lisp/vc.el	Thu Mar 18 12:56:23 2010 +0100
+++ b/lisp/vc.el	Mon Mar 22 08:34:25 2010 +0100
@@ -261,7 +261,7 @@
 ;;   Unregister FILE from this backend.  This is only needed if this
 ;;   backend may be used as a "more local" backend for temporary editing.
 ;;
-;; * checkin (files rev comment)
+;; * checkin (files rev comment &optional extra-args)
 ;;
 ;;   Commit changes in FILES to this backend.  If REV is non-nil, that
 ;;   should become the new revision number (not all backends do
@@ -269,6 +269,7 @@
 ;;   implementation should pass the value of vc-checkin-switches to
 ;;   the backend command.  (Note: in older versions of VC, this
 ;;   command took a single file argument and not a list.)
+;;   EXTRA-ARGS should be passed to the backend command.
 ;;
 ;; * find-revision (file rev buffer)
 ;;
@@ -477,6 +478,12 @@
 ;;   Return the revision number that follows REV for FILE, or nil if no such
 ;;   revision exists.
 ;;
+;; - log-edit-mode ()
+;;
+;;   Turn on the mode used for editing the check in log.  This
+;;   defaults to `log-edit-mode'.  If changed, it should use a mode
+;;   derived from`log-edit-mode'.
+;;
 ;; - check-headers ()
 ;;
 ;;   Return non-nil if the current buffer contains any version headers.
@@ -1358,7 +1365,9 @@
     files rev comment initial-contents
     "Enter a change comment."
     "*VC-log*"
-    (lambda (files rev comment)
+    (lambda ()
+      (vc-call-backend backend 'log-edit-mode))
+    (lambda (files rev comment extra-flags)
       (message "Checking in %s..." (vc-delistify files))
       ;; "This log message intentionally left almost blank".
       ;; RCS 5.7 gripes about white-space-only comments too.
@@ -1369,7 +1378,7 @@
        ;; We used to change buffers to get local value of vc-checkin-switches,
        ;; but 'the' local buffer is not a well-defined concept for filesets.
        (progn
-	 (vc-call-backend backend 'checkin files rev comment)
+	 (vc-call-backend backend 'checkin files rev comment extra-flags)
 	 (mapc 'vc-delete-automatic-version-backups files))
        `((vc-state . up-to-date)
 	 (vc-checkout-time . ,(nth 5 (file-attributes file)))
@@ -1739,7 +1748,7 @@
    files rev oldcomment t
    "Enter a replacement change comment."
    "*VC-log*"
-   (lambda (files rev comment)
+   (lambda (files rev comment ignored)
      (vc-call-backend
       ;; Less of a kluge than it looks like; log-view mode only passes
       ;; this function a singleton list.  Arguments left in this form in
@@ -2424,6 +2433,8 @@

 (defalias 'vc-default-check-headers 'ignore)

+(defun vc-default-log-edit-mode (backend) (log-edit-mode))
+
 (defun vc-default-log-view-mode (backend) (log-view-mode))

 (defun vc-default-show-log-entry (backend rev)
--- a/src/ChangeLog	Thu Mar 18 12:56:23 2010 +0100
+++ b/src/ChangeLog	Mon Mar 22 08:34:25 2010 +0100
@@ -1,3 +1,99 @@
+2010-03-22  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* keyboard.c (Fset_input_interrupt_mode): Remove code depending on
+	NO_SOCK_SIGIO, not used anymore.
+
+2010-03-21  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* m/vax.h (BSD_SYSTEM, BSD4_2): Remove conditionals, we only
+	support vax on BSDs.
+
+	* m/ibmrs6000.h (ORDINARY_LINK): Move definition ...
+	* s/aix4-2.h (ORDINARY_LINK): ... here.
+
+2010-03-21  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* Makefile.in (abs_builddir): Define.
+	(bootstrap_exe): Use it.
+	(VPATH): Use $(srcdir) instead of @srcdir@.
+
+2010-03-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* Makefile.in (bootstrap_exe): Use an absolute name.
+
+2010-03-20  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	Remove support for old GNU/Linux using libc version 5.
+	* m/alpha.h (LINUX_SBRK_BUG): Remove definition.
+	* emacs.c (main): Remove code depending on LINUX_SBRK_BUG.
+
+	Consolidate redundant definitions in s/bsd-common.h.
+	* s/bsd-common.h (BSD4_2, TABDLY, TAB3, HAVE_TERMIOS, NO_TERMIO)
+	(LIBS_DEBUG, SYSV_SYSTEM_DIR, UNEXEC, NARROWPROTO, BSD_PGRPS)
+	(LDAV_SYMBOL, KERNEL_FILE): Define (or undefine) here instead of
+	doing it in all files that include this one.
+	* s/gnu.h (BSD4_2, TABDLY, TAB3, HAVE_TERMIOS, NO_TERMIO)
+	(LIBS_DEBUG, SYSV_SYSTEM_DIR, UNEXEC, NARROWPROTO, BSD_PGRPS)
+	(LDAV_SYMBOL, KERNEL_FILE): Remove.
+	* s/freebsd.h (BSD4_2, TABDLY, TAB3, HAVE_TERMIOS, NO_TERMIO)
+	(LIBS_DEBUG, SYSV_SYSTEM_DIR, UNEXEC, NARROWPROTO, BSD_PGRPS)
+	(LDAV_SYMBOL, KERNEL_FILE): Remove.
+	* s/netbsd.h (BSD4_2, TABDLY, TAB3, HAVE_TERMIOS, NO_TERMIO)
+	(LIBS_DEBUG, SYSV_SYSTEM_DIR, UNEXEC, NARROWPROTO, BSD_PGRPS)
+	(LDAV_SYMBOL, KERNEL_FILE): Remove.
+
+	Consolidate redundant definitions.
+	* s/usg5-4.h (sigsetmask, PTY_TTY_NAME_SPRINTF): Do not define,
+	it's undefined in all files that include this one.
+	(POSIX_SIGNALS): Define here instead of doing it in all files that
+	include this one.
+	* s/irix6-5.h (sigsetmask, PTY_TTY_NAME_SPRINTF): Do not undef.
+	(POSIX_SIGNALS): Do not define.
+	* s/sol2-6.h (sigsetmask, PTY_TTY_NAME_SPRINTF): Do not undef.
+	(POSIX_SIGNALS): Do not define.
+	* s/unixware.h (sigsetmask, PTY_TTY_NAME_SPRINTF): Do not undef.
+	(POSIX_SIGNALS): Do not define.
+
+	Remove support for old UNIX System V systems.
+	* s/unixware.h: Add the contents of s/usg-5-4-2.h.
+	* s/usg-5-4-2.h: Remove.
+
+	Remove support for Solaris on PPC and for old versions.
+	* s/sol2-6.h: Add the contents of s/sol-2.3.h, s/sol-2.4.h, s/sol-2.5.h.
+	(LD_SWITCH_SYSTEM, USE_MMAP_FOR_BUFFERS): Remove #defines/#undef
+	that cancel each other.
+	* s/sol2-3.h:
+	* s/sol2-4.h:
+	* s/sol2-5.h: Remove.
+	* m/ibmrs6000.h: Remove code for USG5_4, this file is only used on AIX.
+	(NO_REMAP): Remove, unused.
+	(UNEXEC): Move definition ...
+	* s/aix4-2.h (UNEXEC): ... here.
+
+	* s/openbsd.h: Remove support for non-ELF and for systems that do
+	not support shared libraries.
+	* s/netbsd.h:
+	* s/freebsd.h: Likewise.
+
+2010-03-20  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	Remove non-working support for lynxos 3.0.
+	* s/lynxos.h: Remove file.
+
+	* unexec.c (unexec, adjust_lnnoptrs): Do not depend on
+	COFF_BSD_SYMBOLS, nothing defines it anymore.
+
+2010-03-20  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	Remove obsolete uses of HAVE_SHM.
+	* emacs.c (standard_args):
+	(Fdump_emacs):
+	(syms_of_emacs): Remove code depending on HAVE_SHM.
+
+	* alloc.c: Remove HAVE_SHM dependent definition.
+
+	* Makefile.in (RUN_TEMACS): Do not depend on HAVE_SHM.
+
 2010-03-18  Glenn Morris  <rgm@gnu.org>

 	* emacs.c (USAGE4): Hard-code bug address.
--- a/src/Makefile.in	Thu Mar 18 12:56:23 2010 +0100
+++ b/src/Makefile.in	Mon Mar 22 08:34:25 2010 +0100
@@ -33,16 +33,17 @@

 # Here are the things that we expect ../configure to edit.
 # We use $(srcdir) explicitly in dependencies so as not to depend on VPATH.
-srcdir=@srcdir@
-VPATH=@srcdir@
-CC=@CC@
-CPP=@CPP@
-CFLAGS=@CFLAGS@
-CPPFLAGS=@CPPFLAGS@
-LDFLAGS=@LDFLAGS@
-LN_S=@LN_S@
-EXEEXT=@EXEEXT@
-version=@version@
+srcdir = @srcdir@
+abs_builddir = @abs_builddir@
+VPATH = $(srcdir)
+CC = @CC@
+CPP = @CPP@
+CFLAGS = @CFLAGS@
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LN_S = @LN_S@
+EXEEXT = @EXEEXT@
+version = @version@
 # Substitute an assignment for the MAKE variable, because
 # BSD doesn't have it as a default.
 @SET_MAKE@
@@ -63,7 +64,7 @@
 S_FILE = ${srcdir}/@opsysfile@
 config_h = config.h $(M_FILE) $(S_FILE)

-bootstrap_exe = ../src/bootstrap-emacs${EXEEXT}
+bootstrap_exe = ${abs_builddir}/bootstrap-emacs${EXEEXT}

 OTHER_FILES = @OTHER_FILES@

@@ -853,11 +854,7 @@
    @FREETYPE_LIBS@ @FONTCONFIG_LIBS@ @LIBOTF_LIBS@ @M17N_FLT_LIBS@ \
    $(GNULIB_VAR) LIB_MATH LIB_STANDARD $(GNULIB_VAR)

-#ifdef HAVE_SHM
-RUN_TEMACS = `/bin/pwd`/temacs -nl
-#else
 RUN_TEMACS = `/bin/pwd`/temacs
-#endif

 all: emacs${EXEEXT} $(OTHER_FILES)
--- a/src/alloc.c	Thu Mar 18 12:56:23 2010 +0100
+++ b/src/alloc.c	Mon Mar 22 08:34:25 2010 +0100
@@ -257,8 +257,6 @@

 Lisp_Object Vmemory_full;

-#ifndef HAVE_SHM
-
 /* Initialize it to a nonzero value to force it into data space
    (rather than bss space).  That way unexec will remap it into text
    space (pure), on some systems.  We have not implemented the
@@ -268,13 +266,6 @@
 EMACS_INT pure[(PURESIZE + sizeof (EMACS_INT) - 1) / sizeof (EMACS_INT)] = {1,};
 #define PUREBEG (char *) pure

-#else /* HAVE_SHM */
-
-#define pure PURE_SEG_BITS   /* Use shared memory segment */
-#define PUREBEG (char *)PURE_SEG_BITS
-
-#endif /* HAVE_SHM */
-
 /* Pointer to the pure area, and its size.  */

 static char *purebeg;
--- a/src/config.in	Thu Mar 18 12:56:23 2010 +0100
+++ b/src/config.in	Mon Mar 22 08:34:25 2010 +0100
@@ -264,8 +264,7 @@
 /* Define to 1 if you have the `get_current_dir_name' function. */
 #undef HAVE_GET_CURRENT_DIR_NAME

-/* Define to 1 if you have a gif library (default -lgif; otherwise specify
-   with LIBGIF). */
+/* Define to 1 if you have a gif (or ungif) library. */
 #undef HAVE_GIF

 /* Define to 1 if you have the gpm library (-lgpm). */
@@ -319,10 +318,10 @@
 /* Define to 1 if you have the <kerberos/krb.h> header file. */
 #undef HAVE_KERBEROS_KRB_H

-/* Define to 1 if `krb5_error' is a member of `e_text'. */
+/* Define to 1 if `e_text' is member of `krb5_error'. */
 #undef HAVE_KRB5_ERROR_E_TEXT

-/* Define to 1 if `krb5_error' is a member of `text'. */
+/* Define to 1 if `text' is member of `krb5_error'. */
 #undef HAVE_KRB5_ERROR_TEXT

 /* Define to 1 if you have the <krb5.h> header file. */
@@ -616,25 +615,25 @@
 /* Define to 1 if you have the `strsignal' function. */
 #undef HAVE_STRSIGNAL

-/* Define to 1 if `struct ifreq' is a member of `ifr_addr'. */
+/* Define to 1 if `ifr_addr' is member of `struct ifreq'. */
 #undef HAVE_STRUCT_IFREQ_IFR_ADDR

-/* Define to 1 if `struct ifreq' is a member of `ifr_broadaddr'. */
+/* Define to 1 if `ifr_broadaddr' is member of `struct ifreq'. */
 #undef HAVE_STRUCT_IFREQ_IFR_BROADADDR

-/* Define to 1 if `struct ifreq' is a member of `ifr_flags'. */
+/* Define to 1 if `ifr_flags' is member of `struct ifreq'. */
 #undef HAVE_STRUCT_IFREQ_IFR_FLAGS

-/* Define to 1 if `struct ifreq' is a member of `ifr_hwaddr'. */
+/* Define to 1 if `ifr_hwaddr' is member of `struct ifreq'. */
 #undef HAVE_STRUCT_IFREQ_IFR_HWADDR

-/* Define to 1 if `struct ifreq' is a member of `ifr_netmask'. */
+/* Define to 1 if `ifr_netmask' is member of `struct ifreq'. */
 #undef HAVE_STRUCT_IFREQ_IFR_NETMASK

-/* Define to 1 if `struct nlist' is a member of `n_un.n_name'. */
+/* Define to 1 if `n_un.n_name' is member of `struct nlist'. */
 #undef HAVE_STRUCT_NLIST_N_UN_N_NAME

-/* Define to 1 if `struct tm' is a member of `tm_zone'. */
+/* Define to 1 if `tm_zone' is member of `struct tm'. */
 #undef HAVE_STRUCT_TM_TM_ZONE

 /* Define to 1 if `struct utimbuf' is declared by <utime.h>. */
@@ -818,12 +817,18 @@
    Solaris, for example). */
 #undef LD_SWITCH_X_SITE_AUX

-/* Compiler option to link with the gif library (if not -lgif). */
-#undef LIBGIF
-
 /* Define to 1 if localtime caches TZ. */
 #undef LOCALTIME_CACHE

+/* String giving fallback POP mail host. */
+#undef MAILHOST
+
+/* Define to unlink, rather than empty, mail spool after reading. */
+#undef MAIL_UNLINK_SPOOL
+
+/* Define to support MMDF mailboxes in movemail. */
+#undef MAIL_USE_MMDF
+
 /* Define to support POP mail retrieval. */
 #undef MAIL_USE_POP

@@ -855,9 +860,6 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME

-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION

@@ -917,28 +919,6 @@
 /* Define to 1 if using the Motif X toolkit. */
 #undef USE_MOTIF

-/* Enable extensions on AIX 3, Interix.  */
-#ifndef _ALL_SOURCE
-# undef _ALL_SOURCE
-#endif
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# undef _GNU_SOURCE
-#endif
-/* Enable threading extensions on Solaris.  */
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-/* Enable extensions on HP NonStop.  */
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-
-
 /* Define to 1 if we should use toolkit scroll bars. */
 #undef USE_TOOLKIT_SCROLL_BARS

@@ -974,6 +954,28 @@
 /* Define to 1 if you need to in order for `stat' and other things to work. */
 #undef _POSIX_SOURCE

+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
 /* Define to rpl_ if the getopt replacement functions and variables should be
    used. */
 #undef __GETOPT_PREFIX
--- a/src/emacs.c	Thu Mar 18 12:56:23 2010 +0100
+++ b/src/emacs.c	Mon Mar 22 08:34:25 2010 +0100
@@ -790,11 +790,6 @@
       heap_bss_diff = (char *)my_heap_start - max (my_endbss, my_endbss_static);
     }

-#ifdef LINUX_SBRK_BUG
-  /* This is only used GNU/LINUX running on alpha when using libc5 */
-  __sbrk (1);
-#endif
-
 #ifdef RUN_TIME_REMAP
   if (initialized)
     run_time_remap (argv[0]);
@@ -1816,9 +1811,6 @@
 const struct standard_args standard_args[] =
 {
   { "-version", "--version", 150, 0 },
-#ifdef HAVE_SHM
-  { "-nl", "--no-shared-memory", 140, 0 },
-#endif
   { "-t", "--terminal", 120, 1 },
   { "-nw", "--no-window-system", 110, 0 },
   { "-nw", "--no-windows", 110, 0 },
@@ -2210,39 +2202,6 @@

 #ifndef CANNOT_DUMP

-#ifdef HAVE_SHM
-
-DEFUN ("dump-emacs-data", Fdump_emacs_data, Sdump_emacs_data, 1, 1, 0,
-       doc: /* Dump current state of Emacs into data file FILENAME.
-This function exists on systems that use HAVE_SHM.  */)
-     (filename)
-     Lisp_Object filename;
-{
-  extern char my_edata[];
-  Lisp_Object tem;
-
-  check_pure_size ();
-  CHECK_STRING (filename);
-  filename = Fexpand_file_name (filename, Qnil);
-
-  tem = Vpurify_flag;
-  Vpurify_flag = Qnil;
-
-  fflush (stdout);
-  /* Tell malloc where start of impure now is.  */
-  /* Also arrange for warnings when nearly out of space.  */
-#ifndef SYSTEM_MALLOC
-  memory_warnings (my_edata, malloc_warning);
-#endif
-  map_out_data (SDATA (filename));
-
-  Vpurify_flag = tem;
-
-  return Qnil;
-}
-
-#else /* not HAVE_SHM */
-
 DEFUN ("dump-emacs", Fdump_emacs, Sdump_emacs, 2, 2, 0,
        doc: /* Dump current state of Emacs into executable file FILENAME.
 Take symbols from SYMFILE (presumably the file you executed to run Emacs).
@@ -2339,8 +2298,6 @@
   return unbind_to (count, Qnil);
 }

-#endif /* not HAVE_SHM */
-
 #endif /* not CANNOT_DUMP */

 #if HAVE_SETLOCALE
@@ -2517,12 +2474,8 @@
   staticpro (&Qfile_name_handler_alist);

 #ifndef CANNOT_DUMP
-#ifdef HAVE_SHM
-  defsubr (&Sdump_emacs_data);
-#else
   defsubr (&Sdump_emacs);
 #endif
-#endif

   defsubr (&Skill_emacs);
--- a/src/keyboard.c	Thu Mar 18 12:56:23 2010 +0100
+++ b/src/keyboard.c	Mon Mar 22 08:34:25 2010 +0100
@@ -11304,11 +11304,7 @@
     {
       /* When using X, don't give the user a real choice,
 	 because we haven't implemented the mechanisms to support it.  */
-#ifdef NO_SOCK_SIGIO
-      new_interrupt_input = 0;
-#else /* not NO_SOCK_SIGIO */
       new_interrupt_input = 1;
-#endif /* NO_SOCK_SIGIO */
     }
   else
 #endif /* HAVE_X_WINDOWS */
--- a/src/m/alpha.h	Thu Mar 18 12:56:23 2010 +0100
+++ b/src/m/alpha.h	Mon Mar 22 08:34:25 2010 +0100
@@ -116,11 +116,6 @@

 #endif /* __ELF__ */

-#if defined (GNU_LINUX) && __GNU_LIBRARY__ - 0 < 6
-/* This controls a conditional in main.  */
-#define LINUX_SBRK_BUG
-#endif
-
 /* On the Alpha it's best to avoid including TERMIO since struct
    termio and struct termios are mutually incompatible.  */
 #define NO_TERMIO
--- a/src/m/ibmrs6000.h	Thu Mar 18 12:56:23 2010 +0100
+++ b/src/m/ibmrs6000.h	Mon Mar 22 08:34:25 2010 +0100
@@ -32,19 +32,10 @@

 #define IBMR2AIX

-#ifndef UNEXEC
-#define UNEXEC unexaix.o
-#endif
-
-/* Define addresses, macros, change some setup for dump */
-
-#define NO_REMAP
-
 /* The data segment in this machine always starts at address 0x20000000.
    An address of data cannot be stored correctly in a Lisp object;
    we always lose the high bits.  We must tell XPNTR to add them back.  */

-#ifndef USG5_4
 #define TEXT_START 0x10000000
 #define DATA_START 0x20000000
 #define WORDS_BIG_ENDIAN
@@ -75,12 +66,6 @@
 #define LIBS_MACHINE -lrts -lIM -liconv
 #endif

-#else /* USG5_4 */
-#undef WORDS_BIG_ENDIAN
-#define DATA_SEG_BITS 0
-#define LIBS_MACHINE
-#endif /* USG5_4 */
-
 #undef ADDR_CORRECT
 #define ADDR_CORRECT(x) ((int)(x))

@@ -96,7 +81,5 @@
 #define BROKEN_SIGPTY
 #define BROKEN_SIGPOLL

-#define ORDINARY_LINK
-
 /* arch-tag: 028318ee-a7ae-4a08-804d-cc1e6588d003
    (do not change this comment) */
--- a/src/m/vax.h	Thu Mar 18 12:56:23 2010 +0100
+++ b/src/m/vax.h	Mon Mar 22 08:34:25 2010 +0100
@@ -38,7 +38,6 @@

 #define CRT0_DUMMIES

-#ifdef BSD_SYSTEM
 /* USG systems I know of running on Vaxes do not actually
    support the load average, so disable it for them.  */

@@ -50,11 +49,7 @@

 #define LOAD_AVE_CVT(x) ((int) ((x) * 100.0))

-#endif /* BSD_SYSTEM */
-
-#ifdef BSD4_2
 #define HAVE_FTIME
-#endif

 /* arch-tag: 508bdf7a-01a0-4ce0-8eba-0704d0df55a0
    (do not change this comment) */
--- a/src/s/aix4-2.h	Thu Mar 18 12:56:23 2010 +0100
+++ b/src/s/aix4-2.h	Mon Mar 22 08:34:25 2010 +0100
@@ -168,5 +168,9 @@
 */
 #define BROKEN_GET_CURRENT_DIR_NAME 1

+#define UNEXEC unexaix.o
+
+#define ORDINARY_LINK
+
 /* arch-tag: 38fe75ea-6aef-42bd-8449-bc34d921a562
    (do not change this comment) */
--- a/src/s/bsd-common.h	Thu Mar 18 12:56:23 2010 +0100
+++ b/src/s/bsd-common.h	Mon Mar 22 08:34:25 2010 +0100
@@ -33,6 +33,36 @@
 #define BSD_SYSTEM 43
 #endif /* BSD_SYSTEM */

+/* For mem-limits.h.  */
+#define BSD4_2
+
+#define TABDLY OXTABS
+#define TAB3 OXTABS
+
+/* These aren't needed, since we have getloadavg.  */
+#undef KERNEL_FILE
+#undef LDAV_SYMBOL
+
+#define HAVE_TERMIOS
+#define NO_TERMIO
+
+#define LIBS_DEBUG
+
+#define SYSV_SYSTEM_DIR
+
+/* POSIX-style pgrp behavior.  */
+#undef BSD_PGRPS
+
+#define UNEXEC unexelf.o
+
+/* If the system's imake configuration file defines `NeedWidePrototypes'
+   as `NO', we must define NARROWPROTO manually.  Such a define is
+   generated in the Makefile generated by `xmkmf'.  If we don't
+   define NARROWPROTO, we will see the wrong function prototypes
+   for X functions taking float or double parameters.  */
+
+#define NARROWPROTO 1
+
 /* SYSTEM_TYPE should indicate the kind of system you are using.
  It sets the Lisp variable system-type.  */
--- a/src/s/freebsd.h	Thu Mar 18 12:56:23 2010 +0100
+++ b/src/s/freebsd.h	Mon Mar 22 08:34:25 2010 +0100
@@ -23,39 +23,14 @@
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */

-/* Get the correct __FreeBSD_version, even if this is before that was
-   defined. */
-#ifndef __FreeBSD_version
-#ifndef __FreeBSD__
-#define __FreeBSD_version 199401
-#elif __FreeBSD__ == 1
-#define __FreeBSD_version 199405
-#else
-#include <osreldate.h>
-#endif
-#endif /* !defined __FreeBSD_version */
-
-/* '__FreeBSD__' is defined by the preprocessor on FreeBSD-1.1 and up.
-   Earlier versions do not have shared libraries, so inhibit them.
-   You can inhibit them on newer systems if you wish
-   by defining NO_SHARED_LIBS.  */
-#ifndef __FreeBSD__
-#define NO_SHARED_LIBS
-#endif
-
 /* Get most of the stuff from bsd-common */
 #include "bsd-common.h"

 /* For mem-limits.h. */
 #define BSD4_2

-/* These aren't needed, since we have getloadavg.  */
-#undef KERNEL_FILE
-#undef LDAV_SYMBOL
-
 #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)

-#define LIBS_DEBUG
 #define LIBS_SYSTEM -lutil
 #if __FreeBSD_version < 400000
 #define LIBS_TERMCAP -ltermcap
@@ -64,44 +39,19 @@
 #define LIBS_TERMCAP -lncurses
 #endif

-#define SYSV_SYSTEM_DIR
-
-/* freebsd has POSIX-style pgrp behavior. */
-#undef BSD_PGRPS
-
-#ifdef __ELF__
-
 /* Let `ld' find image libs and similar things in /usr/local/lib.  The
    system compiler, GCC, has apparently been modified to not look
    there, contrary to what a stock GCC would do.  */

 #define LD_SWITCH_SYSTEM  -L/usr/local/lib
 #define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o /usr/lib/crtbegin.o
-#define UNEXEC unexelf.o
 #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o /usr/lib/crtn.o
 #undef LIB_GCC
 #define LIB_GCC

-#else /* not __ELF__ */
-
-#ifdef NO_SHARED_LIBS
-#ifdef __FreeBSD__  /* shared libs are available, but the user prefers
-                     not to use them.  */
-#define LD_SWITCH_SYSTEM -Bstatic -L/usr/local/lib
-#endif /* __FreeBSD__ */
-#endif /* NO_SHARED_LIBS */
-
-#endif /* not __ELF__ */
-
 #define HAVE_GETLOADAVG 1
-#define HAVE_TERMIOS
-#define NO_TERMIO
 #define DECLARE_GETPWUID_WITH_UID_T

-/* freebsd uses OXTABS instead of the expected TAB3. */
-#define TABDLY OXTABS
-#define TAB3 OXTABS
-
 /* this silences a few compilation warnings */
 #undef BSD_SYSTEM
 #if __FreeBSD__ == 1
@@ -117,14 +67,6 @@
    ioctl TIOCSCTTY.  */
 #define DONT_REOPEN_PTY

-/* If the system's imake configuration file defines `NeedWidePrototypes'
-   as `NO', we must define NARROWPROTO manually.  Such a define is
-   generated in the Makefile generated by `xmkmf'.  If we don't
-   define NARROWPROTO, we will see the wrong function prototypes
-   for X functions taking float or double parameters.  */
-
-#define NARROWPROTO 1
-
 /* The following is needed to make `configure' find Xpm, Xaw3d and
    image include and library files if using /usr/bin/gcc.  That
    compiler seems to be modified to not find headers in
--- a/src/s/gnu.h	Thu Mar 18 12:56:23 2010 +0100
+++ b/src/s/gnu.h	Mon Mar 22 08:34:25 2010 +0100
@@ -21,27 +21,13 @@
 /* Get most of the stuff from bsd-common */
 #include "bsd-common.h"

-/* For mem-limits.h.  */
-#define BSD4_2
-
 #undef SYSTEM_TYPE
 #define SYSTEM_TYPE "gnu"

 #undef NLIST_STRUCT
-#undef KERNEL_FILE
-#undef LDAV_SYMBOL

 #define SIGNALS_VIA_CHARACTERS

-#define HAVE_TERMIOS
-#define NO_TERMIO
-
-#define LIBS_DEBUG
-
-/* XXX emacs should not expect TAB3 to be defined.  */
-#define TABDLY OXTABS
-#define TAB3 OXTABS
-
 /* Tell Emacs that we are a terminfo based system; disable the use
    of local termcap.  (GNU uses ncurses.) */
 #ifdef HAVE_LIBNCURSES
@@ -49,11 +35,6 @@
 #define LIBS_TERMCAP -lncurses
 #endif

-#define SYSV_SYSTEM_DIR
-
-/* GNU has POSIX-style pgrp behavior.  */
-#undef BSD_PGRPS
-
 /* Use mmap directly for allocating larger buffers.  */
 #ifdef DOUG_LEA_MALLOC
 #undef REL_ALLOC
@@ -63,17 +44,12 @@
 #define ORDINARY_LINK
 #define DATA_START ({ extern int data_start; (char *) &data_start; })

-/* GNU now always uses the ELF format.  */
-#define UNEXEC unexelf.o
-
 /* Some losing code fails to include this and then assumes
    that because it is braindead that O_RDONLY==0.  */
 #ifndef NOT_C_CODE
 #include <fcntl.h>
 #endif

-#define NARROWPROTO 1
-
 #ifdef emacs
 #include <stdio.h>  /* Get the definition of _IO_STDIO_H.  */
 #if defined(_IO_STDIO_H) || defined(_STDIO_USES_IOSTREAM)
--- a/src/s/irix6-5.h	Thu Mar 18 12:56:23 2010 +0100
+++ b/src/s/irix6-5.h	Mon Mar 22 08:34:25 2010 +0100
@@ -22,7 +22,6 @@
 #define IRIX6_5			/* used in m/iris4d */
 #include "usg5-4.h"

-#undef sigsetmask  /* use sys_sigsetmask */
 #undef _longjmp /* use system versions, not conservative aliases */
 #undef _setjmp

@@ -46,9 +45,6 @@
 #define SIGNALS_VIA_CHARACTERS

 /* No need to use sprintf to get the tty name--we get that from _getpty.  */
-#ifdef PTY_TTY_NAME_SPRINTF
-#undef PTY_TTY_NAME_SPRINTF
-#endif
 #define PTY_TTY_NAME_SPRINTF
 /* No need to get the pty name at all.  */
 #ifdef PTY_NAME_SPRINTF
@@ -80,10 +76,6 @@
   strcpy (pty_name, name);				    \
 }

-/* Since we use POSIX constructs in PTY_OPEN, we must force POSIX
-   throughout. */
-#define POSIX_SIGNALS
-
 /* Ulimit(UL_GMEMLIM) is busted...  */
 #define ULIMIT_BREAK_VALUE 0x14000000
--- a/src/s/lynxos.h	Thu Mar 18 12:56:23 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-/* Definitions file for GNU Emacs running on LynxOS-3.0.1
-   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009, 2010 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/>.  */
-
-/* LynxOS is almost a bsd 4.2 system */
-#include "s/bsd4-2.h"
-
-/* SYSTEM_TYPE should indicate the kind of system you are using.
- It sets the Lisp variable system-type.  */
-
-/* override the bsd definition */
-#undef SYSTEM_TYPE
-#define SYSTEM_TYPE "lynxos 3.0.1"
-
-/* System stuff redefined from bsd4-2.h */
-#undef KERNEL_FILE
-#define KERNEL_FILE "/lynx.os"
-#undef LDAV_SYMBOL
-#define LDAV_SYMBOL "load_average"
-
-/* misc defines */
-#define LNOFLSH 0
-
-/* COFF related */
-#define COFF
-#define NO_REMAP
-#define SECTION_ALIGNMENT 0x1
-#define COFF_BSD_SYMBOLS
-#define etext __etext
-#define edata __edata
-#define _start __text
-
-/* Compilation options */
-#define LIBS_DEBUG
-#define ORDINARY_LINK
-/* we define following to prevent all the lynxos's stupid compilation */
-/* warning messages */
-#define C_SWITCH_SYSTEM -D__NO_INCLUDE_WARN__
-#define LIBS_SYSTEM -lbsd
-
-/* arch-tag: fbc81ec9-1c45-416b-a368-799ae7c094a1
-   (do not change this comment) */
--- a/src/s/netbsd.h	Thu Mar 18 12:56:23 2010 +0100
+++ b/src/s/netbsd.h	Mon Mar 22 08:34:25 2010 +0100
@@ -22,44 +22,20 @@
 /* Get most of the stuff from bsd-common */
 #include "bsd-common.h"

-#if defined (__alpha__) && !defined (__ELF__)
-#define NO_SHARED_LIBS
-#endif
-
-/* For mem-limits.h.  */
-#define BSD4_2
-
-#undef KERNEL_FILE
-#undef LDAV_SYMBOL
 #define HAVE_GETLOADAVG 1

 #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)

-/* netbsd uses OXTABS instead of the expected TAB3.  */
-#define TABDLY OXTABS
-#define TAB3 OXTABS
-
-#define HAVE_TERMIOS
-#define NO_TERMIO
-
-#define LIBS_DEBUG
 /* -lutil is not needed for NetBSD >0.9.  */
 /* #define LIBS_SYSTEM -lutil */
 #define LIBS_TERMCAP -ltermcap

 #define NEED_ERRNO
-#define SYSV_SYSTEM_DIR

-/* Netbsd has POSIX-style pgrp behavior.  */
-#undef BSD_PGRPS
-
-#if !defined (NO_SHARED_LIBS) && defined (__ELF__)
 #define START_FILES pre-crt0.o /usr/lib/crt0.o START_FILES_1 /usr/lib/crtbegin.o
-#define UNEXEC unexelf.o
 #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o END_FILES_1
 #undef LIB_GCC
 #define LIB_GCC
-#endif

 #ifdef HAVE_CRTIN
 #define START_FILES_1 /usr/lib/crti.o
@@ -71,7 +47,6 @@

 #define AMPERSAND_FULL_NAME

-#ifdef __ELF__
 /* Here is how to find X Windows.  LD_SWITCH_X_SITE_AUX gives an -R option
    says where to find X windows at run time.  We convert it to a -rpath option
    which is what OSF1 uses.  */
@@ -92,8 +67,6 @@

 #define LD_SWITCH_SYSTEM_TEMACS -Wl,-z,nocombreloc

-#endif /* __ELF__ */
-
 /* On post 1.3 releases of NetBSD, gcc -nostdlib also clears
    the library search parth, i.e. it won't search /usr/lib
    for libc and friends. Using -nostartfiles instead avoids
@@ -101,8 +74,6 @@

 #define LINKER $(CC) -nostartfiles

-#define NARROWPROTO 1
-
 #define DEFAULT_SOUND_DEVICE "/dev/audio"

 /* Greg A. Woods <woods@weird.com> says we must include signal.h
--- a/src/s/openbsd.h	Thu Mar 18 12:56:23 2010 +0100
+++ b/src/s/openbsd.h	Mon Mar 22 08:34:25 2010 +0100
@@ -19,7 +19,6 @@

 #undef LD_SWITCH_SYSTEM_TEMACS
 #undef LD_SWITCH_SYSTEM
-#ifdef __ELF__

   /*  Han Boetes <han@mijncomputer.nl> says this
       is necessary,  otherwise Emacs dumps core on elf systems.  */
@@ -29,12 +28,5 @@
    default.  */
 #define LD_SWITCH_X_DEFAULT -L/usr/local/lib

-#else
-
-#define LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_tmp
-#define LD_SWITCH_X_DEFAULT -L/usr/local/lib
-
-#endif
-
 /* arch-tag: 7e3f65ca-3f48-4237-933f-2b208b21e8e2
    (do not change this comment) */
--- a/src/s/sol2-3.h	Thu Mar 18 12:56:23 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,98 +0,0 @@
-/* Definitions file for GNU Emacs running on Solaris 2.3.
-
-   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009, 2010  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/>.  */
-
-#include "usg5-4.h"
-
-#define SOLARIS2
-
-/* This triggers a conditional in xfaces.c.  */
-#define XOS_NEEDS_TIME_H
-
-#define POSIX
-
-#define LIBS_SYSTEM -lsocket -lnsl -lkstat
-
-/* Prefer kstat over kvm in getloadavg.c, kstat doesn't require root.
-   ghazi@caip.rutgers.edu, 7/21/97.  Don't redefine if already defined
-   (e.g., by config.h). */
-#ifndef HAVE_LIBKSTAT
-#define HAVE_LIBKSTAT
-#endif
-
-/* inoue@ainet.or.jp says Solaris has a bug related to X11R6-style
-   XIM support.  */
-
-#define INHIBIT_X11R6_XIM
-
-/* Must use the system's termcap, if we use any termcap.
-   It does special things.  */
-
-#ifndef TERMINFO
-#define LIBS_TERMCAP -ltermcap
-#endif
-
-#define USE_MMAP_FOR_BUFFERS 1
-
-#ifndef __GNUC__
-#define LD_SWITCH_SYSTEM -L /usr/ccs/lib LD_SWITCH_X_SITE_AUX
-/* eggert thinks all versions of SunPro C allowed this.  */
-#define C_DEBUG_SWITCH -g -O
-#else /* GCC */
-/* We use ./prefix-args because we don't know whether LD_SWITCH_X_SITE_AUX
-   has anything in it.  It can be empty.
-   This works ok in src.  Luckily lib-src does not use LD_SWITCH_SYSTEM.  */
-#define LD_SWITCH_SYSTEM -L /usr/ccs/lib \
- `./prefix-args -Xlinker LD_SWITCH_X_SITE_AUX`
-#endif /* GCC */
-
-/* Info from fnf@cygnus.com suggests this is appropriate.  */
-#define POSIX_SIGNALS
-
-/* We don't need the definition from usg5-4.h with POSIX_SIGNALS.  */
-#undef sigsetmask
-
-/* This is the same definition as in usg5-4.h, but with sigblock/sigunblock
-   rather than sighold/sigrelse, which appear to be BSD4.1 specific and won't
-   work if POSIX_SIGNALS is defined.  It may also be appropriate for SVR4.x
-   (x<2) but I'm not sure.   fnf@cygnus.com */
-/* This sets the name of the slave side of the PTY.  On SysVr4,
-   grantpt(3) forks a subprocess, so keep sigchld_handler() from
-   intercepting that death.  If any child but grantpt's should die
-   within, it should be caught after sigrelse(2). */
-
-#undef PTY_TTY_NAME_SPRINTF
-#define PTY_TTY_NAME_SPRINTF			\
-  {						\
-    char *ptsname (), *ptyname;			\
-						\
-    sigblock (sigmask (SIGCLD));		\
-    if (grantpt (fd) == -1)			\
-      { emacs_close (fd); return -1; }		\
-    sigunblock (sigmask (SIGCLD));		\
-    if (unlockpt (fd) == -1)			\
-      { emacs_close (fd); return -1; }		\
-    if (!(ptyname = ptsname (fd)))		\
-      { emacs_close (fd); return -1; }		\
-    strncpy (pty_name, ptyname, sizeof (pty_name)); \
-    pty_name[sizeof (pty_name) - 1] = 0;	\
-  }
-
-/* arch-tag: a8fe2e15-e517-49cb-a863-f346b80885fe
-   (do not change this comment) */
--- a/src/s/sol2-4.h	Thu Mar 18 12:56:23 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/* Handle Solaris 2.4.  */
-
-#include "sol2-3.h"
-
-#undef LD_SWITCH_SYSTEM
-
-/* `#ifdef USE_MOTIF' won't work here, since USE_MOTIF isn't defined yet.
-   Instead, dynamically check whether USE_MOTIF expands to something.  */
-#define NOT_USING_MOTIF { set x USE_MOTIF; test "$$2" = "USE_MOTIF"; }
-
-#ifndef __GNUC__
-#define LD_SWITCH_SYSTEM_TEMACS -L/usr/ccs/lib LD_SWITCH_X_SITE_AUX \
-  `NOT_USING_MOTIF || echo ' -R/usr/dt/lib'`
-#else /* GCC */
-/* We use ./prefix-args because we don't know whether LD_SWITCH_X_SITE_AUX
-   has anything in it.  It can be empty.
-   This works ok in temacs.  */
-#define LD_SWITCH_SYSTEM_TEMACS -L/usr/ccs/lib \
- `./prefix-args -Xlinker LD_SWITCH_X_SITE_AUX` \
-  `NOT_USING_MOTIF || echo ' -R/usr/dt/lib -L/usr/dt/lib'`
-
-/* Get rid of -traditional and let const really do its thing.  */
-#undef C_SWITCH_SYSTEM
-#undef const
-#endif /* GCC */
-
-/* Gregory Neil Shapiro <gshapiro@hhmi.org> reports the Motif header files
-   are in this directory on Solaris 2.4.  */
-#define C_SWITCH_X_SYSTEM -I/usr/dt/include
-
-/* arch-tag: 6f0de37b-cfda-427a-a5ae-b83ed54aaae7
-   (do not change this comment) */
--- a/src/s/sol2-5.h	Thu Mar 18 12:56:23 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/* Handle Solaris 2.5.  */
-
-#include "sol2-4.h"
-
-/* -lgen is needed for the regex and regcmp functions
-   which are used by Motif.  In the future we can try changing
-   regex.c to provide them in Emacs, but this is safer for now.  */
-#define LIB_MOTIF -lXm -lgen
-
-/* This is the only known way to avoid some crashes
-   that seem to relate to screwed up malloc data
-   after deleting a frame.  */
-/* rms: I think the problems using ralloc had to do with system
-   libraries that called the system malloc even if we linked in the
-   GNU malloc.  I could not see any way to fix the problem except to
-   have just one malloc and that had to be the system one.  */
-/* This is not always necessary.  Turned off at present for testers to
-   identify any problems with gmalloc more accurately.  */
-/* #define SYSTEM_MALLOC */
-
-/* There have problems reported with mmap at least on Solaris 2.6
-   and 2.7.  For simplicity, let's not use mmap for anything >= 2.5.
-   We can optimize this later.  */
-
-#undef USE_MMAP_FOR_BUFFERS
-
-/* Probably OK also on earlier versions.  */
-#define GC_SETJMP_WORKS 1
-#define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS
-
-/* arch-tag: 96d65526-21c9-4547-a797-2bd575c05be7
-   (do not change this comment) */
--- a/src/s/sol2-6.h	Thu Mar 18 12:56:23 2010 +0100
+++ b/src/s/sol2-6.h	Mon Mar 22 08:34:25 2010 +0100
@@ -1,11 +1,126 @@
-/* Handle Solaris 2.6.  */
+/* Definitions file for GNU Emacs running on Solaris 2.6.
+
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+                 2008, 2009, 2010  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/>.  */
+
+#include "usg5-4.h"
+
+#define SOLARIS2
+
+/* This triggers a conditional in xfaces.c.  */
+#define XOS_NEEDS_TIME_H

-#include "sol2-5.h"
+#define POSIX
+
+#define LIBS_SYSTEM -lsocket -lnsl -lkstat
+
+/* Prefer kstat over kvm in getloadavg.c, kstat doesn't require root.
+   ghazi@caip.rutgers.edu, 7/21/97.  Don't redefine if already defined
+   (e.g., by config.h). */
+#ifndef HAVE_LIBKSTAT
+#define HAVE_LIBKSTAT
+#endif
+
+/* inoue@ainet.or.jp says Solaris has a bug related to X11R6-style
+   XIM support.  */
+
+#define INHIBIT_X11R6_XIM
+
+/* Must use the system's termcap, if we use any termcap.
+   It does special things.  */
+
+#ifndef TERMINFO
+#define LIBS_TERMCAP -ltermcap
+#endif
+
+#ifndef __GNUC__
+/* eggert thinks all versions of SunPro C allowed this.  */
+#define C_DEBUG_SWITCH -g -O
+#endif /* GCC */

-#if 0 /* dldump does not handle all the extensions used by GNU ld.  */
-#undef UNEXEC
-#define UNEXEC unexsol.o
-#endif
+/* This is the same definition as in usg5-4.h, but with sigblock/sigunblock
+   rather than sighold/sigrelse, which appear to be BSD4.1 specific and won't
+   work if POSIX_SIGNALS is defined.  It may also be appropriate for SVR4.x
+   (x<2) but I'm not sure.   fnf@cygnus.com */
+/* This sets the name of the slave side of the PTY.  On SysVr4,
+   grantpt(3) forks a subprocess, so keep sigchld_handler() from
+   intercepting that death.  If any child but grantpt's should die
+   within, it should be caught after sigrelse(2). */
+
+#define PTY_TTY_NAME_SPRINTF			\
+  {						\
+    char *ptsname (), *ptyname;			\
+						\
+    sigblock (sigmask (SIGCLD));		\
+    if (grantpt (fd) == -1)			\
+      { emacs_close (fd); return -1; }		\
+    sigunblock (sigmask (SIGCLD));		\
+    if (unlockpt (fd) == -1)			\
+      { emacs_close (fd); return -1; }		\
+    if (!(ptyname = ptsname (fd)))		\
+      { emacs_close (fd); return -1; }		\
+    strncpy (pty_name, ptyname, sizeof (pty_name)); \
+    pty_name[sizeof (pty_name) - 1] = 0;	\
+  }
+
+/* `#ifdef USE_MOTIF' won't work here, since USE_MOTIF isn't defined yet.
+   Instead, dynamically check whether USE_MOTIF expands to something.  */
+#define NOT_USING_MOTIF { set x USE_MOTIF; test "$$2" = "USE_MOTIF"; }
+
+#ifndef __GNUC__
+#define LD_SWITCH_SYSTEM_TEMACS -L/usr/ccs/lib LD_SWITCH_X_SITE_AUX \
+  `NOT_USING_MOTIF || echo ' -R/usr/dt/lib'`
+#else /* GCC */
+/* We use ./prefix-args because we don't know whether LD_SWITCH_X_SITE_AUX
+   has anything in it.  It can be empty.
+   This works ok in temacs.  */
+#define LD_SWITCH_SYSTEM_TEMACS -L/usr/ccs/lib \
+ `./prefix-args -Xlinker LD_SWITCH_X_SITE_AUX` \
+  `NOT_USING_MOTIF || echo ' -R/usr/dt/lib -L/usr/dt/lib'`
+
+/* Get rid of -traditional and let const really do its thing.  */
+#undef C_SWITCH_SYSTEM
+#undef const
+#endif /* GCC */
+
+/* Gregory Neil Shapiro <gshapiro@hhmi.org> reports the Motif header files
+   are in this directory on Solaris 2.4.  */
+#define C_SWITCH_X_SYSTEM -I/usr/dt/include
+
+/* -lgen is needed for the regex and regcmp functions
+   which are used by Motif.  In the future we can try changing
+   regex.c to provide them in Emacs, but this is safer for now.  */
+#define LIB_MOTIF -lXm -lgen
+
+/* This is the only known way to avoid some crashes
+   that seem to relate to screwed up malloc data
+   after deleting a frame.  */
+/* rms: I think the problems using ralloc had to do with system
+   libraries that called the system malloc even if we linked in the
+   GNU malloc.  I could not see any way to fix the problem except to
+   have just one malloc and that had to be the system one.  */
+/* This is not always necessary.  Turned off at present for testers to
+   identify any problems with gmalloc more accurately.  */
+/* #define SYSTEM_MALLOC */
+
+/* Probably OK also on earlier versions.  */
+#define GC_SETJMP_WORKS 1
+#define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS

 /* arch-tag: 71ea3857-89dc-4395-9623-77964e6ed3ca
    (do not change this comment) */
--- a/src/s/unixware.h	Thu Mar 18 12:56:23 2010 +0100
+++ b/src/s/unixware.h	Mon Mar 22 08:34:25 2010 +0100
@@ -1,4 +1,71 @@
-#include "usg5-4-2.h"
+/* s/ file for Unixware.
+
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+                 2008, 2009, 2010  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/>.  */
+
+
+#include "usg5-4.h"
+
+/* fnf@cygnus.com says these exist.  */
+#define HAVE_TCATTR
+/* #define HAVE_GETWD  (appears to be buggy on SVR4.2) */
+#undef HAVE_GETWD
+
+#undef HAVE_SYSV_SIGPAUSE
+
+/* Motif needs -lgen.  */
+#define LIBS_SYSTEM -lsocket -lnsl -lelf -lgen
+
+/* This is the same definition as in usg5-4.h, but with sigblock/sigunblock
+   rather than sighold/sigrelse, which appear to be BSD4.1 specific and won't
+   work if POSIX_SIGNALS is defined.  It may also be appropriate for SVR4.x
+   (x<2) but I'm not sure.   fnf@cygnus.com */
+/* This sets the name of the slave side of the PTY.  On SysVr4,
+   grantpt(3) forks a subprocess, so keep sigchld_handler() from
+   intercepting that death.  If any child but grantpt's should die
+   within, it should be caught after sigrelse(2). */
+
+#define PTY_TTY_NAME_SPRINTF			\
+  {						\
+    char *ptsname(), *ptyname;			\
+						\
+    sigblock(sigmask(SIGCLD));			\
+    if (grantpt(fd) == -1)			\
+      fatal("could not grant slave pty");	\
+    sigunblock(sigmask(SIGCLD));		\
+    if (unlockpt(fd) == -1)			\
+      fatal("could not unlock slave pty");	\
+    if (!(ptyname = ptsname(fd)))		\
+      fatal ("could not enable slave pty");	\
+    strncpy(pty_name, ptyname, sizeof(pty_name)); \
+    pty_name[sizeof(pty_name) - 1] = 0;		\
+  }
+
+/* Use libw.a along with X11R6 Xt.  */
+#define NEED_LIBW
+
+/* ryanr@ellingtn.ftc.nrcs.usda.gov (Richard Anthony Ryan) says -lXimp
+   is needed in UNIX_SV ... 4.2 1.1.2.  */
+#define LIB_MOTIF -lXm -lXimp
+
+/* arch-tag: 9bbfcfc1-19be-45a1-9699-af57b87da2c6
+   (do not change this comment) */
+

 #define	PENDING_OUTPUT_COUNT(FILE) ((FILE)->__ptr - (FILE)->__base)
--- a/src/s/usg5-4-2.h	Thu Mar 18 12:56:23 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-/* s/ file for System V release 4.2.
-
-   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009, 2010  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/>.  */
-
-
-#include "usg5-4.h"
-
-/* fnf@cygnus.com says these exist.  */
-#define HAVE_TCATTR
-/* #define HAVE_GETWD  (appears to be buggy on SVR4.2) */
-#undef HAVE_GETWD
-
-/* Info from fnf@cygnus.com suggests this is appropriate.  */
-#define POSIX_SIGNALS
-
-/* We don't need the definition from usg5-3.h with POSIX_SIGNALS.  */
-#undef sigsetmask
-#undef HAVE_SYSV_SIGPAUSE
-
-/* Motif needs -lgen.  */
-#define LIBS_SYSTEM -lsocket -lnsl -lelf -lgen
-
-/* This is the same definition as in usg5-4.h, but with sigblock/sigunblock
-   rather than sighold/sigrelse, which appear to be BSD4.1 specific and won't
-   work if POSIX_SIGNALS is defined.  It may also be appropriate for SVR4.x
-   (x<2) but I'm not sure.   fnf@cygnus.com */
-/* This sets the name of the slave side of the PTY.  On SysVr4,
-   grantpt(3) forks a subprocess, so keep sigchld_handler() from
-   intercepting that death.  If any child but grantpt's should die
-   within, it should be caught after sigrelse(2). */
-
-#undef PTY_TTY_NAME_SPRINTF
-#define PTY_TTY_NAME_SPRINTF			\
-  {						\
-    char *ptsname(), *ptyname;			\
-						\
-    sigblock(sigmask(SIGCLD));			\
-    if (grantpt(fd) == -1)			\
-      fatal("could not grant slave pty");	\
-    sigunblock(sigmask(SIGCLD));		\
-    if (unlockpt(fd) == -1)			\
-      fatal("could not unlock slave pty");	\
-    if (!(ptyname = ptsname(fd)))		\
-      fatal ("could not enable slave pty");	\
-    strncpy(pty_name, ptyname, sizeof(pty_name)); \
-    pty_name[sizeof(pty_name) - 1] = 0;		\
-  }
-
-/* Use libw.a along with X11R6 Xt.  */
-#define NEED_LIBW
-
-/* ryanr@ellingtn.ftc.nrcs.usda.gov (Richard Anthony Ryan) says -lXimp
-   is needed in UNIX_SV ... 4.2 1.1.2.  */
-#define LIB_MOTIF -lXm -lXimp
-
-/* arch-tag: 9bbfcfc1-19be-45a1-9699-af57b87da2c6
-   (do not change this comment) */
--- a/src/s/usg5-4.h	Thu Mar 18 12:56:23 2010 +0100
+++ b/src/s/usg5-4.h	Mon Mar 22 08:34:25 2010 +0100
@@ -63,13 +63,7 @@

 /* Special hacks needed to make Emacs run on this system.  */

-/*
- *	Make the sigsetmask function go away.  Don't know what the
- *	ramifications of this are, but doesn't seem possible to
- *	emulate it properly anyway at this point.
- */
-
-#define sigsetmask(mask)	/* Null expansion */
+#define POSIX_SIGNALS

 /* setjmp and longjmp can safely replace _setjmp and _longjmp,
    but they will run slower.  */
@@ -176,27 +170,6 @@

 #define PTY_NAME_SPRINTF strcpy (pty_name, "/dev/ptmx");

-/* This sets the name of the slave side of the PTY.  On SysVr4,
-   grantpt(3) forks a subprocess, so keep sigchld_handler() from
-   intercepting that death.  If any child but grantpt's should die
-   within, it should be caught after sigrelse(2). */
-
-#define PTY_TTY_NAME_SPRINTF				\
-  {							\
-    char *ptsname (), *ptyname;				\
-							\
-    sighold (SIGCLD);					\
-    if (grantpt (fd) == -1)				\
-      { emacs_close (fd); return -1; }			\
-    sigrelse (SIGCLD);					\
-    if (unlockpt (fd) == -1)				\
-      { emacs_close (fd); return -1; }			\
-    if (!(ptyname = ptsname (fd)))			\
-      { emacs_close (fd); return -1; }			\
-    strncpy (pty_name, ptyname, sizeof (pty_name));	\
-    pty_name[sizeof (pty_name) - 1] = 0;		\
-  }
-
 /* Push various streams modules onto a PTY channel. */

 #define SETUP_SLAVE_PTY \
--- a/src/unexec.c	Thu Mar 18 12:56:23 2010 +0100
+++ b/src/unexec.c	Mon Mar 22 08:34:25 2010 +0100
@@ -630,7 +630,6 @@
     PERROR (name);
 }

-#ifndef COFF_BSD_SYMBOLS

 /*
  *	If the COFF file contains a symbol table and a line number section,
@@ -699,8 +698,6 @@
   return 0;
 }

-#endif /* COFF_BSD_SYMBOLS */
-
 /* ****************************************************************
  * unexec
  *
@@ -724,9 +721,7 @@
   if (make_hdr (new, a_out, data_start, bss_start, entry_address, a_name, new_name) < 0
       || copy_text_and_data (new, a_out) < 0
       || copy_sym (new, a_out, a_name, new_name) < 0
-#ifndef COFF_BSD_SYMBOLS
       || adjust_lnnoptrs (new, a_out, new_name) < 0
-#endif
       )
     {
       close (new);