branch: externals/cm-mode
commit ebb3cdaa6b4b6e6914a9c0f04cde1275fa3a1729
Author: Joost Kremers <[email protected]>
Commit: Joost Kremers <[email protected]>
Update Commentary section in cm-mode.el
---
README.md | 1 -
cm-mode.el | 27 +++++++++++----------------
2 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/README.md b/README.md
index cb85f536b3..3f7009f83f 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,6 @@ The commands to delete or substitute text operate on the
region. The command to
Follow changes mode should be considered experimental, so try at your own
risk. If you run into problems, open an issue on Github or send me an email.
-
## Accepting or rejecting changes ##
One can interactively accept or reject a change by putting the cursor inside
it and hitting `C-c * i`. For additions, deletions and substitutions, you get a
choice between `a` to accept the change or `r` to reject it. There are two
other choices, `s` to skip this change or `q` to quit. Both leave the change
untouched and if you're just dealing with the change at point, they are
essentially identical. {>>They have different functions when accepting or
rejecting all changes interactively, [...]
diff --git a/cm-mode.el b/cm-mode.el
index c5b2391381..efa00aac34 100644
--- a/cm-mode.el
+++ b/cm-mode.el
@@ -66,23 +66,18 @@
;; Follow changes mode
;; -------------------
;;
-;; cm-mode also provides a (rudimentary) 'follow changes' mode. When
-;; activated, changes you make to the buffer are automatically marked as
-;; insertions or deletions. Substitutions cannot be made automatically
-;; (that is, if you mark a word, delete it and then type a replacement, it
-;; will still be marked as sequence of deletion+insertion, not as a
-;; substitution), but they can still be made manually with C-c * s. You can
-;; activate and deactivate follow changes mode with C-c * F. When it's
-;; active, the modeline indicator for cm-mode changes from cm to cm*.
+;; cm-mode also provides a simple 'follow changes' mode. When activated,
+;; changes you make to the buffer are automatically marked as insertions or
+;; deletions. Substitutions cannot be made automatically (that is, if you
+;; mark a word, delete it and then type a replacement, it will still be
+;; marked as sequence of deletion+insertion, not as a substitution), but
+;; they can still be made manually with C-c * s. You can activate and
+;; deactivate follow changes mode with C-c * F. When it's active, the
+;; modeline indicator for cm-mode changes from cm to cm*.
;;
-;; Note that this functionality is in development and not very polished
-;; yet. Multiple deletions in sequence, for example, are not combined, so
-;; that deleting a word with <backspace> leaves a string of deletion
-;; markups. Deleting a character with <del> also leaves the cursor in the
-;; wrong position. Follow changes mode should also be considered
-;; alpha-grade, i.e., it works to the extent that it works. (If you
-;; experience problems with it, please open up an issue on Github or send
-;; me an email.)
+;; Follow changes mode should be considered experimental, so try at your
+;; own risk. If you run into problems, open an issue on Github or send me
+;; an email.
;;
;; Accepting or rejecting changes
;; ------------------------------
