diff options
author | Philip Kaludercic <philipk@posteo.net> | 2022-10-15 17:38:30 +0200 |
---|---|---|
committer | Philip Kaludercic <philipk@posteo.net> | 2022-10-15 17:38:30 +0200 |
commit | 01e45efcd44e92dd259283df0e62653c7c20e9cc (patch) | |
tree | 552c1a6ce7d52b897cf5f089d6c589921efbe9bd /lisp/hl-line.el | |
parent | 982c0e6c15535defcf6ac3c4d4169708c60efc18 (diff) | |
parent | 5933055a3e7387b0095f0df7876a208ab15f4f45 (diff) | |
download | emacs-01e45efcd44e92dd259283df0e62653c7c20e9cc.tar.gz emacs-01e45efcd44e92dd259283df0e62653c7c20e9cc.tar.bz2 emacs-01e45efcd44e92dd259283df0e62653c7c20e9cc.zip |
Merge branch 'master' into feature/package+vc
Diffstat (limited to 'lisp/hl-line.el')
-rw-r--r-- | lisp/hl-line.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/hl-line.el b/lisp/hl-line.el index 693c94eea8c..87bea1017f1 100644 --- a/lisp/hl-line.el +++ b/lisp/hl-line.el @@ -156,7 +156,8 @@ line about point in the selected window only." :group 'hl-line ;; If the global mode is switched on, then `M-x hl-line-mode' should ;; switch the mode off in this buffer. - (when global-hl-line-mode + (when (and global-hl-line-mode + (eq arg 'toggle)) (setq hl-line-mode nil) (setq-local global-hl-line-mode nil) (global-hl-line-unhighlight)) |