Merge profiler branch

[bpt/emacs.git] / lisp / bindings.el

diff --git a/lisp/bindings.el b/lisp/bindings.el
index 97450f7..7ca1bf4 100644 (file)
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -40,8 +40,7 @@ corresponding to the mode line clicked."
   (interactive "e")
   (save-selected-window
     (select-window (posn-window (event-start event)))
-    (toggle-read-only nil t)
-    (force-mode-line-update)))
+    (read-only-mode 'toggle)))
 
 (defun mode-line-toggle-modified (event)
   "Toggle the buffer-modified flag from the mode-line."
@@ -144,7 +143,7 @@ message to display when the mouse is moved over the mode line.
 If the text at the mouse position has a `help-echo' text
 property, that overrides this variable."
   :type '(choice (const :tag "No help" :value nil) string)
-  :version "24.2"
+  :version "24.3"
   :group 'mode-line)
 
 (defvar mode-line-front-space '(:eval (if (display-graphic-p) " " "-"))
@@ -657,14 +656,14 @@ okay.  See `mode-line-format'.")
 ;; For consistency, we give them the `permanent-local' property, even
 ;; though `kill-all-local-variables' does not actually consult it.
 
-(mapcar (lambda (sym) (put sym 'permanent-local t))
-       '(buffer-file-name default-directory buffer-backed-up
-         buffer-saved-size buffer-auto-save-file-name
-         buffer-read-only buffer-undo-list mark-active
-         point-before-scroll buffer-file-truename
-         buffer-file-format buffer-auto-save-file-format
-         buffer-display-count buffer-display-time
-         enable-multibyte-characters))
+(mapc (lambda (sym) (put sym 'permanent-local t))
+      '(buffer-file-name default-directory buffer-backed-up
+       buffer-saved-size buffer-auto-save-file-name
+       buffer-read-only buffer-undo-list mark-active
+       point-before-scroll buffer-file-truename
+       buffer-file-format buffer-auto-save-file-format
+       buffer-display-count buffer-display-time
+       enable-multibyte-characters))
 
 ;; We have base64, md5 and sha1 functions built in now.
 (provide 'base64)
@@ -1183,7 +1182,30 @@ if `inhibit-field-text-motion' is non-nil."
 (define-key ctl-x-5-map "m" 'compose-mail-other-frame)
 \f
 
-(defvar ctl-x-r-map (make-sparse-keymap)
+(defvar ctl-x-r-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map "c" 'clear-rectangle)
+    (define-key map "k" 'kill-rectangle)
+    (define-key map "d" 'delete-rectangle)
+    (define-key map "y" 'yank-rectangle)
+    (define-key map "o" 'open-rectangle)
+    (define-key map "t" 'string-rectangle)
+    (define-key map "N" 'rectangle-number-lines)
+    (define-key map "\M-w" 'copy-rectangle-as-kill)
+    (define-key map "\C-@" 'point-to-register)
+    (define-key map [?\C-\ ] 'point-to-register)
+    (define-key map " " 'point-to-register)
+    (define-key map "j" 'jump-to-register)
+    (define-key map "s" 'copy-to-register)
+    (define-key map "x" 'copy-to-register)
+    (define-key map "i" 'insert-register)
+    (define-key map "g" 'insert-register)
+    (define-key map "r" 'copy-rectangle-to-register)
+    (define-key map "n" 'number-to-register)
+    (define-key map "+" 'increment-register)
+    (define-key map "w" 'window-configuration-to-register)
+    (define-key map "f" 'frame-configuration-to-register)
+    map)
   "Keymap for subcommands of C-x r.")
 (define-key ctl-x-map "r" ctl-x-r-map)