# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1207813916 0
# Node ID a505b9f92df3f6a55e14ac130af53033440e2c4c
# Parent  e03345b7622b0bcb8b1b5f6c4f76054b670ce154
(menu-bar-options-menu) <truncate-lines>:
Respect truncate-partial-width-windows in non-full windows, with regards to
:toggle and :enable state.

diff -r e03345b7622b -r a505b9f92df3 lisp/menu-bar.el
--- a/lisp/menu-bar.el	Thu Apr 10 07:49:07 2008 +0000
+++ b/lisp/menu-bar.el	Thu Apr 10 07:51:56 2008 +0000
@@ -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]
   '("--"))