branch: externals/cm-mode
commit dbfb74257003c312fd37d5f000386d3b457938cb
Author: Joost Kremers <[email protected]>
Commit: Joost Kremers <[email protected]>
Small changes to README.md
---
README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 51b92ac607..6e15fed6f7 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@ You can jump to the previous/next change with the commands
`C-c * b` and `C-c *
## Accepting or rejecting changes ##
-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. 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, though.)
+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.)
@@ -54,7 +54,7 @@ You can interactively accept or reject all changes with `C-c
* I` (that is a cap
## Font lock ##
-`cm-mode` also adds the markup tags defined by CriticMarkup to
`font-lock-keywords` and provides customisable faces to highlight them. The
customisation group is called `criticmarkup`.
+`cm-mode` also adds the markup tags defined by CriticMarkup to
`font-lock-keywords` and provides customisable faces to highlight them. The
customisation group is called `criticmarkup-faces`.
You may notice that changes that span multiple lines are not highlighted. The
reason for this is that multiline font lock in Emacs is not straightforward.
There are ways to deal with this, but since `cm-mode` is a minor mode, it could
interfere with the major mode's font locking mechanism if it did that. Besides,
one is advised not to include newlines inside CriticMarkup tags anyway.
