[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/menu-bar.el,v
From: |
Richard M. Stallman |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/menu-bar.el,v |
Date: |
Mon, 04 Dec 2006 00:30:11 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Richard M. Stallman <rms> 06/12/04 00:30:11
Index: menu-bar.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/menu-bar.el,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -b -r1.298 -r1.299
--- menu-bar.el 1 Dec 2006 21:52:51 -0000 1.298
+++ menu-bar.el 4 Dec 2006 00:30:11 -0000 1.299
@@ -462,9 +462,10 @@
"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 @@
(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 @@
(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 @@
(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)