[Emacs-commit] emacs/lisp/mh-e mh-letter.el

[Bill Wohler]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         
Changes by:     Bill Wohler <address@hidden>    06/01/30 00:49:56

Modified files:
        lisp/mh-e      : mh-letter.el 

Log message:
        (mh-letter-menu): Remove. Defvar no longer needed to shush compiler.
        (mh-letter-mode): Remove Mail menu.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/emacs/lisp/mh-e/mh-letter.el.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: emacs/lisp/mh-e/mh-letter.el
diff -u emacs/lisp/mh-e/mh-letter.el:1.2 emacs/lisp/mh-e/mh-letter.el:1.3
--- emacs/lisp/mh-e/mh-letter.el:1.2    Mon Jan 30 00:29:30 2006
+++ emacs/lisp/mh-e/mh-letter.el        Mon Jan 30 00:49:56 2006
@@ -84,7 +84,6 @@
 
 ;;; Letter Menu
 
-(eval-when-compile (defvar mh-letter-menu nil))
 (easy-menu-define
   mh-letter-menu mh-letter-mode-map "Menu for MH-E letter mode."
   '("Letter"
@@ -353,6 +352,11 @@
     ;; ...or the header only
     (setq font-lock-defaults '((mh-show-font-lock-keywords) t))))
   (easy-menu-add mh-letter-menu)
+  ;; Maybe we want to use the existing Mail menu from mail-mode in
+  ;; 9.0; in the mean time, let's remove it since the redundancy will
+  ;; only produce confusion.
+  (define-key mh-letter-mode-map [menu-bar mail] 'undefined)
+  (mh-do-in-xemacs (easy-menu-remove mail-menubar-menu))
   (setq fill-column mh-letter-fill-column)
   ;; If text-mode-hook turned on auto-fill, tune it for messages
   (when auto-fill-function