diff options
| author | Karl Heuer | 1998-09-21 17:23:50 +0000 |
|---|---|---|
| committer | Karl Heuer | 1998-09-21 17:23:50 +0000 |
| commit | 99f08df44ecbc2353900264624e40554092e8e45 (patch) | |
| tree | 4487b2672f414c46dd8bbbf7545a4ca478698daa | |
| parent | b32e3ef8821e76f726beeeb0c492ca264f9f1d67 (diff) | |
| download | emacs-99f08df44ecbc2353900264624e40554092e8e45.tar.gz emacs-99f08df44ecbc2353900264624e40554092e8e45.zip | |
Fix previous change.
| -rw-r--r-- | lisp/hilit-chg.el | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/lisp/hilit-chg.el b/lisp/hilit-chg.el index 32024cc5cec..2fad6bfff7d 100644 --- a/lisp/hilit-chg.el +++ b/lisp/hilit-chg.el | |||
| @@ -60,9 +60,9 @@ | |||
| 60 | ;; `highlight-changes-previous-change'. | 60 | ;; `highlight-changes-previous-change'. |
| 61 | ;; | 61 | ;; |
| 62 | ;; | 62 | ;; |
| 63 | ;; You can also use the command compare-with-file to show changes in this | 63 | ;; You can also use the command highlight-compare-with-file to show changes |
| 64 | ;; file compared with another file (typically the previous version of the | 64 | ;; in this file compared with another file (typically the previous version |
| 65 | ;; file). | 65 | ;; of the file). |
| 66 | ;; | 66 | ;; |
| 67 | ;; | 67 | ;; |
| 68 | ;; There are currently three hooks run by `highlight-changes-mode': | 68 | ;; There are currently three hooks run by `highlight-changes-mode': |
| @@ -147,7 +147,7 @@ | |||
| 147 | ;; highlight-changes-mode | 147 | ;; highlight-changes-mode |
| 148 | ;; highlight-changes-remove-highlight | 148 | ;; highlight-changes-remove-highlight |
| 149 | ;; highlight-changes-rotate-faces | 149 | ;; highlight-changes-rotate-faces |
| 150 | ;; compare-with-file | 150 | ;; highlight-compare-with-file |
| 151 | 151 | ||
| 152 | ;; | 152 | ;; |
| 153 | ;; You can automatically rotate faces when the buffer is saved; | 153 | ;; You can automatically rotate faces when the buffer is saved; |
| @@ -167,8 +167,8 @@ | |||
| 167 | ;; - having different faces for deletion and non-deletion: is it | 167 | ;; - having different faces for deletion and non-deletion: is it |
| 168 | ;; really worth the hassle? | 168 | ;; really worth the hassle? |
| 169 | ;; - should have better hooks: when should they be run? | 169 | ;; - should have better hooks: when should they be run? |
| 170 | ;; - compare-with-file should allow RCS files - e.g. nice to be able | 170 | ;; - highlight-compare-with-file should allow RCS files - e.g. nice to be |
| 171 | ;; to say show changes compared with version 2.1. | 171 | ;; able to say show changes compared with version 2.1. |
| 172 | ;; - Maybe we should have compare-with-buffer as well. (When I tried | 172 | ;; - Maybe we should have compare-with-buffer as well. (When I tried |
| 173 | ;; a while back I ran into a problem with ediff-buffers-internal.) | 173 | ;; a while back I ran into a problem with ediff-buffers-internal.) |
| 174 | 174 | ||
| @@ -411,7 +411,7 @@ Otherwise, this list will be constructed when needed from | |||
| 411 | 411 | ||
| 412 | 412 | ||
| 413 | (eval-and-compile | 413 | (eval-and-compile |
| 414 | ;; For compare-with-file | 414 | ;; For highlight-compare-with-file |
| 415 | (defvar ediff-number-of-differences) | 415 | (defvar ediff-number-of-differences) |
| 416 | (autoload 'ediff-setup "ediff") | 416 | (autoload 'ediff-setup "ediff") |
| 417 | (autoload 'ediff-with-current-buffer "ediff") | 417 | (autoload 'ediff-with-current-buffer "ediff") |
| @@ -553,7 +553,7 @@ This allows you to manually remove highlighting from uninteresting changes." | |||
| 553 | ;; | 553 | ;; |
| 554 | ;; This function is called by the `after-change-functions' hook, which | 554 | ;; This function is called by the `after-change-functions' hook, which |
| 555 | ;; is how we are notified when text is changed. | 555 | ;; is how we are notified when text is changed. |
| 556 | ;; It is also called from `compare-with-file'. | 556 | ;; It is also called from `highlight-compare-with-file'. |
| 557 | ;; | 557 | ;; |
| 558 | ;; We do NOT want to simply do this if this is an undo command, because | 558 | ;; We do NOT want to simply do this if this is an undo command, because |
| 559 | ;; otherwise an undone change shows up as changed. While the properties | 559 | ;; otherwise an undone change shows up as changed. While the properties |
| @@ -667,8 +667,8 @@ Passive state - means changes are kept and new ones recorded but are | |||
| 667 | Functions: | 667 | Functions: |
| 668 | \\[highlight-changes-next-change] - move point to beginning of next change | 668 | \\[highlight-changes-next-change] - move point to beginning of next change |
| 669 | \\[highlight-changes-previous-change] - move to beginning of previous change | 669 | \\[highlight-changes-previous-change] - move to beginning of previous change |
| 670 | \\[compare-with-file] - mark text as changed by comparing this buffer with | 670 | \\[highlight-compare-with-file] - mark text as changed by comparing this |
| 671 | the contents of a file | 671 | buffer with the contents of a file |
| 672 | \\[highlight-changes-remove-highlight] - remove the change face from the region | 672 | \\[highlight-changes-remove-highlight] - remove the change face from the region |
| 673 | \\[highlight-changes-rotate-faces] - rotate different \"ages\" of changes \ | 673 | \\[highlight-changes-rotate-faces] - rotate different \"ages\" of changes \ |
| 674 | through | 674 | through |