*** empty log message ***

[gnu-emacs] / lisp / menu-bar.el

diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index c75f92bc623dfd103cc4ba71d0ffe0e073c2c601..2c08e4f5b668c1518341eccfb96c027c8356abdc 100644 (file)
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -72,6 +72,8 @@ A large number or nil slows down menu responsiveness."
   '("--"))
 
 (define-key menu-bar-tools-menu [calendar] '("Display Calendar" . calendar))
+(define-key menu-bar-tools-menu [speedbar]
+  '("Display Speedbar" . speedbar-frame-mode))
 (define-key menu-bar-tools-menu [compose-mail] '("Send Mail" . compose-mail))
 (define-key menu-bar-tools-menu [rmail] '("Read Mail" . rmail))
 (define-key menu-bar-tools-menu [gnus] '("Read Net News" . gnus))
@@ -309,7 +311,7 @@ A large number or nil slows down menu responsiveness."
      '(or (x-selection-exists-p) (x-selection-exists-p 'CLIPBOARD)))
 
 (defun clipboard-yank ()
-  "Reinsert the last stretch of killed text, or the clipboard contents."
+  "Insert the clipboard contents, or the last stretch of killed text."
   (interactive)
   (let ((x-select-enable-clipboard t))
     (yank)))
@@ -418,6 +420,12 @@ Do the same for the keys of the same name."
   (menu-bar-make-toggle toggle-case-fold-search case-fold-search
                        "Case folding in searches"
                        "Case folding in searches %s"))
+(define-key menu-bar-options-menu [truncate-lines]
+  (menu-bar-make-toggle
+   toggle-truncate-lines truncate-lines
+   "Line Truncation" "Line Truncation %s"
+   (prog1 (setq truncate-lines (not truncate-lines))
+     (set-buffer-modified-p (buffer-modified-p)))))
 (define-key menu-bar-options-menu [transient-mark-mode]
   (menu-bar-make-toggle toggle-transient-mark-mode transient-mark-mode
                        "Transient Mark Mode (highlights region)"
@@ -827,8 +835,8 @@ Do the same for the keys of the same name."
   "Toggle display of a menu bar on each frame.
 This command applies to all frames that exist and frames to be
 created in the future.
-With a numeric argument, if the argument is negative,
-turn off menu bars; otherwise, turn on menu bars."
+With a numeric argument, if the argument is positive,
+turn on menu bars; otherwise, turn off menu bars."
  (interactive "P")
 
   ;; Make menu-bar-mode and default-frame-alist consistent.