aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2015-02-21 12:54:21 -0800
committerPaul Eggert2015-02-21 12:54:58 -0800
commit1cb34285463d2b9050a031a7f9a53d376de5b489 (patch)
treecd2aca3f929c0848e5b8ca9325ac173b4192879e
parente38be5c483ee4b629a4a3ecb27de068a1cb6402c (diff)
downloademacs-1cb34285463d2b9050a031a7f9a53d376de5b489.tar.gz
emacs-1cb34285463d2b9050a031a7f9a53d376de5b489.zip
* bindings.el (ctl-x-map): There is no 'C-;'.
For now, make do with 'M-;'; this allows 'make bootstrap' to work. Perhaps some other binding should be chosen. Fixes: bug#19826
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/bindings.el2
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 64aa3de3539..b78dd7920ae 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
12015-02-21 Paul Eggert <eggert@cs.ucla.edu>
2
3 * bindings.el (ctl-x-map): There is no 'C-;'.
4 For now, make do with 'M-;'; this allows 'make bootstrap' to work.
5 Perhaps some other binding should be chosen.
6 Fixes: bug#19826
7
12015-02-21 Artur Malabarba <bruce.connor.am@gmail.com> 82015-02-21 Artur Malabarba <bruce.connor.am@gmail.com>
2 9
3 * bindings.el (ctl-x-map): Fix `comment-line' binding. 10 * bindings.el (ctl-x-map): Fix `comment-line' binding.
diff --git a/lisp/bindings.el b/lisp/bindings.el
index 44a6570117a..a1f0d987f5c 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -1130,7 +1130,7 @@ if `inhibit-field-text-motion' is non-nil."
1130(define-key esc-map "j" 'indent-new-comment-line) 1130(define-key esc-map "j" 'indent-new-comment-line)
1131(define-key esc-map "\C-j" 'indent-new-comment-line) 1131(define-key esc-map "\C-j" 'indent-new-comment-line)
1132(define-key ctl-x-map ";" 'comment-set-column) 1132(define-key ctl-x-map ";" 'comment-set-column)
1133(define-key ctl-x-map "\C-;" 'comment-line) 1133(define-key ctl-x-map "\M-;" 'comment-line)
1134(define-key ctl-x-map "f" 'set-fill-column) 1134(define-key ctl-x-map "f" 'set-fill-column)
1135(define-key ctl-x-map "$" 'set-selective-display) 1135(define-key ctl-x-map "$" 'set-selective-display)
1136 1136