summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-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 @@
+2015-02-21 Paul Eggert <eggert@cs.ucla.edu>
+
+ * 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
+
2015-02-21 Artur Malabarba <bruce.connor.am@gmail.com>
* 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."
(define-key esc-map "j" 'indent-new-comment-line)
(define-key esc-map "\C-j" 'indent-new-comment-line)
(define-key ctl-x-map ";" 'comment-set-column)
-(define-key ctl-x-map "\C-;" 'comment-line)
+(define-key ctl-x-map "\M-;" 'comment-line)
(define-key ctl-x-map "f" 'set-fill-column)
(define-key ctl-x-map "$" 'set-selective-display)