# HG changeset patch
# User Paul Eggert <eggert@cs.ucla.edu>
# Date 1295293658 28800
# Node ID 7e12e8b5864c4e7301b4a1398509018b3ba3cf5a
# Parent  2b0a49a0a9ed2780a44bbcc60de2e39af17ff8af
Merge from mainline.

diff -r 2b0a49a0a9ed -r 7e12e8b5864c lisp/dired.el
--- a/lisp/dired.el	Mon Jan 17 11:38:39 2011 -0800
+++ b/lisp/dired.el	Mon Jan 17 11:47:38 2011 -0800
@@ -3562,7 +3562,7 @@
 ;;;;;;  dired-run-shell-command dired-do-shell-command dired-do-async-shell-command
 ;;;;;;  dired-clean-directory dired-do-print dired-do-touch dired-do-chown
 ;;;;;;  dired-do-chgrp dired-do-chmod dired-compare-directories dired-backup-diff
-;;;;;;  dired-diff) "dired-aux" "dired-aux.el" "adcb55a439048f158f47c5c96b3dad09")
+;;;;;;  dired-diff) "dired-aux" "dired-aux.el" "5fc17781c25dbe16b7e170aed0ad4d62")
 ;;; Generated autoloads from dired-aux.el
 
 (autoload 'dired-diff "dired-aux" "\
@@ -4021,7 +4021,7 @@
 ;;;***
 
 ;;;### (autoloads (dired-do-relsymlink dired-jump) "dired-x" "dired-x.el"
-;;;;;;  "6d47e23fbd9236014786c50618e99f09")
+;;;;;;  "0f63715e54b0d001955bdc3680cadcd0")
 ;;; Generated autoloads from dired-x.el
 
 (autoload 'dired-jump "dired-x" "\
diff -r 2b0a49a0a9ed -r 7e12e8b5864c lisp/emacs-lisp/cl-loaddefs.el
--- a/lisp/emacs-lisp/cl-loaddefs.el	Mon Jan 17 11:38:39 2011 -0800
+++ b/lisp/emacs-lisp/cl-loaddefs.el	Mon Jan 17 11:47:38 2011 -0800
@@ -10,7 +10,7 @@
 ;;;;;;  ceiling* floor* isqrt lcm gcd cl-progv-before cl-set-frame-visible-p
 ;;;;;;  cl-map-overlays cl-map-intervals cl-map-keymap-recursively
 ;;;;;;  notevery notany every some mapcon mapcan mapl maplist map
-;;;;;;  cl-mapcar-many equalp coerce) "cl-extra" "cl-extra.el" "ff6f0444d029166d2ed5da298f39854e")
+;;;;;;  cl-mapcar-many equalp coerce) "cl-extra" "cl-extra.el" "0fa13e08069009fb44873beae11aab93")
 ;;; Generated autoloads from cl-extra.el
 
 (autoload 'coerce "cl-extra" "\
@@ -754,7 +754,7 @@
 ;;;;;;  find nsubstitute-if-not nsubstitute-if nsubstitute substitute-if-not
 ;;;;;;  substitute-if substitute delete-duplicates remove-duplicates
 ;;;;;;  delete-if-not delete-if delete* remove-if-not remove-if remove*
-;;;;;;  replace fill reduce) "cl-seq" "cl-seq.el" "c17ab899d56f8fa132d0471ce6896a10")
+;;;;;;  replace fill reduce) "cl-seq" "cl-seq.el" "06b7f4180b3e40db2e6dae228c3265a8")
 ;;; Generated autoloads from cl-seq.el
 
 (autoload 'reduce "cl-seq" "\
diff -r 2b0a49a0a9ed -r 7e12e8b5864c lisp/htmlfontify.el
--- a/lisp/htmlfontify.el	Mon Jan 17 11:38:39 2011 -0800
+++ b/lisp/htmlfontify.el	Mon Jan 17 11:47:38 2011 -0800
@@ -2350,7 +2350,7 @@
 
 
 ;;;### (autoloads (hfy-fallback-colour-values htmlfontify-load-rgb-file)
-;;;;;;  "hfy-cmap" "hfy-cmap.el" "f7f81749b08e0aec14aac431f8b5ac8b")
+;;;;;;  "hfy-cmap" "hfy-cmap.el" "5314c2706e20292f96206daa0eb96caa")
 ;;; Generated autoloads from hfy-cmap.el
 
 (autoload 'htmlfontify-load-rgb-file "hfy-cmap" "\
diff -r 2b0a49a0a9ed -r 7e12e8b5864c lisp/mail/rmail.el
--- a/lisp/mail/rmail.el	Mon Jan 17 11:38:39 2011 -0800
+++ b/lisp/mail/rmail.el	Mon Jan 17 11:47:38 2011 -0800
@@ -4263,7 +4263,7 @@
 ;;; Start of automatically extracted autoloads.
 
 ;;;### (autoloads (rmail-edit-current-message) "rmailedit" "rmailedit.el"
-;;;;;;  "1602595714ff15197cf32727d6765c31")
+;;;;;;  "bdbcacaef237aab5ca6c8653dc52a044")
 ;;; Generated autoloads from rmailedit.el
 
 (autoload 'rmail-edit-current-message "rmailedit" "\
@@ -4275,7 +4275,7 @@
 
 ;;;### (autoloads (rmail-next-labeled-message rmail-previous-labeled-message
 ;;;;;;  rmail-read-label rmail-kill-label rmail-add-label) "rmailkwd"
-;;;;;;  "rmailkwd.el" "061943b8a3dfd5695715b36736827950")
+;;;;;;  "rmailkwd.el" "46ac83afa76e3aa88eacf73237bd703e")
 ;;; Generated autoloads from rmailkwd.el
 
 (autoload 'rmail-add-label "rmailkwd" "\
@@ -4318,7 +4318,7 @@
 
 ;;;***
 
-;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "783deb7c855767051af119f1bfd8d84e")
+;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "724fa72db9b6c804f7f69ad1da83fd39")
 ;;; Generated autoloads from rmailmm.el
 
 (autoload 'rmail-mime "rmailmm" "\
@@ -4344,7 +4344,7 @@
 ;;;***
 
 ;;;### (autoloads (set-rmail-inbox-list) "rmailmsc" "rmailmsc.el"
-;;;;;;  "f1d9be06745c78b90224da788f61c2d9")
+;;;;;;  "fd5e2a8dc4f74ea2275525d7a2766bea")
 ;;; Generated autoloads from rmailmsc.el
 
 (autoload 'set-rmail-inbox-list "rmailmsc" "\
@@ -4360,7 +4360,7 @@
 
 ;;;### (autoloads (rmail-sort-by-labels rmail-sort-by-lines rmail-sort-by-correspondent
 ;;;;;;  rmail-sort-by-recipient rmail-sort-by-author rmail-sort-by-subject
-;;;;;;  rmail-sort-by-date) "rmailsort" "rmailsort.el" "8b20167ea495d683f83f980833e948e0")
+;;;;;;  rmail-sort-by-date) "rmailsort" "rmailsort.el" "446f2e852393e72030b85a1a9230c7ac")
 ;;; Generated autoloads from rmailsort.el
 
 (autoload 'rmail-sort-by-date "rmailsort" "\
@@ -4419,7 +4419,7 @@
 
 ;;;### (autoloads (rmail-summary-by-senders rmail-summary-by-topic
 ;;;;;;  rmail-summary-by-regexp rmail-summary-by-recipients rmail-summary-by-labels
-;;;;;;  rmail-summary) "rmailsum" "rmailsum.el" "b1d2ca7470a7d8baffe9e90a15a5b5e0")
+;;;;;;  rmail-summary) "rmailsum" "rmailsum.el" "267d6f740d6697a631dacbd86f583374")
 ;;; Generated autoloads from rmailsum.el
 
 (autoload 'rmail-summary "rmailsum" "\
@@ -4467,7 +4467,7 @@
 ;;;***
 
 ;;;### (autoloads (unforward-rmail-message undigestify-rmail-message)
-;;;;;;  "undigest" "undigest.el" "1b5181e02606e49ede71604472250cc3")
+;;;;;;  "undigest" "undigest.el" "2869c38a0051d0acab1a5968627fa57d")
 ;;; Generated autoloads from undigest.el
 
 (autoload 'undigestify-rmail-message "undigest" "\
diff -r 2b0a49a0a9ed -r 7e12e8b5864c lisp/ps-print.el
--- a/lisp/ps-print.el	Mon Jan 17 11:38:39 2011 -0800
+++ b/lisp/ps-print.el	Mon Jan 17 11:47:38 2011 -0800
@@ -6659,7 +6659,7 @@
 ;; But autoload them here to make the separation invisible.
 
 ;;;### (autoloads (ps-mule-end-job ps-mule-begin-job ps-mule-initialize
-;;;;;;  ps-multibyte-buffer) "ps-mule" "ps-mule.el" "84d550158bdd60da7af54df17b7a38f7")
+;;;;;;  ps-multibyte-buffer) "ps-mule" "ps-mule.el" "0bd9e024b9d49ac10c708171ec319d9a")
 ;;; Generated autoloads from ps-mule.el
 
 (defvar ps-multibyte-buffer nil "\