[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r115890: Fix Bug#16183 about `global-hl-line-sticky-
From: |
Bastien Guerry |
Subject: |
[Emacs-diffs] trunk r115890: Fix Bug#16183 about `global-hl-line-sticky-flag'. |
Date: |
Mon, 06 Jan 2014 20:55:18 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 115890
revision-id: address@hidden
parent: address@hidden
committer: Bastien Guerry <address@hidden>
branch nick: trunk
timestamp: Mon 2014-01-06 21:54:37 +0100
message:
Fix Bug#16183 about `global-hl-line-sticky-flag'.
* hl-line.el (global-hl-line-overlay): Make a local variable.
(global-hl-line-overlays): New variable to store all overlays.
(global-hl-line-mode): Don't delete overlays from the current
buffer when `global-hl-line-sticky-flag' is non-nil.
(global-hl-line-highlight): Add new overlays to
`global-hl-line-overlays'.
(global-hl-line-unhighlight-all): New function to delete all
overlays when turning off `global-hl-line-mode'.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/hl-line.el hlline.el-20091113204419-o5vbwnq5f7feedwu-1318
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-01-06 19:29:39 +0000
+++ b/lisp/ChangeLog 2014-01-06 20:54:37 +0000
@@ -1,3 +1,15 @@
+2014-01-06 Bastien Guerry <address@hidden>
+
+ * hl-line.el (global-hl-line-overlay): Make a local variable.
+ (global-hl-line-overlays): New variable to store all overlays.
+ (global-hl-line-mode): Don't delete overlays from the current
+ buffer when `global-hl-line-sticky-flag' is non-nil.
+ (global-hl-line-highlight): Add new overlays to
+ `global-hl-line-overlays'.
+ (global-hl-line-unhighlight-all): New function to delete all
+ overlays when turning off `global-hl-line-mode'.
+ This fixes Bug#16183.
+
2014-01-06 Stefan Monnier <address@hidden>
* subr.el (set-transient-map): Fix nested case and docstring.
=== modified file 'lisp/hl-line.el'
--- a/lisp/hl-line.el 2014-01-01 07:43:34 +0000
+++ b/lisp/hl-line.el 2014-01-06 20:54:37 +0000
@@ -64,9 +64,14 @@
(defvar-local hl-line-overlay nil
"Overlay used by Hl-Line mode to highlight the current line.")
-(defvar global-hl-line-overlay nil
+(defvar-local global-hl-line-overlay nil
"Overlay used by Global-Hl-Line mode to highlight the current line.")
+(defvar global-hl-line-overlays nil
+ "Overlays used by Global-Hl-Line mode in various buffers.
+Global-Hl-Line keeps displaying one overlay in each buffer
+when `global-hl-line-sticky-flag' is non-nil.")
+
(defgroup hl-line nil
"Highlight the current line."
:version "21.1"
@@ -193,9 +198,14 @@
:group 'hl-line
(if global-hl-line-mode
(progn
- (add-hook 'pre-command-hook #'global-hl-line-unhighlight)
+ ;; In case `kill-all-local-variables' is called.
+ (add-hook 'change-major-mode-hook #'global-hl-line-unhighlight)
+ (if global-hl-line-sticky-flag
+ (remove-hook 'pre-command-hook #'global-hl-line-unhighlight)
+ (add-hook 'pre-command-hook #'global-hl-line-unhighlight))
+ (global-hl-line-highlight)
(add-hook 'post-command-hook #'global-hl-line-highlight))
- (global-hl-line-unhighlight)
+ (global-hl-line-unhighlight-all)
(remove-hook 'pre-command-hook #'global-hl-line-unhighlight)
(remove-hook 'post-command-hook #'global-hl-line-highlight)))
@@ -205,6 +215,8 @@
(unless (window-minibuffer-p)
(unless global-hl-line-overlay
(setq global-hl-line-overlay (hl-line-make-overlay))) ; To be moved.
+ (unless (member global-hl-line-overlay global-hl-line-overlays)
+ (push global-hl-line-overlay global-hl-line-overlays))
(overlay-put global-hl-line-overlay 'window
(unless global-hl-line-sticky-flag
(selected-window)))
@@ -215,6 +227,16 @@
(when global-hl-line-overlay
(delete-overlay global-hl-line-overlay)))
+(defun global-hl-line-unhighlight-all ()
+ "Deactivate all Global-Hl-Line overlays."
+ (mapc (lambda (ov)
+ (let ((ovb (overlay-buffer ov)))
+ (when (bufferp ovb)
+ (with-current-buffer ovb
+ (global-hl-line-unhighlight)))))
+ global-hl-line-overlays)
+ (setq global-hl-line-overlays nil))
+
(defun hl-line-move (overlay)
"Move the Hl-Line overlay.
If `hl-line-range-function' is non-nil, move the OVERLAY to the position
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r115890: Fix Bug#16183 about `global-hl-line-sticky-flag'.,
Bastien Guerry <=