(read_minibuf): Clean up the binding stack if

[bpt/emacs.git] / lisp / hl-line.el

diff --git a/lisp/hl-line.el b/lisp/hl-line.el
index 2e96bbb..2b2af4d 100644 (file)
--- a/lisp/hl-line.el
+++ b/lisp/hl-line.el
@@ -44,10 +44,13 @@
 ;; `hl-line-highlight', on `post-command-hook', activates it again
 ;; across the window width.
 
+;; You could make variable `hl-line-mode' buffer-local to avoid
+;; highlighting specific buffers.
+
 ;;; Code:
 
 (defgroup hl-line nil
-  "Highliight the current line."
+  "Highlight the current line."
   :version "21.1"
   :group 'editing)
 
@@ -57,18 +60,19 @@
   :group 'hl-line)
 
 (defvar hl-line-overlay nil)
-(make-variable-buffer-local 'hl-line-overlay)
 
 (defun hl-line-highlight ()
   "Active the Hl-Line overlay on the current line in the current window.
 \(Unless it's a minibuffer window.)"
-  (unless (window-minibuffer-p (selected-window)) ; silly in minibuffer
-    (unless hl-line-overlay            ; new overlay for this buffer
-      (setq hl-line-overlay (make-overlay 1 1))        ; to be moved
-      (overlay-put hl-line-overlay 'face hl-line-face))
-    (overlay-put hl-line-overlay 'window (selected-window))
-    (move-overlay hl-line-overlay
-                 (line-beginning-position) (1+ (line-end-position)))))
+  (when hl-line-mode                   ; Could be made buffer-local.
+    (unless (window-minibuffer-p (selected-window)) ; silly in minibuffer
+      (unless hl-line-overlay
+       (setq hl-line-overlay (make-overlay 1 1)) ; to be moved
+       (overlay-put hl-line-overlay 'face hl-line-face))
+      (overlay-put hl-line-overlay 'window (selected-window))
+      (move-overlay hl-line-overlay
+                   (line-beginning-position) (1+ (line-end-position))
+                   (current-buffer)))))
 
 (defun hl-line-unhighlight ()
   "Deactivate the Hl-Line overlay on the current line in the current window."
@@ -81,8 +85,7 @@
 With ARG, turn Hl-Line mode on if ARG is positive, off otherwise.
 Uses functions `hl-line-unhighlight' and `hl-line-highlight' on
 `pre-command-hook' and `post-command-hook'."
-  nil nil nil :global t
-  
+  :global t
   (if hl-line-mode
       (progn
        (add-hook 'pre-command-hook #'hl-line-unhighlight)