From: Richard M. Stallman <rms@gnu.org>
Date: Fri, 9 Jul 1999 18:00:24 +0000 (+0000)
Subject: (hscroll-minibuffer-hook): New function.
X-Git-Tag: emacs-20.4~10
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f165ac6642751893b53f5c8e9ebaddb9fe3e20a9;p=emacs.git

(hscroll-minibuffer-hook): New function.
(hscroll-global-mode): Add and remove that hook.
Set hscroll-old-truncate-was-global's default value.
---

diff --git a/lisp/hscroll.el b/lisp/hscroll.el
index 04c582fbee1..1afce940556 100644
--- a/lisp/hscroll.el
+++ b/lisp/hscroll.el
@@ -196,20 +196,25 @@ will have no effect on it).
 	    ;; it was off
 	    (progn
 	      (setq hscroll-old-truncate-default (default-value truncate-lines))
-	      (setq hscroll-old-truncate-was-global t)
+	      (setq-default hscroll-old-truncate-was-global t)
 	      (setq-default truncate-lines t)
+	      (add-hook 'minibuffer-setup-hook 'hscroll-minibuffer-hook)
               (setq hscroll-timer
                     (run-with-idle-timer 0 t 'hscroll-window-maybe))))
       ;; turn it off
       (if hscroll-mode
 	  ;; it was on
 	  (progn
+	    (remove-hook 'minibuffer-setup-hook 'hscroll-minibuffer-hook)
 	    (setq-default truncate-lines hscroll-old-truncate-default)
             (cancel-timer hscroll-timer))))
 
     (setq-default hscroll-mode newmode)
     (force-mode-line-update t)))
 
+(defun hscroll-minibuffer-hook ()
+  (setq truncate-lines hscroll-old-truncate-default))
+
 (defun hscroll-window-maybe ()
   "Scroll horizontally if point is off or nearly off the edge of the window.
 This is called automatically when in HScroll mode, but it can be explicitly