diff options
| author | Juanma Barranquero | 2007-10-10 16:19:07 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2007-10-10 16:19:07 +0000 |
| commit | 17f6d0027b116f10479e542e158ceb0611360841 (patch) | |
| tree | f3717899d1ff2c5c12e56aba03270f21b37be9cd | |
| parent | 0870a421b12c5807f94fdb095ca685e39a99013e (diff) | |
| download | emacs-17f6d0027b116f10479e542e158ceb0611360841.tar.gz emacs-17f6d0027b116f10479e542e158ceb0611360841.zip | |
Change all instances of "Follow Mode" to "Follow mode" in docstrings and messages.
(follow-menu-filter): Fix arg passed to `bound-and-true-p'.
| -rw-r--r-- | lisp/follow.el | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/lisp/follow.el b/lisp/follow.el index e6538e5a350..a1a0c57c078 100644 --- a/lisp/follow.el +++ b/lisp/follow.el | |||
| @@ -37,7 +37,7 @@ | |||
| 37 | ;; | 37 | ;; |
| 38 | ;; * The windows always display adjacent sections of the buffer. | 38 | ;; * The windows always display adjacent sections of the buffer. |
| 39 | ;; This means that whenever one window is moved, all the | 39 | ;; This means that whenever one window is moved, all the |
| 40 | ;; others will follow. (Hence the name Follow Mode.) | 40 | ;; others will follow. (Hence the name Follow mode.) |
| 41 | ;; | 41 | ;; |
| 42 | ;; * Should the point (cursor) end up outside a window, another | 42 | ;; * Should the point (cursor) end up outside a window, another |
| 43 | ;; window displaying that point is selected, if possible. This | 43 | ;; window displaying that point is selected, if possible. This |
| @@ -149,15 +149,15 @@ | |||
| 149 | ;; The following is a list of commands useful when follow-mode is active. | 149 | ;; The following is a list of commands useful when follow-mode is active. |
| 150 | ;; | 150 | ;; |
| 151 | ;; follow-scroll-up C-c . C-v | 151 | ;; follow-scroll-up C-c . C-v |
| 152 | ;; Scroll text in a Follow Mode window chain up. | 152 | ;; Scroll text in a Follow mode window chain up. |
| 153 | ;; | 153 | ;; |
| 154 | ;; follow-scroll-down C-c . v | 154 | ;; follow-scroll-down C-c . v |
| 155 | ;; Like `follow-scroll-up', but in the other direction. | 155 | ;; Like `follow-scroll-up', but in the other direction. |
| 156 | ;; | 156 | ;; |
| 157 | ;; follow-delete-other-windows-and-split C-c . 1 | 157 | ;; follow-delete-other-windows-and-split C-c . 1 |
| 158 | ;; Maximize the visible area of the current buffer, | 158 | ;; Maximize the visible area of the current buffer, |
| 159 | ;; and enter Follow Mode. This is a very convenient | 159 | ;; and enter Follow mode. This is a very convenient |
| 160 | ;; way to start Follow Mode, hence we recomend that | 160 | ;; way to start Follow mode, hence we recomend that |
| 161 | ;; this command be added to the global keymap. | 161 | ;; this command be added to the global keymap. |
| 162 | ;; | 162 | ;; |
| 163 | ;; follow-recenter C-c . C-l | 163 | ;; follow-recenter C-c . C-l |
| @@ -330,7 +330,7 @@ After that, changing the prefix key requires manipulating keymaps." | |||
| 330 | 330 | ||
| 331 | (define-key mainmap follow-mode-prefix map) | 331 | (define-key mainmap follow-mode-prefix map) |
| 332 | 332 | ||
| 333 | ;; Replace the standard `end-of-buffer', when in Follow Mode. (I | 333 | ;; Replace the standard `end-of-buffer', when in Follow mode. (I |
| 334 | ;; don't see the point in trying to replace every function that | 334 | ;; don't see the point in trying to replace every function that |
| 335 | ;; could be enhanced in Follow mode. End-of-buffer is a special | 335 | ;; could be enhanced in Follow mode. End-of-buffer is a special |
| 336 | ;; case since it is very simple to define and it greatly enhances | 336 | ;; case since it is very simple to define and it greatly enhances |
| @@ -343,9 +343,9 @@ After that, changing the prefix key requires manipulating keymaps." | |||
| 343 | ;; When the mode is not activated, only one item is visible to activate | 343 | ;; When the mode is not activated, only one item is visible to activate |
| 344 | ;; the mode. | 344 | ;; the mode. |
| 345 | (defun follow-menu-filter (menu) | 345 | (defun follow-menu-filter (menu) |
| 346 | (if (bound-and-true-p 'follow-mode) | 346 | (if (bound-and-true-p follow-mode) |
| 347 | menu | 347 | menu |
| 348 | '(["Follow mode " follow-mode | 348 | '(["Follow mode" follow-mode |
| 349 | :style toggle :selected follow-mode]))) | 349 | :style toggle :selected follow-mode]))) |
| 350 | 350 | ||
| 351 | ;; If there is a `tools' menu, we use it. However, we can't add a | 351 | ;; If there is a `tools' menu, we use it. However, we can't add a |
| @@ -391,7 +391,7 @@ are \" Fw\", or simply \"\"." | |||
| 391 | :group 'follow) | 391 | :group 'follow) |
| 392 | 392 | ||
| 393 | (defcustom follow-intercept-processes (fboundp 'start-process) | 393 | (defcustom follow-intercept-processes (fboundp 'start-process) |
| 394 | "When non-nil, Follow Mode will monitor process output." | 394 | "When non-nil, Follow mode will monitor process output." |
| 395 | :type 'boolean | 395 | :type 'boolean |
| 396 | :group 'follow) | 396 | :group 'follow) |
| 397 | 397 | ||
| @@ -401,11 +401,11 @@ are \" Fw\", or simply \"\"." | |||
| 401 | A \"tail window\" is a window that displays only the end of | 401 | A \"tail window\" is a window that displays only the end of |
| 402 | the buffer. Normally it is practical for the user that empty | 402 | the buffer. Normally it is practical for the user that empty |
| 403 | windows are recentered automatically. However, when using | 403 | windows are recentered automatically. However, when using |
| 404 | Follow Mode it breaks the display when the end is displayed | 404 | Follow mode it breaks the display when the end is displayed |
| 405 | in a window \"above\" the last window. This is for | 405 | in a window \"above\" the last window. This is for |
| 406 | example the case when displaying a short page in info. | 406 | example the case when displaying a short page in info. |
| 407 | 407 | ||
| 408 | Must be set before Follow Mode is loaded. | 408 | Must be set before Follow mode is loaded. |
| 409 | 409 | ||
| 410 | Please note that it is not possible to fully prevent Emacs from | 410 | Please note that it is not possible to fully prevent Emacs from |
| 411 | recentering empty windows. Please report if you find a repeatable | 411 | recentering empty windows. Please report if you find a repeatable |
| @@ -494,7 +494,7 @@ of two major techniques: | |||
| 494 | 494 | ||
| 495 | * The windows always displays adjacent sections of the buffer. | 495 | * The windows always displays adjacent sections of the buffer. |
| 496 | This means that whenever one window is moved, all the | 496 | This means that whenever one window is moved, all the |
| 497 | others will follow. (Hence the name Follow Mode.) | 497 | others will follow. (Hence the name Follow mode.) |
| 498 | 498 | ||
| 499 | * Should the point (cursor) end up outside a window, another | 499 | * Should the point (cursor) end up outside a window, another |
| 500 | window displaying that point is selected, if possible. This | 500 | window displaying that point is selected, if possible. This |
| @@ -545,7 +545,7 @@ Keys specific to Follow mode: | |||
| 545 | (add-hook 'find-file-hook 'follow-find-file-hook t) | 545 | (add-hook 'find-file-hook 'follow-find-file-hook t) |
| 546 | 546 | ||
| 547 | (defun follow-find-file-hook () | 547 | (defun follow-find-file-hook () |
| 548 | "Find-file hook for Follow Mode. See the variable `follow-auto'." | 548 | "Find-file hook for Follow mode. See the variable `follow-auto'." |
| 549 | (if follow-auto (follow-mode t))) | 549 | (if follow-auto (follow-mode t))) |
| 550 | 550 | ||
| 551 | ;;}}} | 551 | ;;}}} |
| @@ -558,7 +558,7 @@ Keys specific to Follow mode: | |||
| 558 | 558 | ||
| 559 | ;;{{{ Scroll | 559 | ;;{{{ Scroll |
| 560 | 560 | ||
| 561 | ;; `scroll-up' and `-down', but for windows in Follow Mode. | 561 | ;; `scroll-up' and `-down', but for windows in Follow mode. |
| 562 | ;; | 562 | ;; |
| 563 | ;; Almost like the real thing, excpet when the cursor ends up outside | 563 | ;; Almost like the real thing, excpet when the cursor ends up outside |
| 564 | ;; the top or bottom... In our case however, we end up outside the | 564 | ;; the top or bottom... In our case however, we end up outside the |
| @@ -574,7 +574,7 @@ Keys specific to Follow mode: | |||
| 574 | ;; good redisplay abstraction.) | 574 | ;; good redisplay abstraction.) |
| 575 | 575 | ||
| 576 | (defun follow-scroll-up (&optional arg) | 576 | (defun follow-scroll-up (&optional arg) |
| 577 | "Scroll text in a Follow Mode window chain up. | 577 | "Scroll text in a Follow mode window chain up. |
| 578 | 578 | ||
| 579 | If called with no ARG, the `next-screen-context-lines' last lines of | 579 | If called with no ARG, the `next-screen-context-lines' last lines of |
| 580 | the bottom window in the chain will be visible in the top window. | 580 | the bottom window in the chain will be visible in the top window. |
| @@ -582,7 +582,7 @@ the bottom window in the chain will be visible in the top window. | |||
| 582 | If called with an argument, scroll ARG lines up. | 582 | If called with an argument, scroll ARG lines up. |
| 583 | Negative ARG means scroll downward. | 583 | Negative ARG means scroll downward. |
| 584 | 584 | ||
| 585 | Works like `scroll-up' when not in Follow Mode." | 585 | Works like `scroll-up' when not in Follow mode." |
| 586 | (interactive "P") | 586 | (interactive "P") |
| 587 | (cond ((not (and (boundp 'follow-mode) follow-mode)) | 587 | (cond ((not (and (boundp 'follow-mode) follow-mode)) |
| 588 | (scroll-up arg)) | 588 | (scroll-up arg)) |
| @@ -603,7 +603,7 @@ Works like `scroll-up' when not in Follow Mode." | |||
| 603 | 603 | ||
| 604 | 604 | ||
| 605 | (defun follow-scroll-down (&optional arg) | 605 | (defun follow-scroll-down (&optional arg) |
| 606 | "Scroll text in a Follow Mode window chain down. | 606 | "Scroll text in a Follow mode window chain down. |
| 607 | 607 | ||
| 608 | If called with no ARG, the `next-screen-context-lines' top lines of | 608 | If called with no ARG, the `next-screen-context-lines' top lines of |
| 609 | the top window in the chain will be visible in the bottom window. | 609 | the top window in the chain will be visible in the bottom window. |
| @@ -611,7 +611,7 @@ the top window in the chain will be visible in the bottom window. | |||
| 611 | If called with an argument, scroll ARG lines down. | 611 | If called with an argument, scroll ARG lines down. |
| 612 | Negative ARG means scroll upward. | 612 | Negative ARG means scroll upward. |
| 613 | 613 | ||
| 614 | Works like `scroll-up' when not in Follow Mode." | 614 | Works like `scroll-up' when not in Follow mode." |
| 615 | (interactive "P") | 615 | (interactive "P") |
| 616 | (cond ((not (and (boundp 'follow-mode) follow-mode)) | 616 | (cond ((not (and (boundp 'follow-mode) follow-mode)) |
| 617 | (scroll-up arg)) | 617 | (scroll-up arg)) |
| @@ -638,12 +638,12 @@ Works like `scroll-up' when not in Follow Mode." | |||
| 638 | 638 | ||
| 639 | ;;;###autoload | 639 | ;;;###autoload |
| 640 | (defun follow-delete-other-windows-and-split (&optional arg) | 640 | (defun follow-delete-other-windows-and-split (&optional arg) |
| 641 | "Create two side by side windows and enter Follow Mode. | 641 | "Create two side by side windows and enter Follow mode. |
| 642 | 642 | ||
| 643 | Execute this command to display as much as possible of the text | 643 | Execute this command to display as much as possible of the text |
| 644 | in the selected window. All other windows, in the current | 644 | in the selected window. All other windows, in the current |
| 645 | frame, are deleted and the selected window is split in two | 645 | frame, are deleted and the selected window is split in two |
| 646 | side-by-side windows. Follow Mode is activated, hence the | 646 | side-by-side windows. Follow mode is activated, hence the |
| 647 | two windows always will display two successive pages. | 647 | two windows always will display two successive pages. |
| 648 | \(If one window is moved, the other one will follow.) | 648 | \(If one window is moved, the other one will follow.) |
| 649 | 649 | ||
| @@ -671,7 +671,7 @@ in your `~/.emacs' file, replacing [f7] by your favourite key: | |||
| 671 | (follow-mode 1))) | 671 | (follow-mode 1))) |
| 672 | 672 | ||
| 673 | (defun follow-switch-to-buffer (buffer) | 673 | (defun follow-switch-to-buffer (buffer) |
| 674 | "Show BUFFER in all windows in the current Follow Mode window chain." | 674 | "Show BUFFER in all windows in the current Follow mode window chain." |
| 675 | (interactive "BSwitch to Buffer: ") | 675 | (interactive "BSwitch to Buffer: ") |
| 676 | (let ((orig-window (selected-window)) | 676 | (let ((orig-window (selected-window)) |
| 677 | (windows (follow-all-followers))) | 677 | (windows (follow-all-followers))) |
| @@ -699,7 +699,7 @@ Defaults to current buffer." | |||
| 699 | 699 | ||
| 700 | 700 | ||
| 701 | (defun follow-switch-to-current-buffer-all () | 701 | (defun follow-switch-to-current-buffer-all () |
| 702 | "Show current buffer in all windows on this frame, and enter Follow Mode. | 702 | "Show current buffer in all windows on this frame, and enter Follow mode. |
| 703 | 703 | ||
| 704 | To bind this command to a hotkey place the following line | 704 | To bind this command to a hotkey place the following line |
| 705 | in your `~/.emacs' file: | 705 | in your `~/.emacs' file: |
| @@ -796,10 +796,10 @@ Follow mode since the windows should always be aligned." | |||
| 796 | ;;{{{ End of buffer | 796 | ;;{{{ End of buffer |
| 797 | 797 | ||
| 798 | (defun follow-end-of-buffer (&optional arg) | 798 | (defun follow-end-of-buffer (&optional arg) |
| 799 | "Move point to the end of the buffer, Follow Mode style. | 799 | "Move point to the end of the buffer, Follow mode style. |
| 800 | 800 | ||
| 801 | If the end is not visible, it will be displayed in the last possible | 801 | If the end is not visible, it will be displayed in the last possible |
| 802 | window in the Follow Mode window chain. | 802 | window in the Follow mode window chain. |
| 803 | 803 | ||
| 804 | The mark is left at the previous position. With arg N, put point N/10 | 804 | The mark is left at the previous position. With arg N, put point N/10 |
| 805 | of the way from the true end." | 805 | of the way from the true end." |
| @@ -1315,7 +1315,7 @@ position of the first window. Otherwise it is a good guess." | |||
| 1315 | "Make sure windows displaying the end of a buffer aren't recentered. | 1315 | "Make sure windows displaying the end of a buffer aren't recentered. |
| 1316 | 1316 | ||
| 1317 | This is done by reading and rewriting the start position of | 1317 | This is done by reading and rewriting the start position of |
| 1318 | non-first windows in Follow Mode." | 1318 | non-first windows in Follow mode." |
| 1319 | (if follow-avoid-tail-recenter-p | 1319 | (if follow-avoid-tail-recenter-p |
| 1320 | (let* ((orig-buffer (current-buffer)) | 1320 | (let* ((orig-buffer (current-buffer)) |
| 1321 | (top (frame-first-window (selected-frame))) | 1321 | (top (frame-first-window (selected-frame))) |
| @@ -1607,7 +1607,7 @@ non-first windows in Follow Mode." | |||
| 1607 | (after | 1607 | (after |
| 1608 | ,(intern (concat "follow-" (symbol-name (car cmds)))) | 1608 | ,(intern (concat "follow-" (symbol-name (car cmds)))) |
| 1609 | activate) | 1609 | activate) |
| 1610 | "Adviced by Follow Mode." | 1610 | "Adviced by Follow mode." |
| 1611 | (follow-redraw-after-event (ad-get-arg 0)))) | 1611 | (follow-redraw-after-event (ad-get-arg 0)))) |
| 1612 | (setq cmds (cdr cmds)))) | 1612 | (setq cmds (cdr cmds)))) |
| 1613 | 1613 | ||
| @@ -1718,9 +1718,9 @@ WINDOW can be an object or a window." | |||
| 1718 | ;; filter... | 1718 | ;; filter... |
| 1719 | 1719 | ||
| 1720 | (defadvice set-process-filter (before follow-set-process-filter activate) | 1720 | (defadvice set-process-filter (before follow-set-process-filter activate) |
| 1721 | "Ensure process output will be displayed correctly in Follow Mode buffers. | 1721 | "Ensure process output will be displayed correctly in Follow mode buffers. |
| 1722 | 1722 | ||
| 1723 | Follow Mode inserts its own process filter to do its | 1723 | Follow mode inserts its own process filter to do its |
| 1724 | magic stuff before the real process filter is called." | 1724 | magic stuff before the real process filter is called." |
| 1725 | (if follow-intercept-processes | 1725 | (if follow-intercept-processes |
| 1726 | (progn | 1726 | (progn |
| @@ -1794,7 +1794,7 @@ magic stuff before the real process filter is called." | |||
| 1794 | (defun follow-intercept-process-output () | 1794 | (defun follow-intercept-process-output () |
| 1795 | "Intercept all active processes. | 1795 | "Intercept all active processes. |
| 1796 | 1796 | ||
| 1797 | This is needed so that Follow Mode can track all display events in the | 1797 | This is needed so that Follow mode can track all display events in the |
| 1798 | system. (See `follow-mode'.)" | 1798 | system. (See `follow-mode'.)" |
| 1799 | (interactive) | 1799 | (interactive) |
| 1800 | (let ((list (process-list))) | 1800 | (let ((list (process-list))) |
| @@ -1808,7 +1808,7 @@ system. (See `follow-mode'.)" | |||
| 1808 | 1808 | ||
| 1809 | 1809 | ||
| 1810 | (defun follow-stop-intercept-process-output () | 1810 | (defun follow-stop-intercept-process-output () |
| 1811 | "Stop Follow Mode from spying on processes. | 1811 | "Stop Follow mode from spying on processes. |
| 1812 | 1812 | ||
| 1813 | All current spypoints are removed and no new will be added. | 1813 | All current spypoints are removed and no new will be added. |
| 1814 | 1814 | ||
| @@ -2073,7 +2073,7 @@ report this using the `report-emacs-bug' function." | |||
| 2073 | ;;{{{ Tail window handling | 2073 | ;;{{{ Tail window handling |
| 2074 | 2074 | ||
| 2075 | ;; In Emacs (not XEmacs) windows showing nothing are sometimes | 2075 | ;; In Emacs (not XEmacs) windows showing nothing are sometimes |
| 2076 | ;; recentered. When in Follow Mode, this is not desirable for | 2076 | ;; recentered. When in Follow mode, this is not desirable for |
| 2077 | ;; non-first windows in the window chain. This section tries to | 2077 | ;; non-first windows in the window chain. This section tries to |
| 2078 | ;; make the windows stay where they should be. | 2078 | ;; make the windows stay where they should be. |
| 2079 | ;; | 2079 | ;; |
| @@ -2107,10 +2107,10 @@ report this using the `report-emacs-bug' function." | |||
| 2107 | 2107 | ||
| 2108 | (if follow-avoid-tail-recenter-p | 2108 | (if follow-avoid-tail-recenter-p |
| 2109 | (defadvice sit-for (before follow-sit-for activate) | 2109 | (defadvice sit-for (before follow-sit-for activate) |
| 2110 | "Adviced by Follow Mode. | 2110 | "Adviced by Follow mode. |
| 2111 | 2111 | ||
| 2112 | Avoid to recenter windows displaying only the end of a file as when | 2112 | Avoid to recenter windows displaying only the end of a file as when |
| 2113 | displaying a short file in two windows, using Follow Mode." | 2113 | displaying a short file in two windows, using Follow mode." |
| 2114 | (follow-avoid-tail-recenter))) | 2114 | (follow-avoid-tail-recenter))) |
| 2115 | 2115 | ||
| 2116 | 2116 | ||
| @@ -2120,7 +2120,7 @@ displaying a short file in two windows, using Follow Mode." | |||
| 2120 | (if (and follow-avoid-tail-recenter-p | 2120 | (if (and follow-avoid-tail-recenter-p |
| 2121 | (fboundp 'move-overlay)) | 2121 | (fboundp 'move-overlay)) |
| 2122 | (defadvice move-overlay (before follow-move-overlay activate) | 2122 | (defadvice move-overlay (before follow-move-overlay activate) |
| 2123 | "Adviced by Follow Mode. | 2123 | "Adviced by Follow mode. |
| 2124 | Don't recenter windows showing only the end of a buffer. | 2124 | Don't recenter windows showing only the end of a buffer. |
| 2125 | This prevents `mouse-drag-region' from messing things up." | 2125 | This prevents `mouse-drag-region' from messing things up." |
| 2126 | (follow-avoid-tail-recenter))) | 2126 | (follow-avoid-tail-recenter))) |