(menu-bar-options-menu) <truncate-lines>:

Respect truncate-partial-width-windows in non-full windows, with regards to
:toggle and :enable state.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6f7c05ce28d66e101311bc7247db9f6cf03e58fb..84fa0a02a57485de87607208c559d9d7beb8c221 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -24,6 +24,10 @@
 
 2008-04-10  Glenn Morris  <rgm@gnu.org>
 
+       * menu-bar.el (menu-bar-options-menu) <truncate-lines>:
+       Respect truncate-partial-width-windows in non-full windows,
+       with regards to :toggle and :enable state.
+
        * simple.el (toggle-truncate-lines): Doc fix.
 
        * Makefile.in (MH_E_DIR): New variable.

diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 2eaed4c5e34e4fb659a786d877b8a9b5224d1984..00f76789b348d4a08b2ac35db6ab4c9453978021 100644 (file)
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -1050,8 +1050,13 @@ mail status in mode line"))
   '(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]
   '("--"))