diff options
| author | Noam Postavsky | 2017-05-20 19:11:51 -0400 |
|---|---|---|
| committer | Noam Postavsky | 2017-05-20 19:13:57 -0400 |
| commit | abd098200bfba2577dfff800f27d5474f13cc1f3 (patch) | |
| tree | 9a00e1708b879c68abaafdaba8df2c6234d1ee09 | |
| parent | 7e5a8cdceb408077df78b1ea810b1f5d4657303d (diff) | |
| download | emacs-abd098200bfba2577dfff800f27d5474f13cc1f3.tar.gz emacs-abd098200bfba2577dfff800f27d5474f13cc1f3.zip | |
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.
| -rw-r--r-- | lisp/follow.el | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/follow.el b/lisp/follow.el index db3b2821a56..5dd74f37a18 100644 --- a/lisp/follow.el +++ b/lisp/follow.el | |||
| @@ -340,7 +340,7 @@ property `follow-mode-use-cache' to non-nil.") | |||
| 340 | (defvar follow-inactive-menu nil | 340 | (defvar follow-inactive-menu nil |
| 341 | "The menu visible when Follow mode is inactive.") | 341 | "The menu visible when Follow mode is inactive.") |
| 342 | 342 | ||
| 343 | (defvar follow-inside-post-command-hook nil | 343 | (defvar follow-inside-post-command-hook-call nil |
| 344 | "Non-nil when inside Follow modes `post-command-hook'. | 344 | "Non-nil when inside Follow modes `post-command-hook'. |
| 345 | Used by `follow-window-size-change'.") | 345 | Used by `follow-window-size-change'.") |
| 346 | 346 | ||
| @@ -1277,7 +1277,7 @@ non-first windows in Follow mode." | |||
| 1277 | (defun follow-post-command-hook () | 1277 | (defun follow-post-command-hook () |
| 1278 | "Ensure that the windows in Follow mode are adjacent after each command." | 1278 | "Ensure that the windows in Follow mode are adjacent after each command." |
| 1279 | (unless (input-pending-p) | 1279 | (unless (input-pending-p) |
| 1280 | (let ((follow-inside-post-command-hook t) | 1280 | (let ((follow-inside-post-command-hook-call t) |
| 1281 | (win (selected-window))) | 1281 | (win (selected-window))) |
| 1282 | ;; Work in the selected window, not in the current buffer. | 1282 | ;; Work in the selected window, not in the current buffer. |
| 1283 | (with-current-buffer (window-buffer win) | 1283 | (with-current-buffer (window-buffer win) |
| @@ -1519,14 +1519,14 @@ non-first windows in Follow mode." | |||
| 1519 | ;; Since `follow-window-size-change' can be called indirectly from | 1519 | ;; Since `follow-window-size-change' can be called indirectly from |
| 1520 | ;; `follow-post-command-hook' we have a potential infinite loop. To | 1520 | ;; `follow-post-command-hook' we have a potential infinite loop. To |
| 1521 | ;; avoid this, we simply do not do anything in this situation. The | 1521 | ;; avoid this, we simply do not do anything in this situation. The |
| 1522 | ;; variable `follow-inside-post-command-hook' contains information | 1522 | ;; variable `follow-inside-post-command-hook-call' contains |
| 1523 | ;; about whether the execution actually is inside the | 1523 | ;; information about whether the execution actually is inside the |
| 1524 | ;; post-command-hook or not. | 1524 | ;; post-command-hook or not. |
| 1525 | 1525 | ||
| 1526 | (defun follow-window-size-change (frame) | 1526 | (defun follow-window-size-change (frame) |
| 1527 | "Redraw all windows in FRAME, when in Follow mode." | 1527 | "Redraw all windows in FRAME, when in Follow mode." |
| 1528 | ;; Below, we call `post-command-hook'. Avoid an infloop. | 1528 | ;; Below, we call `post-command-hook'. Avoid an infloop. |
| 1529 | (unless follow-inside-post-command-hook | 1529 | (unless follow-inside-post-command-hook-call |
| 1530 | (save-current-buffer | 1530 | (save-current-buffer |
| 1531 | (let ((orig-frame (selected-frame))) | 1531 | (let ((orig-frame (selected-frame))) |
| 1532 | (select-frame frame) | 1532 | (select-frame frame) |