Merge from emacs-24; up to 2013-01-03T02:31:36Z!rgm@gnu.org

[gnu-emacs] / lisp / mh-e / mh-utils.el

diff --git a/lisp/mh-e/mh-utils.el b/lisp/mh-e/mh-utils.el
index 00a03c87ed935b7c115e40eab429def4f05feeb5..09448feb13617812c71a64d2847de84abcf5b5a3 100644 (file)
--- a/lisp/mh-e/mh-utils.el
+++ b/lisp/mh-e/mh-utils.el
@@ -1,6 +1,7 @@
 ;;; mh-utils.el --- MH-E general utilities
 
-;; Copyright (C) 1993, 1995, 1997, 2000-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1995, 1997, 2000-2013 Free Software Foundation,
+;; Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
@@ -488,7 +489,7 @@ no effect."
 ;; The car of folder is the name, and the cdr is either t or some
 ;; sort of count that I do not understand. It's too small to be the
 ;; number of messages in the sub-folders and too large to be the
-;; number of sub-folders. XXX"
+;; number of sub-folders. XXX
   `(if (cdr ,folder)
        t
      nil))
@@ -732,8 +733,7 @@ See Info node `(elisp) Programmed Completion' for details."
 
 ;; Shush compiler.
 (mh-do-in-xemacs
-  (defvar completion-root-regexp)
-  (defvar minibuffer-completing-file-name))
+  (defvar completion-root-regexp))
 
 (defun mh-folder-completing-read (prompt default allow-root-folder-flag)
   "Read folder name with PROMPT and default result DEFAULT.