Re: Emacs master breaks wl again

Herbert J Skuhra wrote:
> 
> Hi,
> the below commit breaks Wanderlust:
> 
> commit 73d47d22197175f08b2dd62e76d7138872e611d2
> Author: Mark Oteiza
> Date:   Mon Nov 7 21:31:47 2016 -0500
> 
>     Remove obsolete default-FOO variables
> 
> wl-vars.el uses default-truncate-lines.
> 
> Should this be changed to:

Or simply:

diff --git a/wl/wl-draft.el b/wl/wl-draft.el
index f809560..bfb7bc2 100644
--- a/wl/wl-draft.el
+++ b/wl/wl-draft.el
@@ -1755,7 +1755,6 @@ If KILL-WHEN-DONE is non-nil, current draft buffer is killed"
     (set-buffer-multibyte t)           ; draft buffer is always multibyte.
     (make-local-variable 'truncate-partial-width-windows)
     (setq truncate-partial-width-windows nil)
-    (setq truncate-lines wl-draft-truncate-lines)
     (setq wl-sent-message-via nil)
     (setq wl-sent-message-queued nil)
     (setq wl-draft-config-exec-flag t)
@@ -2012,7 +2011,6 @@ If KILL-WHEN-DONE is non-nil, current draft buffer is killed"
     (wl-draft-mode)
     (make-local-variable 'truncate-partial-width-windows)
     (setq truncate-partial-width-windows nil)
-    (setq truncate-lines wl-draft-truncate-lines)
     (setq wl-sent-message-via nil)
     (setq wl-sent-message-queued nil)
     (wl-draft-config-info-operation number 'load)
diff --git a/wl/wl-message.el b/wl/wl-message.el
index 45cdaa8..10279c6 100644
--- a/wl/wl-message.el
+++ b/wl/wl-message.el
@@ -498,7 +498,6 @@ Returns non-nil if bottom of message."
     (wl-deactivate-region)
     (make-local-variable 'truncate-partial-width-windows)
     (setq truncate-partial-width-windows nil)
-    (setq truncate-lines wl-message-truncate-lines)
     (setq buffer-read-only nil)
     (setq wl-message-buffer-cur-summary-buffer summary-buf)
     (setq wl-message-buffer-cur-folder (elmo-folder-name-internal folder))
diff --git a/wl/wl-vars.el b/wl/wl-vars.el
index 607aba9..5829521 100644
--- a/wl/wl-vars.el
+++ b/wl/wl-vars.el
@@ -1790,17 +1790,6 @@ which are replaced by the given information:
   :group 'wl-pref
   :type 'string)

-(defcustom wl-message-truncate-lines default-truncate-lines
-  "*Truncate lines in Message Buffer."
-  :type 'boolean
-  :group 'wl-pref)
-
-(defcustom wl-draft-truncate-lines default-truncate-lines
-  "*Truncate lines in Draft Buffer."
-  :type 'boolean
-  :group 'wl-draft
-  :group 'wl-pref)
-

--
Herbert