aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2011-07-13 21:58:51 -0400
committerChong Yidong2011-07-13 21:58:51 -0400
commit27fa387ad10e6a5639de1ab08e7559c06e9d802d (patch)
treeb665685915eec1b2a522a32602e82c1fff553392
parent8bdfa0649baea761588c1c9a741570689cecc66c (diff)
downloademacs-27fa387ad10e6a5639de1ab08e7559c06e9d802d.tar.gz
emacs-27fa387ad10e6a5639de1ab08e7559c06e9d802d.zip
* bindings.el: Add advertised binding for set-mark-command (Bug#5772).
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/bindings.el2
2 files changed, 7 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1778fa9bc97..6d652931328 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
12011-07-14 Chong Yidong <cyd@stupidchicken.com> 12011-07-14 Chong Yidong <cyd@stupidchicken.com>
2 2
3 * bindings.el: Add advertised binding for set-mark-command
4 (Bug#5772).
5
62011-07-14 Chong Yidong <cyd@stupidchicken.com>
7
3 * bindings.el (mode-line-other-buffer): 8 * bindings.el (mode-line-other-buffer):
4 * bookmark.el (bookmark-bmenu-2-window): 9 * bookmark.el (bookmark-bmenu-2-window):
5 * bs.el (bs-cycle-next, bs-cycle-previous): 10 * bs.el (bs-cycle-next, bs-cycle-previous):
diff --git a/lisp/bindings.el b/lisp/bindings.el
index 3d7135c16de..c4f9369219a 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -849,6 +849,8 @@ if `inhibit-field-text-motion' is non-nil."
849(define-key global-map "\C-@" 'set-mark-command) 849(define-key global-map "\C-@" 'set-mark-command)
850;; Many people are used to typing C-SPC and getting C-@. 850;; Many people are used to typing C-SPC and getting C-@.
851(define-key global-map [?\C- ] 'set-mark-command) 851(define-key global-map [?\C- ] 'set-mark-command)
852(put 'set-mark-command :advertised-binding [?\C- ])
853
852(define-key ctl-x-map "\C-x" 'exchange-point-and-mark) 854(define-key ctl-x-map "\C-x" 'exchange-point-and-mark)
853(define-key ctl-x-map "\C-@" 'pop-global-mark) 855(define-key ctl-x-map "\C-@" 'pop-global-mark)
854(define-key ctl-x-map [?\C- ] 'pop-global-mark) 856(define-key ctl-x-map [?\C- ] 'pop-global-mark)