[Emacs-diffs] Changes to emacs/lisp/menu-bar.el,v

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       08/04/10 07:51:57

Index: menu-bar.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/menu-bar.el,v
retrieving revision 1.327
retrieving revision 1.328
diff -u -b -r1.327 -r1.328
--- menu-bar.el 23 Mar 2008 11:44:23 -0000      1.327
+++ menu-bar.el 10 Apr 2008 07:51:56 -0000      1.328
@@ -1050,8 +1050,13 @@
   '(menu-item "Truncate Long Lines in this Buffer"
              toggle-truncate-lines
              :help "Truncate long lines on the screen"
-             :button (:toggle . truncate-lines)
-             :enable (menu-bar-menu-frame-live-and-visible-p)))
+             :button (:toggle . (if (or (window-full-width-p)
+                                        (not truncate-partial-width-windows))
+                                    truncate-lines
+                                  truncate-partial-width-windows))
+             :enable (and (menu-bar-menu-frame-live-and-visible-p)
+                          (or (window-full-width-p)
+                              (not truncate-partial-width-windows)))))
 
 (define-key menu-bar-options-menu [highlight-separator]
   '("--"))