1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-26 19:18:50 +00:00

Don't end non-hook variable with "-hook" (Bug#26623)

* lisp/follow.el (follow-inside-post-command-hook-call): Renamed from
follow-inside-post-command-hook, update uses.
This commit is contained in:
Noam Postavsky 2017-05-20 19:11:51 -04:00
parent 7e5a8cdceb
commit abd098200b

View File

@ -340,7 +340,7 @@ property `follow-mode-use-cache' to non-nil.")
(defvar follow-inactive-menu nil (defvar follow-inactive-menu nil
"The menu visible when Follow mode is inactive.") "The menu visible when Follow mode is inactive.")
(defvar follow-inside-post-command-hook nil (defvar follow-inside-post-command-hook-call nil
"Non-nil when inside Follow modes `post-command-hook'. "Non-nil when inside Follow modes `post-command-hook'.
Used by `follow-window-size-change'.") Used by `follow-window-size-change'.")
@ -1277,7 +1277,7 @@ non-first windows in Follow mode."
(defun follow-post-command-hook () (defun follow-post-command-hook ()
"Ensure that the windows in Follow mode are adjacent after each command." "Ensure that the windows in Follow mode are adjacent after each command."
(unless (input-pending-p) (unless (input-pending-p)
(let ((follow-inside-post-command-hook t) (let ((follow-inside-post-command-hook-call t)
(win (selected-window))) (win (selected-window)))
;; Work in the selected window, not in the current buffer. ;; Work in the selected window, not in the current buffer.
(with-current-buffer (window-buffer win) (with-current-buffer (window-buffer win)
@ -1519,14 +1519,14 @@ non-first windows in Follow mode."
;; Since `follow-window-size-change' can be called indirectly from ;; Since `follow-window-size-change' can be called indirectly from
;; `follow-post-command-hook' we have a potential infinite loop. To ;; `follow-post-command-hook' we have a potential infinite loop. To
;; avoid this, we simply do not do anything in this situation. The ;; avoid this, we simply do not do anything in this situation. The
;; variable `follow-inside-post-command-hook' contains information ;; variable `follow-inside-post-command-hook-call' contains
;; about whether the execution actually is inside the ;; information about whether the execution actually is inside the
;; post-command-hook or not. ;; post-command-hook or not.
(defun follow-window-size-change (frame) (defun follow-window-size-change (frame)
"Redraw all windows in FRAME, when in Follow mode." "Redraw all windows in FRAME, when in Follow mode."
;; Below, we call `post-command-hook'. Avoid an infloop. ;; Below, we call `post-command-hook'. Avoid an infloop.
(unless follow-inside-post-command-hook (unless follow-inside-post-command-hook-call
(save-current-buffer (save-current-buffer
(let ((orig-frame (selected-frame))) (let ((orig-frame (selected-frame)))
(select-frame frame) (select-frame frame)