branch: externals/cm-mode
commit d83d3ea70ed5a2e59e0048d9743ae6d3e134cbf4
Author: Joost Kremers <[email protected]>
Commit: Joost Kremers <[email protected]>
Replace `k' with `s' as a choice in accepting/rejecting comments and
highlights.
---
README.md | 2 +-
cm-mode.el | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md
index 1398c69c3f..0426a1bec6 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ You can jump to the previous/next change with the commands
`C-c * b` and `C-c *
You 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, which both leave the
change untouched. If you're just dealing with the change at point, they are
essentially identical, but they have different functions when accepting or
rejecting all changes interactively.
-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.)
+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 `s` to skip the comment
or highlight. Again `q` quits and is essentially identical to `s`.
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 what you want to do
with it. Here, `s` skips the current change and moves on to the next one, while
typing `q` leaves the current change alone and quits the accept/reject session.
diff --git a/cm-mode.el b/cm-mode.el
index e82dd76d1e..0cd9877a71 100644
--- a/cm-mode.el
+++ b/cm-mode.el
@@ -708,9 +708,9 @@ is NIL."
(capitalize (substring
(symbol-name (car change)) 3)))
'(?a ?r ?s ?q) t))
((memq (car change) '(cm-comment cm-highlight))
- (read-char-choice (format "%s: (d)elete/(k)eep/(q)uit? "
+ (read-char-choice (format "%s: (d)elete/(s)kip/(q)uit? "
(capitalize (substring
(symbol-name (car change)) 3)))
- '(?d ?k ?s ?q) t)))))
+ '(?d ?s ?q) t)))))
(delete-overlay cm-current-markup-overlay)
(when (and (not interactive) (eq action ?q)) ; if the user aborted
(throw 'quit nil)) ; get out
@@ -720,7 +720,7 @@ is NIL."
(delete-region (third change) (fourth change))
(insert (cm-substitution-string change action)))
(point))
- ((memq action '(?s ?k))
+ ((eq action ?s)
(fourth change)))))))
(defun cm-substitution-string (change action)
