merge from trunk

3 files changed, 12 insertions, 27 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cad6788f0e8..c35252b184c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
 2013-08-16  Glenn Morris  <rgm@gnu.org>
 
+        * emacs-lisp/bytecomp.el (byte-compile-make-variable-buffer-local):
+        Tweak warning.  (Bug#14926)
+
+        * menu-bar.el (send-mail-item-name, read-mail-item-name): Remove.
+        (menu-bar-tools-menu): Simplify news and mail items.  (Bug#15095)
+
         * image-mode.el (image-mode-map): Add menu items to reverse,
         increase, decrease, reset animation speed.
         (image--set-speed, image-increase-speed, image-decrease-speed)
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 5baef042757..c6612024fa6 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -4274,7 +4274,7 @@ binding slots have been popped."
   (if (and (eq (car-safe (car-safe (cdr-safe form))) 'quote)
            (byte-compile-warning-enabled-p 'make-local))
       (byte-compile-warn
-       "`make-variable-buffer-local' should be called at toplevel"))
+       "`make-variable-buffer-local' not called at toplevel"))
   (byte-compile-normal-call form))
 (put 'make-variable-buffer-local
      'byte-hunk-handler 'byte-compile-form-make-variable-buffer-local)
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index be459fe38d5..34cfc68295e 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -1307,26 +1307,6 @@ mail status in mode line"))
 
 ;; The "Tools" menu items
 
-(defun send-mail-item-name ()
-  (let* ((known-send-mail-commands '((sendmail-user-agent . "sendmail")
-                                     (mh-e-user-agent . "MH")
-                                     (message-user-agent . "Gnus Message")
-                                     (gnus-user-agent . "Gnus")))
-         (name (assq mail-user-agent known-send-mail-commands)))
-    (if name
-        (setq name (cdr name))
-      (setq name (symbol-name mail-user-agent))
-      (if (string-match "\\(.+\\)-user-agent" name)
-          (setq name (match-string 1 name))))
-    name))
-
-(defun read-mail-item-name ()
-  (let* ((known-rmail-commands '((rmail . "RMAIL")
-                                 (mh-rmail . "MH")
-                                 (gnus . "Gnus")))
-         (known (assq read-mail-command known-rmail-commands)))
-    (if known (cdr known) (symbol-name read-mail-command))))
-
 (defvar menu-bar-games-menu
   (let ((menu (make-sparse-keymap "Games")))
 
@@ -1473,18 +1453,17 @@ mail status in mode line"))
     (bindings--define-key menu [directory-search]
       '(menu-item "Directory Search" eudc-tools-menu))
     (bindings--define-key menu [compose-mail]
-      '(menu-item (format "Send Mail (with %s)" (send-mail-item-name)) compose-mail
+      '(menu-item "Compose New Mail" compose-mail
                   :visible (and mail-user-agent (not (eq mail-user-agent 'ignore)))
-                  :help "Send a mail message"))
+                  :help "Start writing a new mail message"))
     (bindings--define-key menu [rmail]
-      '(menu-item (format "Read Mail (with %s)" (read-mail-item-name))
-                  menu-bar-read-mail
+      '(menu-item "Read Mail" menu-bar-read-mail
                   :visible (and read-mail-command
                                 (not (eq read-mail-command 'ignore)))
-                  :help "Read your mail and reply to it"))
+                  :help "Read your mail"))
 
     (bindings--define-key menu [gnus]
-      '(menu-item "Read Net News (Gnus)" gnus
+      '(menu-item "Read Net News" gnus
                   :help "Read network news groups"))
 
     (bindings--define-key menu [separator-vc]