aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2007-11-15 16:39:56 +0000
committerJuanma Barranquero2007-11-15 16:39:56 +0000
commit10cfe02cdc0f45ff0e9c9dd162351d12c4ab5d74 (patch)
tree84eedb0abe0602b13c4f7bc0811b068079433544
parentf2c232a244ce2633c532f3b045fb0b200c3a506d (diff)
downloademacs-10cfe02cdc0f45ff0e9c9dd162351d12c4ab5d74.tar.gz
emacs-10cfe02cdc0f45ff0e9c9dd162351d12c4ab5d74.zip
(cua--keymaps-initialized): Rename from `cua--keymaps-initalized'.
Callers changed. (cua-highlight-region-shift-only): Doc fix. (cua-paste-pop): Fix typo in docstring.
-rw-r--r--lisp/emulation/cua-base.el20
1 files changed, 10 insertions, 10 deletions
diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el
index c720a78d650..a6cc217180b 100644
--- a/lisp/emulation/cua-base.el
+++ b/lisp/emulation/cua-base.el
@@ -286,7 +286,7 @@ enabled."
286 "*If non-nil, only highlight region if marked with S-<move>. 286 "*If non-nil, only highlight region if marked with S-<move>.
287When this is non-nil, CUA toggles `transient-mark-mode' on when the region 287When this is non-nil, CUA toggles `transient-mark-mode' on when the region
288is marked using shifted movement keys, and off when the mark is cleared. 288is marked using shifted movement keys, and off when the mark is cleared.
289But when the mark was set using \\[cua-set-mark], transient-mark-mode 289But when the mark was set using \\[cua-set-mark], Transient Mark mode
290is not turned on." 290is not turned on."
291 :type 'boolean 291 :type 'boolean
292 :group 'cua) 292 :group 'cua)
@@ -406,8 +406,8 @@ and after the region marked by the rectangle to search."
406 "Global key used to toggle the cua rectangle mark." 406 "Global key used to toggle the cua rectangle mark."
407 :set #'(lambda (symbol value) 407 :set #'(lambda (symbol value)
408 (set symbol value) 408 (set symbol value)
409 (when (and (boundp 'cua--keymaps-initalized) 409 (when (and (boundp 'cua--keymaps-initialized)
410 cua--keymaps-initalized) 410 cua--keymaps-initialized)
411 (define-key cua-global-keymap value 411 (define-key cua-global-keymap value
412 'cua-set-rectangle-mark) 412 'cua-set-rectangle-mark)
413 (when (boundp 'cua--rectangle-keymap) 413 (when (boundp 'cua--rectangle-keymap)
@@ -954,8 +954,8 @@ If global mark is active, copy from register or one character."
954 954
955(defun cua-paste-pop (arg) 955(defun cua-paste-pop (arg)
956 "Replace a just-pasted text or rectangle with a different text. 956 "Replace a just-pasted text or rectangle with a different text.
957See `yank-pop' for details about the default behaviour. For an alternative 957See `yank-pop' for details about the default behavior. For an alternative
958behaviour, see `cua-paste-pop-rotate-temporarily'." 958behavior, see `cua-paste-pop-rotate-temporarily'."
959 (interactive "P") 959 (interactive "P")
960 (cond 960 (cond
961 ((eq last-command 'cua--paste-rectangle) 961 ((eq last-command 'cua--paste-rectangle)
@@ -1330,8 +1330,8 @@ If ARG is the atom `-', scroll upward by nearly full screen."
1330(defvar cua--cua-keys-keymap (make-sparse-keymap)) 1330(defvar cua--cua-keys-keymap (make-sparse-keymap))
1331(defvar cua--prefix-override-keymap (make-sparse-keymap)) 1331(defvar cua--prefix-override-keymap (make-sparse-keymap))
1332(defvar cua--prefix-repeat-keymap (make-sparse-keymap)) 1332(defvar cua--prefix-repeat-keymap (make-sparse-keymap))
1333(defvar cua--global-mark-keymap (make-sparse-keymap)) ; Initalized when cua-gmrk.el is loaded 1333(defvar cua--global-mark-keymap (make-sparse-keymap)) ; Initialized when cua-gmrk.el is loaded
1334(defvar cua--rectangle-keymap (make-sparse-keymap)) ; Initalized when cua-rect.el is loaded 1334(defvar cua--rectangle-keymap (make-sparse-keymap)) ; Initialized when cua-rect.el is loaded
1335(defvar cua--region-keymap (make-sparse-keymap)) 1335(defvar cua--region-keymap (make-sparse-keymap))
1336 1336
1337(defvar cua--ena-cua-keys-keymap nil) 1337(defvar cua--ena-cua-keys-keymap nil)
@@ -1374,7 +1374,7 @@ If ARG is the atom `-', scroll upward by nearly full screen."
1374 (and cua--global-mark-active 1374 (and cua--global-mark-active
1375 (not (window-minibuffer-p))))) 1375 (not (window-minibuffer-p)))))
1376 1376
1377(defvar cua--keymaps-initalized nil) 1377(defvar cua--keymaps-initialized nil)
1378 1378
1379(defun cua--shift-control-prefix (prefix arg) 1379(defun cua--shift-control-prefix (prefix arg)
1380 ;; handle S-C-x and S-C-c by emulating the fast double prefix function. 1380 ;; handle S-C-x and S-C-c by emulating the fast double prefix function.
@@ -1538,9 +1538,9 @@ shifted movement key, set `cua-highlight-region-shift-only'."
1538 (setq mark-even-if-inactive t) 1538 (setq mark-even-if-inactive t)
1539 (setq highlight-nonselected-windows nil) 1539 (setq highlight-nonselected-windows nil)
1540 1540
1541 (unless cua--keymaps-initalized 1541 (unless cua--keymaps-initialized
1542 (cua--init-keymaps) 1542 (cua--init-keymaps)
1543 (setq cua--keymaps-initalized t)) 1543 (setq cua--keymaps-initialized t))
1544 1544
1545 (if cua-mode 1545 (if cua-mode
1546 (progn 1546 (progn