Merge from trunk; up to 2014-02-23T23:41:17Z!lekktu@gmail.com.

27 files changed, 133 insertions, 83 deletions

diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 74cab4443da..b4e9402fcba 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -3,6 +3,34 @@
 	* mh-folder.el (mh-regenerate-headers): Fix scan: bad message list
 	`unseen' error (closes SF #471).
 
+2013-11-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* mh-print.el (mh-ps-print-preprint): Don't use dynamic-var
+	`prefix-arg' as function argument.
+
+2013-06-18  Juri Linkov  <juri@jurta.org>
+
+	* mh-alias.el (mh-alias-local-users): Add non-nil arg REPLACE to
+	the call of `shell-command-on-region'.  (Bug#14637)
+
+2013-05-22  Glenn Morris  <rgm@gnu.org>
+
+	* mh-speed.el (mh-speed-view):
+	Use dframe-with-attached-buffer rather than speedbar- alias.
+
+2013-05-21  Glenn Morris  <rgm@gnu.org>
+
+	* mh-comp.el (mh-regexp-in-field-p): Fix previous change.
+
+2013-05-09  Glenn Morris  <rgm@gnu.org>
+
+	* mh-e.el (mh-sortm-args, mh-default-folder-for-message-function):
+	Fix custom types.
+
+2013-05-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* mh-comp.el (mh-regexp-in-field-p): Minor simplification.
+
 2013-03-03  Bill Wohler  <wohler@newt.com>
 
 	* mh-e.el (mh-version): Add +bzr to version.
@@ -13,27 +41,21 @@
 
 	* mh-e.el (Version, mh-version): Update for release 8.5.
 
-2013-01-23  Dmitry Antipov  <dmantipov@yandex.ru>
-
-	* mh-acros.el (mh-do-at-event-location): Use point-marker.
-	* mh-search.el (mh-index-create-imenu-index): Likewise.
-	* mh-xface.el (mh-x-image-url-display): Likewise.
-
-2012-12-10  Jeffrey C Honig  <jch@honig.net>
+2013-03-02  Jeffrey C Honig  <jch@honig.net>
 
 	* mh-folder.el (mh-inc-folder): Revert SF #2321115, SF #250
 	which processed pending deletes and refiles.  Call to
 	mh-process-or-undo-commands to insure that pending changes are
 	properly tagged after including new mail (closes SF #271).
 
-2012-12-08  Jeffrey C Honig  <jch@honig.net>
-
 	* mh-comp.el: Insure that mail-header-separator is set before
 	invoking any mml functions (closes SF #270).
 
-2012-11-25  Bill Wohler  <wohler@newt.com>
+2013-01-23  Dmitry Antipov  <dmantipov@yandex.ru>
 
-	* mh-e.el (mh-version):  Add +bzr to version.
+	* mh-acros.el (mh-do-at-event-location): Use point-marker.
+	* mh-search.el (mh-index-create-imenu-index): Likewise.
+	* mh-xface.el (mh-x-image-url-display): Likewise.
 
 2012-11-25  Bill Wohler  <wohler@newt.com>
 
@@ -95,7 +117,7 @@
 
 2012-11-25  Ted Phelps  <phelps@gnusto.com>
 
-	Postpone junk processing (closes SF #2945712). Patch submitted by
+	Postpone junk processing (closes SF #2945712).  Patch submitted by
 	Ted Phelps and refined by Bill Wohler.
 
 	* mh-e.el (mh-blacklist, mh-whitelist): New variables.
@@ -103,7 +125,7 @@
 	(mh-before-commands-processed-hook): Update documentation.
 	(mh-blacklist-msg-hook, mh-whitelist-msg-hook): New hooks.
 	(mh-folder-blacklisted, mh-folder-whitelisted): New faces.
-	* mh-folder.el (mh-folder-message-menu):  Add "Junk" to "Undo."
+	* mh-folder.el (mh-folder-message-menu): Add "Junk" to "Undo."
 	(mh-folder-font-lock-keywords): Add regexps for blacklisted and
 	whitelisted messages.
 	(mh-folder-mode): Add mh-blacklist and mh-whitelist variables.
@@ -141,8 +163,8 @@
 	X-MaxCode-Template:, X-ME-Bayesian:, X-Sendergroup:, X-SFDC-,
 	X-SMFBL:, X-SMHeaderMap:, X-VGI-OESCD:, X-VirtualServer:,
 	X-VirtualServerGroup:, X-XPT-XSL-Name:, X-Y-GMX-Trusted:,
-	X-XWALL-, X-ZixNet:. Changed X-Habeas-SWE- to X-Habeas-. Updated
-	the comment. (addresses SF #1916032).
+	X-XWALL-, X-ZixNet:. Changed X-Habeas-SWE- to X-Habeas-.  Updated
+	the comment.  (addresses SF #1916032).
 
 2012-11-25  Bill Wohler  <wohler@newt.com>
 
@@ -151,7 +173,7 @@
 	X-Bayes-Prob, X-Cam-, X-CanIt-Geo, X-Completed, X-Facebook,
 	X-Forwarded-, X-Generated-By, X-Headers-End, X-IEEE-UCE,
 	X-Jira-Fingerprint, X-Junkmail-, X-Launchpad-, X-MXL-Hash,
-	X-Notification-, X-Notifications, X-Oracle-Calendar. Replace
+	X-Notification-, X-Notifications, X-Oracle-Calendar.  Replace
 	X-DCC-Usenix-Metrics with X-DCC- (addresses SF #1916032).
 
 2012-11-25  Jeffrey C Honig  <jch@honig.net>
@@ -1210,7 +1232,7 @@
 	(mh-show-subject, mh-show-to, mh-show-xface)
 	(mh-speedbar-folder, mh-speedbar-folder-with-unseen-messages)
 	(mh-speedbar-selected-folder)
-	(mh-speedbar-selected-folder-with-unseen-messages): : Add
+	(mh-speedbar-selected-folder-with-unseen-messages): Add
 	:package-version keyword to these faces (closes SF #1452724).
 
 	* mh-tool-bar.el (mh-tool-bar-define): Add commented-out
@@ -3611,6 +3633,10 @@
 	* mh-customize.el: Call mh-image-load-path just before
 	mh-tool-bar-define so that the toolbar images can be found.
 
+2005-10-06  Bill Wohler  <wohler@newt.com>
+
+	* mh-loaddefs.el: Remove.  Now generated automatically.
+
 2005-10-04  Bill Wohler  <wohler@newt.com>
 
 	* ChangeLog: Move contents into ChangeLog.1 and trim.
@@ -3618,7 +3644,7 @@
 	* ChangeLog.1: New file.  Contains old ChangeLog.
 
 
-	Copyright (C) 2005-2013 Free Software Foundation, Inc.
+	Copyright (C) 2005-2014 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff --git a/lisp/mh-e/ChangeLog.1 b/lisp/mh-e/ChangeLog.1
index 07320246c49..926c48896b6 100644
--- a/lisp/mh-e/ChangeLog.1
+++ b/lisp/mh-e/ChangeLog.1
@@ -145,6 +145,12 @@
 	(xemacs): Depend on autoloads instead of deleted loaddefs-xemacs.
 	(loaddefs-xemacs): Deleted.
 
+2005-08-10  Lars Hansen  <larsh@soem.dk>
+
+	* mh-e.el: Add handler to desktop-buffer-mode-handlers.
+	(mh-restore-desktop-buffer): Remove autoload cookie.
+	(mh-folder-mode): Add autoload cookie.
+
 2005-07-19  Bill Wohler  <wohler@newt.com>
 
 	* README (INSTALL): Added info for Mac users.
@@ -903,6 +909,19 @@
 	rfc822-goto-eoh with something that allows From_ lines in the mail
 	header.
 
+2004-04-26  Lars Hansen  <larsh@math.ku.dk>
+
+	* mh-e.el (mh-folder-mode): Bind desktop-save-buffer to t.
+
+2004-04-22  Lars Hansen  <larsh@math.ku.dk>
+
+	* mh-e.el (mh-restore-desktop-buffer): Delete with-no-warnings.
+
+2004-04-21  Lars Hansen  <larsh@math.ku.dk>
+
+	* mh-e.el (mh-restore-desktop-buffer): Move from desktop.el.
+	Add Parameters.
+
 2004-04-14  Bill Wohler  <wohler@newt.com>
 
 	* mh-utils.el (mh-show-mouse): s/EVENT/event/. Thanks to John Paul
@@ -1403,11 +1422,11 @@
 	(mh-x-image-url-display): Don't display image if the URL looks
 	malformed.
 
-2003-10-04  Mark D Baushke  <mdb@gnu.org>
+2003-10-04  Mark D. Baushke  <mdb@gnu.org>
 
 	* mh-comp.el (mh-letter-menu): Simplify menu heading.
 
-2003-10-03  Mark D Baushke  <mdb@gnu.org>
+2003-10-03  Mark D. Baushke  <mdb@gnu.org>
 
 	* mh-mime.el (mh-mml-query-cryptographic-method): Avoid
 	revisionist history and still provide a good default.
@@ -3877,7 +3896,7 @@
 	runs checkdoc and lm-verify which is useful before releasing the
 	software. It can and should be expanded to do real unit tests.
 
-2003-04-22  Mark D Baushke  <mdb@gnu.org>
+2003-04-22  Mark D. Baushke  <mdb@gnu.org>
 
 	* mh-alias.el: Update Copyright.
 	* mh-comp.el: Ditto.
@@ -5114,7 +5133,7 @@
 	(mail-abbrevs): Declare it in XEmacs.
 	(mh-alias-add-alias-to-file): Remove unused code.
 
-2003-02-14  Ville Skyttä  <scop@xemacs.org>
+2003-02-14  Ville Skyttä  <scop@xemacs.org>
 
 	* mh-comp.el: Add autoloaded auto-mode-alist association.
 
@@ -6106,7 +6125,7 @@
 	explicitly stated.
 	(mh-visit-folder): Really fix it this time.
 
-2003-01-01  Mark D Baushke  <mdb@gnu.org>
+2003-01-01  Mark D. Baushke  <mdb@gnu.org>
 
 	* mh-alias.el (mh-alias-from-has-no-alias-p): Needs the
 	mh-autoload comment or mh-customize may have problems finding the
@@ -6854,7 +6873,7 @@
 	* Makefile: Moved .PHONY rule after all rule for compatibility
 	with BSD/OS's old pmake.
 
-2002-12-03  Mark D Baushke  <mdb@gnu.org>
+2002-12-03  Mark D. Baushke  <mdb@gnu.org>
 
 	* mh-e.el (mh-get-new-mail): Simplify no-new-mail test.
 	(mh-add-cur-notation): Remove unnecessary function.
@@ -6878,7 +6897,7 @@
 	number of scan lines is fewer than mh-large-folders (closes SF
 	#646794).
 
-2002-12-02  Mark D Baushke  <mdb@gnu.org>
+2002-12-02  Mark D. Baushke  <mdb@gnu.org>
 
 	* mh-e.el (mh-add-cur-notation): New function to mark the
 	current message with the mh-note-cur character.
@@ -8312,7 +8331,7 @@
 	variable as new-file-flag.
 	This addresses part of SF #627015.
 
-2002-10-24  Mark D Baushke  <mdb@gnu.org>
+2002-10-24  Mark D. Baushke  <mdb@gnu.org>
 
 	* mh-comp.el (mh-forward): Fix mh-mml-compose-insert-p reference
 	in last commit to be mh-mml-compose-insert-flag.
@@ -8581,7 +8600,7 @@
 
 	* mh-comp.el (mh-mml-to-mime autoload): Ditto.
 
-2002-10-21  Mark D Baushke  <mdb@gnu.org>
+2002-10-21  Mark D. Baushke  <mdb@gnu.org>
 
 	* mh-mime.el (smiley-region): Use load for a non-fatal dependency
 	on the smiley library.
@@ -8735,7 +8754,7 @@
 	prompted for the number of messages to display, you got an error.
 	This has been fixed.
 
-2002-10-19  Mark D Baushke  <mdb@gnu.org>
+2002-10-19  Mark D. Baushke  <mdb@gnu.org>
 
 	* mh-e.el (mh-last-destination-folder): Destination of last refile
 	command.
@@ -8777,7 +8796,7 @@
 	macro mh-compat-write-file-hook to use write-file-functions for
 	Emacs 21.4 and local-write-file-hooks for older versions.
 
-2002-10-18  Mark D Baushke  <mdb@gnu.org>
+2002-10-18  Mark D. Baushke  <mdb@gnu.org>
 
 	* mh-utils.el (mh-invisible-headers): Add more anti-spam headers.
 
@@ -9079,7 +9098,7 @@
 	(mh-remove-xemacs-horizontal-scrollbar): New macro to avoid
 	compiler-warnings.
 
-2002-10-10  Mark D Baushke  <mdb@gnu.org>
+2002-10-10  Mark D. Baushke  <mdb@gnu.org>
 
 	* Makefile (EMACS_OPTIONS): New macro for command-line compile
 	options.
@@ -9088,13 +9107,13 @@
 	(COMPILE_COMMAND): Combine the compile command with its options.
 	(.el.elc): Use the new $(COMPILE_COMMAND).
 
-2002-10-10  Mark D Baushke  <mdb@gnu.org>
+2002-10-10  Mark D. Baushke  <mdb@gnu.org>
 
 	* mh-speed.el (mh-speed-select-attached-frame): Define a new
 	compatibility macro for getting to the attached-frame.
 	(mh-speed-update-current-folder): Use it.
 
-2002-10-10  Mark D Baushke  <mdb@gnu.org>
+2002-10-10  Mark D. Baushke  <mdb@gnu.org>
 
 	* mh-speed.el (mh-speed-update-current-folder): Use
 	'dframe-select-attached-frame if we are in a newer speedbar
@@ -9452,7 +9471,7 @@
 	present in the load-path.
 	* mh-mime.el (mh-require): Don't use it anymore.
 
-2002-07-15  Mark D Baushke  <mdb@gnu.org>
+2002-07-15  Mark D. Baushke  <mdb@gnu.org>
 
 	* mh-utils.el (mh-update-scan-format): Rewrite for compatibility
 	with XEmacs as replace-match appears not to have identical
@@ -9531,7 +9550,7 @@
 
 	* mh-mime.el (mm-destroy-parts): Add definition for old emacs.
 
-2002-06-30  Mark D Baushke  <mdb@gnu.org>
+2002-06-30  Mark D. Baushke  <mdb@gnu.org>
 
 	* mh-utils.el (mh-update-scan-format): Add documentation string.
 	(mh-scan-msg-format-regexp): Update the regexp to find %(msg).
@@ -9574,7 +9593,7 @@
 	* mh-index.el (mh-count-windows): This function works around the
 	lack of the window-list builtin function in emacs20.
 
-2002-06-29  Mark D Baushke  <mdb@gnu.org>
+2002-06-29  Mark D. Baushke  <mdb@gnu.org>
 
 	* mh-utils.el (mh-message-number-width): New function to scan
 	the last message of a folder and return its width.
@@ -9625,7 +9644,7 @@
 	* mh-mime.el (gnus-newsgroup-name): Initialize it to nil, so that
 	mm-uu-dissect doesn't cause error.
 
-2002-06-27  Mark D Baushke  <mdb@gnu.org>
+2002-06-27  Mark D. Baushke  <mdb@gnu.org>
 
 	* mh-utils.el (mh-cmd-note): Make buffer-local. Changes to this
 	variable should be made via the new mh-set-default-cmd-note
@@ -9946,7 +9965,7 @@
 	bug that I accidentally introduced by adding an extra line when
 	cut and pasting my changes.
 
-	* mh-func.el (compilation): Code rearrangement to remove compiler
+	* mh-funcs.el (compilation): Code rearrangement to remove compiler
 	warnings.
 
 	* mh-mime.el (compilation): Code rearrangement to remove compiler
@@ -11242,7 +11261,7 @@
 	* mh-utils.el (mh-decode-quoted-printable):
 	New customizable variable telling whether to run mimedecode on
 	MIME message containing quoted-printable parts.  mimedecode will
-	only alter quoted-printable parts , leaving others intact, and the
+	only alter quoted-printable parts, leaving others intact, and the
 	resulting message is still fully MIME.
 	* mh-utils.el (mh-decode-quoted-printable): New function to run
 	mimedecode on the current buffer.
@@ -11400,7 +11419,7 @@
 	(dist): Leave release in current directory.
 
 
-  Copyright (C) 2003-2013 Free Software Foundation, Inc.
+  Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
@@ -11416,3 +11435,7 @@
 
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;; Local Variables:
+;; coding: utf-8
+;; End:
diff --git a/lisp/mh-e/mh-acros.el b/lisp/mh-e/mh-acros.el
index 7d6279e4eca..7abd16bd832 100644
--- a/lisp/mh-e/mh-acros.el
+++ b/lisp/mh-e/mh-acros.el
@@ -1,6 +1,6 @@
 ;;; mh-acros.el --- macros used in MH-E
 
-;; Copyright (C) 2004, 2006-2013 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2006-2014 Free Software Foundation, Inc.
 
 ;; Author: Satyaki Das <satyaki@theforce.stanford.edu>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-alias.el b/lisp/mh-e/mh-alias.el
index cc56c981809..a34a840b7f9 100644
--- a/lisp/mh-e/mh-alias.el
+++ b/lisp/mh-e/mh-alias.el
@@ -1,6 +1,6 @@
 ;;; mh-alias.el --- MH-E mail alias completion and expansion
 
-;; Copyright (C) 1994-1997, 2001-2013 Free Software Foundation, Inc.
+;; Copyright (C) 1994-1997, 2001-2014 Free Software Foundation, Inc.
 
 ;; Author: Peter S. Galbraith <psg@debian.org>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
@@ -141,7 +141,7 @@ Exclude all aliases already in `mh-alias-alist' from \"ali\""
             (insert-file-contents "/etc/passwd")))
        ((stringp mh-alias-local-users)
         (insert mh-alias-local-users "\n")
-        (shell-command-on-region (point-min) (point-max) mh-alias-local-users t)
+        (shell-command-on-region (point-min) (point-max) mh-alias-local-users t t)
         (goto-char (point-min))))
       (while  (< (point) (point-max))
         (cond
diff --git a/lisp/mh-e/mh-buffers.el b/lisp/mh-e/mh-buffers.el
index 291d2539ddb..8fb0dd2d1e3 100644
--- a/lisp/mh-e/mh-buffers.el
+++ b/lisp/mh-e/mh-buffers.el
@@ -1,6 +1,6 @@
 ;;; mh-buffers.el --- MH-E buffer constants and utilities
 
-;; Copyright (C) 1993, 1995, 1997, 2000-2013 Free Software Foundation,
+;; Copyright (C) 1993, 1995, 1997, 2000-2014 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-comp.el b/lisp/mh-e/mh-comp.el
index 1f07a7983b1..95c543db248 100644
--- a/lisp/mh-e/mh-comp.el
+++ b/lisp/mh-e/mh-comp.el
@@ -1,6 +1,6 @@
 ;;; mh-comp.el --- MH-E functions for composing and sending messages
 
-;; Copyright (C) 1993, 1995, 1997, 2000-2013 Free Software Foundation,
+;; Copyright (C) 1993, 1995, 1997, 2000-2014 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
@@ -1204,18 +1204,18 @@ discarded."
         (save-excursion
           (let ((search-result nil))
             (while fields
-              (let ((field (car fields))
-                    (syntax-table mh-regexp-in-field-syntax-table))
-                (if (null syntax-table)
-                    (let ((case-fold-search t))
-                      (cond
-                       ((string-match field "^To$\\|^[BD]?cc$\\|^From$")
-                        (setq syntax-table mh-addr-syntax-table))
-                       ((string-match field "^Fcc$")
-                        (setq syntax-table mh-fcc-syntax-table))
-                       (t
-                        (setq syntax-table (syntax-table)))
-                       )))
+              (let* ((field (car fields))
+                     (syntax-table
+                      (or mh-regexp-in-field-syntax-table
+                          (let ((case-fold-search t))
+                            (cond
+                             ((string-match field "^To$\\|^[BD]?cc$\\|^From$")
+                              mh-addr-syntax-table)
+                             ((string-match field "^Fcc$")
+                              mh-fcc-syntax-table)
+                             (t
+                              (syntax-table)))
+                            ))))
                 (if (and (mh-goto-header-field field)
                          (set-syntax-table syntax-table)
                          (re-search-forward
diff --git a/lisp/mh-e/mh-compat.el b/lisp/mh-e/mh-compat.el
index b755572c957..af9f1364970 100644
--- a/lisp/mh-e/mh-compat.el
+++ b/lisp/mh-e/mh-compat.el
@@ -1,6 +1,6 @@
 ;;; mh-compat.el --- make MH-E compatible with various versions of Emacs
 
-;; Copyright (C) 2006-2013 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index 0c134e8544a..eaa05720f43 100644
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -1,6 +1,6 @@
 ;;; mh-e.el --- GNU Emacs interface to the MH mail system
 
-;; Copyright (C) 1985-1988, 1990, 1992-1995, 1997, 1999-2013 Free
+;; Copyright (C) 1985-1988, 1990, 1992-1995, 1997, 1999-2014 Free
 ;; Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
@@ -1019,6 +1019,7 @@ windows in the frame are removed."
   (when delete-other-windows-flag
     (delete-other-windows)))
 
+;; FIXME: Maybe out of date?  --xfq
 (if (boundp 'customize-package-emacs-version-alist)
     (add-to-list 'customize-package-emacs-version-alist
                  '(MH-E ("6.0" . "22.1") ("6.1" . "22.1") ("7.0" . "22.1")
@@ -1354,7 +1355,7 @@ This option is consulted when a prefix argument is used with
 specified in the MH profile. This option may be used to provide
 an alternate view. For example, \"'(\"-nolimit\" \"-textfield\"
 \"subject\")\" is a useful setting."
-  :type 'string
+  :type '(repeat string)
   :group 'mh-folder
   :package-version '(MH-E . "8.0"))
 
@@ -1368,7 +1369,7 @@ being refiled and point is at the start of the message. This function
 should return the default folder as a string with a leading \"+\"
 sign. It can also return nil so that the last folder name is used as
 the default, or an empty string to suppress the default entirely."
-  :type 'function
+  :type '(choice (const nil) function)
   :group 'mh-folder-selection
   :package-version '(MH-E . "8.0"))
 
diff --git a/lisp/mh-e/mh-folder.el b/lisp/mh-e/mh-folder.el
index 599baf3326f..acb4d7d5197 100644
--- a/lisp/mh-e/mh-folder.el
+++ b/lisp/mh-e/mh-folder.el
@@ -1,6 +1,6 @@
 ;;; mh-folder.el --- MH-Folder mode
 
-;; Copyright (C) 2002-2003, 2005-2013 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2003, 2005-2014 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-funcs.el b/lisp/mh-e/mh-funcs.el
index 05cd8a4cbde..d1cc879a028 100644
--- a/lisp/mh-e/mh-funcs.el
+++ b/lisp/mh-e/mh-funcs.el
@@ -1,6 +1,6 @@
 ;;; mh-funcs.el --- MH-E functions not everyone will use right away
 
-;; Copyright (C) 1993, 1995, 2001-2013 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1995, 2001-2014 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-gnus.el b/lisp/mh-e/mh-gnus.el
index 50a5aed62a0..8fcff25e8c4 100644
--- a/lisp/mh-e/mh-gnus.el
+++ b/lisp/mh-e/mh-gnus.el
@@ -1,6 +1,6 @@
 ;;; mh-gnus.el --- make MH-E compatible with various versions of Gnus
 
-;; Copyright (C) 2003-2004, 2006-2013 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2004, 2006-2014 Free Software Foundation, Inc.
 
 ;; Author: Satyaki Das <satyaki@theforce.stanford.edu>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-identity.el b/lisp/mh-e/mh-identity.el
index c93a4e0f2a8..2df9ad11bee 100644
--- a/lisp/mh-e/mh-identity.el
+++ b/lisp/mh-e/mh-identity.el
@@ -1,6 +1,6 @@
 ;;; mh-identity.el --- multiple identify support for MH-E
 
-;; Copyright (C) 2002-2013 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2014 Free Software Foundation, Inc.
 
 ;; Author: Peter S. Galbraith <psg@debian.org>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-inc.el b/lisp/mh-e/mh-inc.el
index a2e16d92640..dc5a6e704dc 100644
--- a/lisp/mh-e/mh-inc.el
+++ b/lisp/mh-e/mh-inc.el
@@ -1,6 +1,6 @@
 ;;; mh-inc.el --- MH-E "inc" and separate mail spool handling
 
-;; Copyright (C) 2003-2004, 2006-2013 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2004, 2006-2014 Free Software Foundation, Inc.
 
 ;; Author: Peter S. Galbraith <psg@debian.org>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-junk.el b/lisp/mh-e/mh-junk.el
index d7632ffc729..dfa3b37a5e4 100644
--- a/lisp/mh-e/mh-junk.el
+++ b/lisp/mh-e/mh-junk.el
@@ -1,6 +1,6 @@
 ;;; mh-junk.el --- MH-E interface to anti-spam measures
 
-;; Copyright (C) 2003-2013 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
 ;; Author: Satyaki Das <satyaki@theforce.stanford.edu>,
 ;;         Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-letter.el b/lisp/mh-e/mh-letter.el
index b4d8b625586..ef8fa7e6801 100644
--- a/lisp/mh-e/mh-letter.el
+++ b/lisp/mh-e/mh-letter.el
@@ -1,6 +1,6 @@
 ;;; mh-letter.el --- MH-Letter mode
 
-;; Copyright (C) 1993, 1995, 1997, 2000-2013 Free Software Foundation,
+;; Copyright (C) 1993, 1995, 1997, 2000-2014 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-limit.el b/lisp/mh-e/mh-limit.el
index 8cb1f1464f6..658a3b94811 100644
--- a/lisp/mh-e/mh-limit.el
+++ b/lisp/mh-e/mh-limit.el
@@ -1,6 +1,6 @@
 ;;; mh-limit.el --- MH-E display limits
 
-;; Copyright (C) 2001-2003, 2006-2013 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2003, 2006-2014 Free Software Foundation, Inc.
 
 ;; Author: Peter S. Galbraith <psg@debian.org>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-mime.el b/lisp/mh-e/mh-mime.el
index 046f03d5255..2272b891c64 100644
--- a/lisp/mh-e/mh-mime.el
+++ b/lisp/mh-e/mh-mime.el
@@ -1,6 +1,6 @@
 ;;; mh-mime.el --- MH-E MIME support
 
-;; Copyright (C) 1993, 1995, 2001-2013 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1995, 2001-2014 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-print.el b/lisp/mh-e/mh-print.el
index f57ccf56d85..e2e3b70d3e7 100644
--- a/lisp/mh-e/mh-print.el
+++ b/lisp/mh-e/mh-print.el
@@ -1,6 +1,6 @@
 ;;; mh-print.el --- MH-E printing support
 
-;; Copyright (C) 2003-2013 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
 ;; Author: Jeffrey C Honig <jch@honig.net>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
@@ -139,11 +139,11 @@ commands \\[mh-ps-print-toggle-color] and
   (interactive (list (mh-interactive-range "Print") (mh-ps-print-preprint 1)))
   (mh-ps-print-range range file))
 
-(defun mh-ps-print-preprint (prefix-arg)
+(defun mh-ps-print-preprint (arg)
   "Provide a better default file name for `ps-print-preprint'.
-Pass along the PREFIX-ARG to it."
+Pass along the prefix ARG to it."
   (let ((buffer-file-name (format "mh-%s" (substring (buffer-name) 1))))
-    (ps-print-preprint prefix-arg)))
+    (ps-print-preprint arg)))
 
 ;;;###mh-autoload
 (defun mh-ps-print-toggle-faces ()
diff --git a/lisp/mh-e/mh-scan.el b/lisp/mh-e/mh-scan.el
index e06c02b92b8..d9913741e20 100644
--- a/lisp/mh-e/mh-scan.el
+++ b/lisp/mh-e/mh-scan.el
@@ -1,6 +1,6 @@
 ;;; mh-scan.el --- MH-E scan line constants and utilities
 
-;; Copyright (C) 1993, 1995, 1997, 2000-2013 Free Software Foundation,
+;; Copyright (C) 1993, 1995, 1997, 2000-2014 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-search.el b/lisp/mh-e/mh-search.el
index d31d0ca495a..5dfd5cab7e5 100644
--- a/lisp/mh-e/mh-search.el
+++ b/lisp/mh-e/mh-search.el
@@ -1,6 +1,6 @@
 ;;; mh-search  ---  MH-Search mode
 
-;; Copyright (C) 1993, 1995, 2001-2013 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1995, 2001-2014 Free Software Foundation, Inc.
 
 ;; Author: Indexed search by Satyaki Das <satyaki@theforce.stanford.edu>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-seq.el b/lisp/mh-e/mh-seq.el
index ff75a071fa9..d0cd57d37d5 100644
--- a/lisp/mh-e/mh-seq.el
+++ b/lisp/mh-e/mh-seq.el
@@ -1,6 +1,6 @@
 ;;; mh-seq.el --- MH-E sequences support
 
-;; Copyright (C) 1993, 1995, 2001-2013 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1995, 2001-2014 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-show.el b/lisp/mh-e/mh-show.el
index 87b048dbd60..afe28638501 100644
--- a/lisp/mh-e/mh-show.el
+++ b/lisp/mh-e/mh-show.el
@@ -1,6 +1,6 @@
 ;;; mh-show.el --- MH-Show mode
 
-;; Copyright (C) 1993, 1995, 1997, 2000-2013 Free Software Foundation,
+;; Copyright (C) 1993, 1995, 1997, 2000-2014 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-speed.el b/lisp/mh-e/mh-speed.el
index eb36ffed64b..ad5c240c9e6 100644
--- a/lisp/mh-e/mh-speed.el
+++ b/lisp/mh-e/mh-speed.el
@@ -1,6 +1,6 @@
 ;;; mh-speed.el --- MH-E speedbar support
 
-;; Copyright (C) 2002-2013 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2014 Free Software Foundation, Inc.
 
 ;; Author: Satyaki Das <satyaki@theforce.stanford.edu>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
@@ -175,7 +175,7 @@ The optional arguments from speedbar are IGNORED."
                      (mh-read-range "Scan" folder t nil nil
                                     mh-interpret-number-as-range-flag))))
     (when (stringp folder)
-      (speedbar-with-attached-buffer
+      (dframe-with-attached-buffer
        (mh-visit-folder folder range)
        (delete-other-windows)))))
 
diff --git a/lisp/mh-e/mh-thread.el b/lisp/mh-e/mh-thread.el
index fc0925f1260..3fa7c2c4d37 100644
--- a/lisp/mh-e/mh-thread.el
+++ b/lisp/mh-e/mh-thread.el
@@ -1,6 +1,6 @@
 ;;; mh-thread.el --- MH-E threading support
 
-;; Copyright (C) 2002-2004, 2006-2013 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2004, 2006-2014 Free Software Foundation, Inc.
 
 ;; Author: Satyaki Das <satyaki@theforce.stanford.edu>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-tool-bar.el b/lisp/mh-e/mh-tool-bar.el
index dc0d163e300..610df3a3aa4 100644
--- a/lisp/mh-e/mh-tool-bar.el
+++ b/lisp/mh-e/mh-tool-bar.el
@@ -1,6 +1,6 @@
 ;;; mh-tool-bar.el --- MH-E tool bar support
 
-;; Copyright (C) 2002-2003, 2005-2013 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2003, 2005-2014 Free Software Foundation, Inc.
 
 ;; Author: Satyaki Das <satyaki@theforce.stanford.edu>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-utils.el b/lisp/mh-e/mh-utils.el
index 09448feb136..375efacb0e6 100644
--- a/lisp/mh-e/mh-utils.el
+++ b/lisp/mh-e/mh-utils.el
@@ -1,6 +1,6 @@
 ;;; mh-utils.el --- MH-E general utilities
 
-;; Copyright (C) 1993, 1995, 1997, 2000-2013 Free Software Foundation,
+;; Copyright (C) 1993, 1995, 1997, 2000-2014 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-xface.el b/lisp/mh-e/mh-xface.el
index 4340373f5c4..20a61a5c6be 100644
--- a/lisp/mh-e/mh-xface.el
+++ b/lisp/mh-e/mh-xface.el
@@ -1,6 +1,6 @@
 ;;; mh-xface.el --- MH-E X-Face and Face header field display
 
-;; Copyright (C) 2002-2003, 2005-2013 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2003, 2005-2014 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>