branch: externals/cm-mode
commit 41f1a35f9e7901a2bd55cad28db56c298846885e
Author: Joost Kremers <[email protected]>
Commit: Joost Kremers <[email protected]>
Update the README
---
README.md | 3 +--
cm-mode.el | 8 ++++----
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/README.md b/README.md
index a335b203d5..c19e76e034 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ You can interactively accept or reject a change by putting
the cursor inside it
For comments and highlights, the choices are different: `d` to delete the
comment or highlight (whereby the latter of course retains the highlighted
text, but the comment and the markup are removed), or `k` to keep the comment
or highlight. Again `q` quits and is essentially identical to `k`. (Note that
you can also use `s` instead of `k`, in case you get used to skipping changes
that way.)
-Not implemented yet is the ability to go through all changes in a buffer and
accept or reject them one by one, nor the ability to accept or reject all
changes all at once.
+You can interactively accept or reject all changes with `C-c * I` (that is a
capital `i`). This will go through each change asking you whether you want to
accept, reject or skip it, or delete or keep it. Typing `q` quits the
accept/reject session.
## Font lock ##
@@ -41,7 +41,6 @@ To mitigate this problem, you can use soft wrap (with
`visual-line-mode`). Since
## TODO ##
-- Command to accept or reject all changes interactively (`C-c * I`).
- Commands to accept or reject all changes in one go. {>>These won't be bound
to keys, though.<<}
- Follow changes mode: automatically insert CriticMarkup when changes are made
to the buffer.
- Mouse support?
diff --git a/cm-mode.el b/cm-mode.el
index a5a999c2d1..3a99994fc9 100644
--- a/cm-mode.el
+++ b/cm-mode.el
@@ -83,9 +83,10 @@
;; identical to k. (Note that you can also use s instead of k, in case you
;; get used to skipping changes that way.)
;;
-;; Not implemented yet is the ability to go through all changes in a buffer
-;; and accept or reject them one by one, nor the ability to accept or
-;; reject all changes all at once.
+;; You can interactively accept or reject all changes with C-c * I (that is
+;; a capital i). This will go through each change asking you whether you
+;; want to accept, reject or skip it, or delete or keep it. Typing q quits
+;; the accept/reject session.
;;
;; Font lock
;; ---------
@@ -107,7 +108,6 @@
;; TODO
;; ----
;;
-;; - Command to accept or reject all changes interactively (C-c * I)
;; - Commands to accept or reject all changes in one go
;; - Follow changes mode: automatically insert CriticMarkup when changes
;; - are made to the buffer.
