(menu-bar-make-toggle): Add "globally" to echo area messages.

<indicate-empty-lines, case-fold-search>: Add "globally" to Help string.
<case-fold-search>: MESSAGE arg need not say "globally".
(menu-bar-edit-menu <paste-from-menu>): Renamed from select-and-paste.

1 files changed, 9 insertions, 8 deletions

diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 0fdb0c8ccd7..72cc8521ee9 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -462,9 +462,10 @@ A large number or nil slows down menu responsiveness."
 	      "Delete the text in region between mark and current position"))
 (defvar yank-menu (cons "Select Yank" nil))
 (fset 'yank-menu (cons 'keymap yank-menu))
-(define-key menu-bar-edit-menu [select-paste]
-  '(menu-item "Select and Paste" yank-menu
-	      :enable (and (cdr yank-menu) (not buffer-read-only))))
+(define-key menu-bar-edit-menu [paste-from-menu]
+  '(menu-item "Paste from kill menu" yank-menu
+	      :enable (and (cdr yank-menu) (not buffer-read-only))
+	      :help "Choose a string from the kill ring and paste it"))
 (define-key menu-bar-edit-menu [paste]
   '(menu-item "Paste" yank
 	      :enable (and
@@ -623,8 +624,8 @@ by \"Save Options\" in Custom buffers.")
 		 (let ((set (or (get ',variable 'custom-set) 'set-default))
 		       (get (or (get ',variable 'custom-get) 'default-value)))
 		   (funcall set ',variable (not (funcall get ',variable))))))
-	   (message ,message "enabled")
-  	 (message ,message "disabled"))
+	   (message ,message "enabled globally")
+  	 (message ,message "disabled globally"))
        ;; The function `customize-mark-as-set' must only be called when
        ;; a variable is set interactively, as the purpose is to mark it as
        ;; a candidate for "Save Options", and we do not want to save options
@@ -814,7 +815,7 @@ mail status in mode line"))
   (menu-bar-make-toggle toggle-indicate-empty-lines indicate-empty-lines
 			"Empty Line Indicators"
 			"Indicating of empty lines %s"
-			"Indicate trailing empty lines in fringe"))
+			"Indicate trailing empty lines in fringe, globally"))
 
 (defun menu-bar-showhide-fringe-menu-customize ()
   "Show customization buffer for `fringe-mode'."
@@ -1019,8 +1020,8 @@ mail status in mode line"))
 (define-key menu-bar-options-menu [case-fold-search]
   (menu-bar-make-toggle toggle-case-fold-search case-fold-search
 	    "Case-Insensitive Search"
-	    "Case-Insensitive Search %s for buffers without local setting"
-	    "Ignore letter-case in search for buffers without local setting"))
+	    "Case-Insensitive Search %s"
+	    "Globally ignore letter-case in search"))
 
 (defun menu-bar-text-mode-auto-fill ()
   (interactive)