aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtur Malabarba2015-02-21 18:06:07 -0200
committerArtur Malabarba2015-02-21 18:06:07 -0200
commit48415204e8ea143300f3f10d33b9617d91ed1c54 (patch)
treed9d8573d8a996cd3951202a7ea2d183fdde1fc3d
parent9074a684990600abd9dfad0477c7cd1d2f339ed3 (diff)
downloademacs-48415204e8ea143300f3f10d33b9617d91ed1c54.tar.gz
emacs-48415204e8ea143300f3f10d33b9617d91ed1c54.zip
bindings.el (ctl-x-map): Fix `comment-line' binding.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/bindings.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0211458daab..1d95f1008d1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12015-02-21 Artur Malabarba <bruce.connor.am@gmail.com>
2
3 * bindings.el (ctl-x-map): Fix `comment-line' binding.
4
12015-02-21 Michael Albinus <michael.albinus@gmx.de> 52015-02-21 Michael Albinus <michael.albinus@gmx.de>
2 6
3 * autorevert.el (auto-revert-notify-add-watch) 7 * autorevert.el (auto-revert-notify-add-watch)
diff --git a/lisp/bindings.el b/lisp/bindings.el
index 4cc9f6ad368..44a6570117a 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 "\C-;" '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