branch: externals/cm-mode
commit 5a4af66e9a19038350b67835f5785d7b7e15a06e
Author: Joost Kremers <[email protected]>
Commit: Joost Kremers <[email protected]>
Change key binding for cm-set-author to `C-c * t'.
---
README.md | 2 +-
cm-mode.el | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index eff2217007..1398c69c3f 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ Note: the [CriticMarkup
spec](http://criticmarkup.com/spec.php) says you should
Comments can be used to keep track of who made a particular change. If you
want to do this automatically, you can set the variable `cm-author`. When this
variable is set, its value is automatically added as a comment to every change
you make, preceded by `@`. If you explicitly make a comment with `C-c * c`, the
value of `cm-author` is inserted at the beginning of the comment.
-The variable `cm-author` can be set through Customize or with `setq-default`
in your init file. This sets the global value. You can override this global
value in a particular buffer by setting a buffer-local value. There are two
ways to do this: you can use `C-c * C`, which will only set the value for the
current session, or you can use a file-local (or directory-local) variable,
which makes sure the value is set every time the file is loaded. (Note: if you
use [Pandoc](http://johnmacfar [...]
+The variable `cm-author` can be set through Customize or with `setq-default`
in your init file. This sets the global value. You can override this global
value in a particular buffer by setting a buffer-local value. There are two
ways to do this: you can use `C-c * t` (for *tag*), which will only set the
value for the current session, or you can use a file-local (or directory-local)
variable, which makes sure the value is set every time the file is loaded.
(Note: if you use [Pandoc](http: [...]
If `cm-author` is set, a new addition or deletion that is adjacent to an
existing one is not combined with it if it has a different author tag. This way
you can add changes to a text that already has changes from another author and
still keep track of who did what. This *only* works for changes that have a
comment with an author tag, however. If the existing addition/deletion does not
have an author tag, any addition/deletion made adjacent to it is simply
combined with it.
diff --git a/cm-mode.el b/cm-mode.el
index a020986b3a..e82dd76d1e 100644
--- a/cm-mode.el
+++ b/cm-mode.el
@@ -202,7 +202,7 @@ it is added automatically."
(define-key map "\C-c**" 'cm-forward-out-of-change)
(define-key map "\C-c*f" 'cm-forward-change)
(define-key map "\C-c*b" 'cm-backward-change)
- (define-key map "\C-c*C" 'cm-set-author)
+ (define-key map "\C-c*t" 'cm-set-author)
(define-key map "\C-c*F" 'cm-follow-changes)
map)
"Keymap for cm-mode.")
