summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/menu-bar.el6
2 files changed, 8 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9f8ad0e9f22..f9c55aad1b3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-07 Chong Yidong <cyd@stupidchicken.com>
+
+ * menu-bar.el (menu-bar-line-wrapping-menu): Revert last change.
+ (menu-bar-options-menu): Tweak descriptions.
+
2011-07-07 Lars Magne Ingebrigtsen <larsi@gnus.org>
* menu-bar.el (menu-bar-line-wrapping-menu): Make all the Options
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 0f8f8186a36..caae40ed8c5 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -1136,7 +1136,7 @@ mail status in mode line"))
(define-key menu [word-wrap]
`(menu-item
- ,(purecopy "Wrap Between Words (Visual Line mode)")
+ ,(purecopy "Word Wrap (Visual Line mode)")
(lambda ()
(interactive)
(unless visual-line-mode
@@ -1274,7 +1274,7 @@ mail status in mode line"))
(define-key menu [cua-mode]
(menu-bar-make-mm-toggle
cua-mode
- "Use C-x/C-c/C-v Cut and Paste (CUA) Keys"
+ "Use CUA Keys (Cut/Paste with C-x/C-c/C-v)"
"Use C-z/C-x/C-c/C-v keys for undo/cut/copy/paste"
(:visible (or (not (boundp 'cua-enable-cua-keys))
cua-enable-cua-keys))))
@@ -1313,7 +1313,7 @@ mail status in mode line"))
(define-key menu [highlight-paren-mode]
(menu-bar-make-mm-toggle
show-paren-mode
- "Highlighting Matching Parenthesis"
+ "Highlight Matching Parentheses"
"Highlight matching/mismatched parentheses at cursor (Show Paren mode)"))
(define-key menu [transient-mark-mode]
(menu-bar-make-mm-toggle