diff options
| author | Juanma Barranquero | 2007-10-10 16:29:07 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2007-10-10 16:29:07 +0000 |
| commit | d9f555a19a50feb07c4f4230c73b0d2ba577aba8 (patch) | |
| tree | e631646d824f2443b214a84da8fa73e7a7d50706 | |
| parent | b73f65b69d2a5cb7bb09d9d88ea2e5a670fc37ff (diff) | |
| download | emacs-d9f555a19a50feb07c4f4230c73b0d2ba577aba8.tar.gz emacs-d9f555a19a50feb07c4f4230c73b0d2ba577aba8.zip | |
Change all instances of "Follow Mode" to "Follow mode" in docstrings and messages.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/follow.el | 62 |
2 files changed, 36 insertions, 31 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 37cbe9e71a7..dcf00e9f448 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2007-10-10 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * follow.el: Change all instances of "Follow Mode" to "Follow | ||
| 4 | mode" in docstrings and messages. | ||
| 5 | |||
| 1 | 2007-10-09 Juanma Barranquero <lekktu@gmail.com> | 6 | 2007-10-09 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 7 | ||
| 3 | * faces.el (face-font-selection-order): Doc fix. | 8 | * faces.el (face-font-selection-order): Doc fix. |
diff --git a/lisp/follow.el b/lisp/follow.el index ad952d386fa..91713aa6e42 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 |
| @@ -328,7 +328,7 @@ After that, changing the prefix key requires manipulating keymaps." | |||
| 328 | 328 | ||
| 329 | (define-key mainmap follow-mode-prefix map) | 329 | (define-key mainmap follow-mode-prefix map) |
| 330 | 330 | ||
| 331 | ;; Replace the standard `end-of-buffer', when in Follow Mode. (I | 331 | ;; Replace the standard `end-of-buffer', when in Follow mode. (I |
| 332 | ;; don't see the point in trying to replace every function that | 332 | ;; don't see the point in trying to replace every function that |
| 333 | ;; could be enhanced in Follow mode. End-of-buffer is a special | 333 | ;; could be enhanced in Follow mode. End-of-buffer is a special |
| 334 | ;; case since it is very simple to define and it greatly enhances | 334 | ;; case since it is very simple to define and it greatly enhances |
| @@ -467,7 +467,7 @@ are \" Fw\", or simply \"\"." | |||
| 467 | :group 'follow) | 467 | :group 'follow) |
| 468 | 468 | ||
| 469 | (defcustom follow-intercept-processes (fboundp 'start-process) | 469 | (defcustom follow-intercept-processes (fboundp 'start-process) |
| 470 | "When non-nil, Follow Mode will monitor process output." | 470 | "When non-nil, Follow mode will monitor process output." |
| 471 | :type 'boolean | 471 | :type 'boolean |
| 472 | :group 'follow) | 472 | :group 'follow) |
| 473 | 473 | ||
| @@ -477,11 +477,11 @@ are \" Fw\", or simply \"\"." | |||
| 477 | A \"tail window\" is a window that displays only the end of | 477 | A \"tail window\" is a window that displays only the end of |
| 478 | the buffer. Normally it is practical for the user that empty | 478 | the buffer. Normally it is practical for the user that empty |
| 479 | windows are recentered automatically. However, when using | 479 | windows are recentered automatically. However, when using |
| 480 | Follow Mode it breaks the display when the end is displayed | 480 | Follow mode it breaks the display when the end is displayed |
| 481 | in a window \"above\" the last window. This is for | 481 | in a window \"above\" the last window. This is for |
| 482 | example the case when displaying a short page in info. | 482 | example the case when displaying a short page in info. |
| 483 | 483 | ||
| 484 | Must be set before Follow Mode is loaded. | 484 | Must be set before Follow mode is loaded. |
| 485 | 485 | ||
| 486 | Please note that it is not possible to fully prevent Emacs from | 486 | Please note that it is not possible to fully prevent Emacs from |
| 487 | recentering empty windows. Please report if you find a repeatable | 487 | recentering empty windows. Please report if you find a repeatable |
| @@ -572,7 +572,7 @@ of two major techniques: | |||
| 572 | 572 | ||
| 573 | * The windows always displays adjacent sections of the buffer. | 573 | * The windows always displays adjacent sections of the buffer. |
| 574 | This means that whenever one window is moved, all the | 574 | This means that whenever one window is moved, all the |
| 575 | others will follow. (Hence the name Follow Mode.) | 575 | others will follow. (Hence the name Follow mode.) |
| 576 | 576 | ||
| 577 | * Should the point (cursor) end up outside a window, another | 577 | * Should the point (cursor) end up outside a window, another |
| 578 | window displaying that point is selected, if possible. This | 578 | window displaying that point is selected, if possible. This |
| @@ -623,7 +623,7 @@ Keys specific to Follow mode: | |||
| 623 | (add-hook 'find-file-hook 'follow-find-file-hook t) | 623 | (add-hook 'find-file-hook 'follow-find-file-hook t) |
| 624 | 624 | ||
| 625 | (defun follow-find-file-hook () | 625 | (defun follow-find-file-hook () |
| 626 | "Find-file hook for Follow Mode. See the variable `follow-auto'." | 626 | "Find-file hook for Follow mode. See the variable `follow-auto'." |
| 627 | (if follow-auto (follow-mode t))) | 627 | (if follow-auto (follow-mode t))) |
| 628 | 628 | ||
| 629 | ;;}}} | 629 | ;;}}} |
| @@ -636,7 +636,7 @@ Keys specific to Follow mode: | |||
| 636 | 636 | ||
| 637 | ;;{{{ Scroll | 637 | ;;{{{ Scroll |
| 638 | 638 | ||
| 639 | ;; `scroll-up' and `-down', but for windows in Follow Mode. | 639 | ;; `scroll-up' and `-down', but for windows in Follow mode. |
| 640 | ;; | 640 | ;; |
| 641 | ;; Almost like the real thing, excpet when the cursor ends up outside | 641 | ;; Almost like the real thing, excpet when the cursor ends up outside |
| 642 | ;; the top or bottom... In our case however, we end up outside the | 642 | ;; the top or bottom... In our case however, we end up outside the |
| @@ -652,7 +652,7 @@ Keys specific to Follow mode: | |||
| 652 | ;; good redisplay abstraction.) | 652 | ;; good redisplay abstraction.) |
| 653 | 653 | ||
| 654 | (defun follow-scroll-up (&optional arg) | 654 | (defun follow-scroll-up (&optional arg) |
| 655 | "Scroll text in a Follow Mode window chain up. | 655 | "Scroll text in a Follow mode window chain up. |
| 656 | 656 | ||
| 657 | If called with no ARG, the `next-screen-context-lines' last lines of | 657 | If called with no ARG, the `next-screen-context-lines' last lines of |
| 658 | the bottom window in the chain will be visible in the top window. | 658 | the bottom window in the chain will be visible in the top window. |
| @@ -660,7 +660,7 @@ the bottom window in the chain will be visible in the top window. | |||
| 660 | If called with an argument, scroll ARG lines up. | 660 | If called with an argument, scroll ARG lines up. |
| 661 | Negative ARG means scroll downward. | 661 | Negative ARG means scroll downward. |
| 662 | 662 | ||
| 663 | Works like `scroll-up' when not in Follow Mode." | 663 | Works like `scroll-up' when not in Follow mode." |
| 664 | (interactive "P") | 664 | (interactive "P") |
| 665 | (cond ((not (and (boundp 'follow-mode) follow-mode)) | 665 | (cond ((not (and (boundp 'follow-mode) follow-mode)) |
| 666 | (scroll-up arg)) | 666 | (scroll-up arg)) |
| @@ -681,7 +681,7 @@ Works like `scroll-up' when not in Follow Mode." | |||
| 681 | 681 | ||
| 682 | 682 | ||
| 683 | (defun follow-scroll-down (&optional arg) | 683 | (defun follow-scroll-down (&optional arg) |
| 684 | "Scroll text in a Follow Mode window chain down. | 684 | "Scroll text in a Follow mode window chain down. |
| 685 | 685 | ||
| 686 | If called with no ARG, the `next-screen-context-lines' top lines of | 686 | If called with no ARG, the `next-screen-context-lines' top lines of |
| 687 | the top window in the chain will be visible in the bottom window. | 687 | the top window in the chain will be visible in the bottom window. |
| @@ -689,7 +689,7 @@ the top window in the chain will be visible in the bottom window. | |||
| 689 | If called with an argument, scroll ARG lines down. | 689 | If called with an argument, scroll ARG lines down. |
| 690 | Negative ARG means scroll upward. | 690 | Negative ARG means scroll upward. |
| 691 | 691 | ||
| 692 | Works like `scroll-up' when not in Follow Mode." | 692 | Works like `scroll-up' when not in Follow mode." |
| 693 | (interactive "P") | 693 | (interactive "P") |
| 694 | (cond ((not (and (boundp 'follow-mode) follow-mode)) | 694 | (cond ((not (and (boundp 'follow-mode) follow-mode)) |
| 695 | (scroll-up arg)) | 695 | (scroll-up arg)) |
| @@ -716,12 +716,12 @@ Works like `scroll-up' when not in Follow Mode." | |||
| 716 | 716 | ||
| 717 | ;;;###autoload | 717 | ;;;###autoload |
| 718 | (defun follow-delete-other-windows-and-split (&optional arg) | 718 | (defun follow-delete-other-windows-and-split (&optional arg) |
| 719 | "Create two side by side windows and enter Follow Mode. | 719 | "Create two side by side windows and enter Follow mode. |
| 720 | 720 | ||
| 721 | Execute this command to display as much as possible of the text | 721 | Execute this command to display as much as possible of the text |
| 722 | in the selected window. All other windows, in the current | 722 | in the selected window. All other windows, in the current |
| 723 | frame, are deleted and the selected window is split in two | 723 | frame, are deleted and the selected window is split in two |
| 724 | side-by-side windows. Follow Mode is activated, hence the | 724 | side-by-side windows. Follow mode is activated, hence the |
| 725 | two windows always will display two successive pages. | 725 | two windows always will display two successive pages. |
| 726 | \(If one window is moved, the other one will follow.) | 726 | \(If one window is moved, the other one will follow.) |
| 727 | 727 | ||
| @@ -749,7 +749,7 @@ in your `~/.emacs' file, replacing [f7] by your favourite key: | |||
| 749 | (follow-mode 1))) | 749 | (follow-mode 1))) |
| 750 | 750 | ||
| 751 | (defun follow-switch-to-buffer (buffer) | 751 | (defun follow-switch-to-buffer (buffer) |
| 752 | "Show BUFFER in all windows in the current Follow Mode window chain." | 752 | "Show BUFFER in all windows in the current Follow mode window chain." |
| 753 | (interactive "BSwitch to Buffer: ") | 753 | (interactive "BSwitch to Buffer: ") |
| 754 | (let ((orig-window (selected-window)) | 754 | (let ((orig-window (selected-window)) |
| 755 | (windows (follow-all-followers))) | 755 | (windows (follow-all-followers))) |
| @@ -777,7 +777,7 @@ Defaults to current buffer." | |||
| 777 | 777 | ||
| 778 | 778 | ||
| 779 | (defun follow-switch-to-current-buffer-all () | 779 | (defun follow-switch-to-current-buffer-all () |
| 780 | "Show current buffer in all windows on this frame, and enter Follow Mode. | 780 | "Show current buffer in all windows on this frame, and enter Follow mode. |
| 781 | 781 | ||
| 782 | To bind this command to a hotkey place the following line | 782 | To bind this command to a hotkey place the following line |
| 783 | in your `~/.emacs' file: | 783 | in your `~/.emacs' file: |
| @@ -874,10 +874,10 @@ Follow mode since the windows should always be aligned." | |||
| 874 | ;;{{{ End of buffer | 874 | ;;{{{ End of buffer |
| 875 | 875 | ||
| 876 | (defun follow-end-of-buffer (&optional arg) | 876 | (defun follow-end-of-buffer (&optional arg) |
| 877 | "Move point to the end of the buffer, Follow Mode style. | 877 | "Move point to the end of the buffer, Follow mode style. |
| 878 | 878 | ||
| 879 | If the end is not visible, it will be displayed in the last possible | 879 | If the end is not visible, it will be displayed in the last possible |
| 880 | window in the Follow Mode window chain. | 880 | window in the Follow mode window chain. |
| 881 | 881 | ||
| 882 | The mark is left at the previous position. With arg N, put point N/10 | 882 | The mark is left at the previous position. With arg N, put point N/10 |
| 883 | of the way from the true end." | 883 | of the way from the true end." |
| @@ -1393,7 +1393,7 @@ position of the first window. Otherwise it is a good guess." | |||
| 1393 | "Make sure windows displaying the end of a buffer aren't recentered. | 1393 | "Make sure windows displaying the end of a buffer aren't recentered. |
| 1394 | 1394 | ||
| 1395 | This is done by reading and rewriting the start position of | 1395 | This is done by reading and rewriting the start position of |
| 1396 | non-first windows in Follow Mode." | 1396 | non-first windows in Follow mode." |
| 1397 | (if follow-avoid-tail-recenter-p | 1397 | (if follow-avoid-tail-recenter-p |
| 1398 | (let* ((orig-buffer (current-buffer)) | 1398 | (let* ((orig-buffer (current-buffer)) |
| 1399 | (top (frame-first-window (selected-frame))) | 1399 | (top (frame-first-window (selected-frame))) |
| @@ -1685,7 +1685,7 @@ non-first windows in Follow Mode." | |||
| 1685 | (after | 1685 | (after |
| 1686 | ,(intern (concat "follow-" (symbol-name (car cmds)))) | 1686 | ,(intern (concat "follow-" (symbol-name (car cmds)))) |
| 1687 | activate) | 1687 | activate) |
| 1688 | "Adviced by Follow Mode." | 1688 | "Adviced by Follow mode." |
| 1689 | (follow-redraw-after-event (ad-get-arg 0)))) | 1689 | (follow-redraw-after-event (ad-get-arg 0)))) |
| 1690 | (setq cmds (cdr cmds)))) | 1690 | (setq cmds (cdr cmds)))) |
| 1691 | 1691 | ||
| @@ -1796,9 +1796,9 @@ WINDOW can be an object or a window." | |||
| 1796 | ;; filter... | 1796 | ;; filter... |
| 1797 | 1797 | ||
| 1798 | (defadvice set-process-filter (before follow-set-process-filter activate) | 1798 | (defadvice set-process-filter (before follow-set-process-filter activate) |
| 1799 | "Ensure process output will be displayed correctly in Follow Mode buffers. | 1799 | "Ensure process output will be displayed correctly in Follow mode buffers. |
| 1800 | 1800 | ||
| 1801 | Follow Mode inserts its own process filter to do its | 1801 | Follow mode inserts its own process filter to do its |
| 1802 | magic stuff before the real process filter is called." | 1802 | magic stuff before the real process filter is called." |
| 1803 | (if follow-intercept-processes | 1803 | (if follow-intercept-processes |
| 1804 | (progn | 1804 | (progn |
| @@ -1872,7 +1872,7 @@ magic stuff before the real process filter is called." | |||
| 1872 | (defun follow-intercept-process-output () | 1872 | (defun follow-intercept-process-output () |
| 1873 | "Intercept all active processes. | 1873 | "Intercept all active processes. |
| 1874 | 1874 | ||
| 1875 | This is needed so that Follow Mode can track all display events in the | 1875 | This is needed so that Follow mode can track all display events in the |
| 1876 | system. (See `follow-mode'.)" | 1876 | system. (See `follow-mode'.)" |
| 1877 | (interactive) | 1877 | (interactive) |
| 1878 | (let ((list (process-list))) | 1878 | (let ((list (process-list))) |
| @@ -1886,7 +1886,7 @@ system. (See `follow-mode'.)" | |||
| 1886 | 1886 | ||
| 1887 | 1887 | ||
| 1888 | (defun follow-stop-intercept-process-output () | 1888 | (defun follow-stop-intercept-process-output () |
| 1889 | "Stop Follow Mode from spying on processes. | 1889 | "Stop Follow mode from spying on processes. |
| 1890 | 1890 | ||
| 1891 | All current spypoints are removed and no new will be added. | 1891 | All current spypoints are removed and no new will be added. |
| 1892 | 1892 | ||
| @@ -2151,7 +2151,7 @@ report this using the `report-emacs-bug' function." | |||
| 2151 | ;;{{{ Tail window handling | 2151 | ;;{{{ Tail window handling |
| 2152 | 2152 | ||
| 2153 | ;; In Emacs (not XEmacs) windows showing nothing are sometimes | 2153 | ;; In Emacs (not XEmacs) windows showing nothing are sometimes |
| 2154 | ;; recentered. When in Follow Mode, this is not desirable for | 2154 | ;; recentered. When in Follow mode, this is not desirable for |
| 2155 | ;; non-first windows in the window chain. This section tries to | 2155 | ;; non-first windows in the window chain. This section tries to |
| 2156 | ;; make the windows stay where they should be. | 2156 | ;; make the windows stay where they should be. |
| 2157 | ;; | 2157 | ;; |
| @@ -2185,10 +2185,10 @@ report this using the `report-emacs-bug' function." | |||
| 2185 | 2185 | ||
| 2186 | (if follow-avoid-tail-recenter-p | 2186 | (if follow-avoid-tail-recenter-p |
| 2187 | (defadvice sit-for (before follow-sit-for activate) | 2187 | (defadvice sit-for (before follow-sit-for activate) |
| 2188 | "Adviced by Follow Mode. | 2188 | "Adviced by Follow mode. |
| 2189 | 2189 | ||
| 2190 | Avoid to recenter windows displaying only the end of a file as when | 2190 | Avoid to recenter windows displaying only the end of a file as when |
| 2191 | displaying a short file in two windows, using Follow Mode." | 2191 | displaying a short file in two windows, using Follow mode." |
| 2192 | (follow-avoid-tail-recenter))) | 2192 | (follow-avoid-tail-recenter))) |
| 2193 | 2193 | ||
| 2194 | 2194 | ||
| @@ -2198,7 +2198,7 @@ displaying a short file in two windows, using Follow Mode." | |||
| 2198 | (if (and follow-avoid-tail-recenter-p | 2198 | (if (and follow-avoid-tail-recenter-p |
| 2199 | (fboundp 'move-overlay)) | 2199 | (fboundp 'move-overlay)) |
| 2200 | (defadvice move-overlay (before follow-move-overlay activate) | 2200 | (defadvice move-overlay (before follow-move-overlay activate) |
| 2201 | "Adviced by Follow Mode. | 2201 | "Adviced by Follow mode. |
| 2202 | Don't recenter windows showing only the end of a buffer. | 2202 | Don't recenter windows showing only the end of a buffer. |
| 2203 | This prevents `mouse-drag-region' from messing things up." | 2203 | This prevents `mouse-drag-region' from messing things up." |
| 2204 | (follow-avoid-tail-recenter))) | 2204 | (follow-avoid-tail-recenter))) |