(mh-folder-expand-at-point): Fix folder completion. Folders returned

[gnu-emacs] / lisp / mail / rmailedit.el

diff --git a/lisp/mail/rmailedit.el b/lisp/mail/rmailedit.el
index a057c019b82139c29d830ba7020ab8218726c64f..fe288bb2904d4891b0c2bcb10a97dc90ae2a2624 100644 (file)
--- a/lisp/mail/rmailedit.el
+++ b/lisp/mail/rmailedit.el
@@ -1,6 +1,7 @@
 ;;; rmailedit.el --- "RMAIL edit mode"  Edit the current message
 
-;; Copyright (C) 1985, 1994, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1994, 2001, 2002, 2003, 2004,
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: mail
@@ -19,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -57,7 +58,7 @@ to return to regular RMAIL:
   *  \\[rmail-cease-edit] makes them permanent.
 This functions runs the normal hook `rmail-edit-mode-hook'.
 \\{rmail-edit-map}"
-  (text-mode)
+  (delay-mode-hooks (text-mode))
   (use-local-map rmail-edit-map)
   (setq major-mode 'rmail-edit-mode)
   (setq mode-name "RMAIL Edit")
@@ -68,7 +69,7 @@ This functions runs the normal hook `rmail-edit-mode-hook'.
       (save-excursion
        (set-buffer rmail-summary-buffer)
        (rmail-summary-disable)))
-  (run-hooks 'rmail-edit-mode-hook))
+  (run-mode-hooks 'rmail-edit-mode-hook))
 
 (defvar rmail-old-pruned nil)
 (put 'rmail-old-pruned 'permanent-local t)