aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2005-07-21 09:38:13 +0000
committerJuanma Barranquero2005-07-21 09:38:13 +0000
commit1023b16920359abb5891d702b67c7aed0fd648ca (patch)
treeab40854e6d0cf3784b4df8fc33cf031c7e6c65f6
parentbbb319fb9914b08d1e38c9e6d5b3353d2ce0e642 (diff)
downloademacs-1023b16920359abb5891d702b67c7aed0fd648ca.tar.gz
emacs-1023b16920359abb5891d702b67c7aed0fd648ca.zip
(cua-mode, cua-enable-register-prefix, cua-enable-cua-keys, cua-use-hyper-key,
cua-virtual-rectangle-edges): Fix typos in docstrings. (cua--M/H-key, cua--init-keymaps): "?\ " -> "?\s".
-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 905bb727a0e..49979ce3b78 100644
--- a/lisp/emulation/cua-base.el
+++ b/lisp/emulation/cua-base.el
@@ -62,7 +62,7 @@
62;; If you really need to perform a command which starts with one of 62;; If you really need to perform a command which starts with one of
63;; the prefix keys even when the region is active, you have three options: 63;; the prefix keys even when the region is active, you have three options:
64;; - press the prefix key twice very quickly (within 0.2 seconds), 64;; - press the prefix key twice very quickly (within 0.2 seconds),
65;; - press the prefix key and the following key within 0.2 seconds), or 65;; - press the prefix key and the following key within 0.2 seconds, or
66;; - use the SHIFT key with the prefix key, i.e. C-X or C-C 66;; - use the SHIFT key with the prefix key, i.e. C-X or C-C
67;; 67;;
68;; This behaviour can be customized via the 68;; This behaviour can be customized via the
@@ -274,7 +274,7 @@
274(defcustom cua-enable-cua-keys t 274(defcustom cua-enable-cua-keys t
275 "*Enable using C-z, C-x, C-c, and C-v for undo, cut, copy, and paste. 275 "*Enable using C-z, C-x, C-c, and C-v for undo, cut, copy, and paste.
276If the value is t, these mappings are always enabled. If the value is 276If the value is t, these mappings are always enabled. If the value is
277'shift, these keys are only enabled if the last region was marked with 277`shift', these keys are only enabled if the last region was marked with
278a shifted movement key. If the value is nil, these keys are never 278a shifted movement key. If the value is nil, these keys are never
279enabled." 279enabled."
280 :type '(choice (const :tag "Disabled" nil) 280 :type '(choice (const :tag "Disabled" nil)
@@ -314,9 +314,9 @@ If the value is nil, use a shifted prefix key to inhibit the override."
314 "*If non-nil, registers are supported via numeric prefix arg. 314 "*If non-nil, registers are supported via numeric prefix arg.
315If the value is t, any numeric prefix arg in the range 0 to 9 will be 315If the value is t, any numeric prefix arg in the range 0 to 9 will be
316interpreted as a register number. 316interpreted as a register number.
317If the value is not-ctrl-u, using C-u to enter a numeric prefix is not 317If the value is `not-ctrl-u', using C-u to enter a numeric prefix is not
318interpreted as a register number. 318interpreted as a register number.
319If the value is ctrl-u-only, only numeric prefix entered with C-u is 319If the value is `ctrl-u-only', only numeric prefix entered with C-u is
320interpreted as a register number." 320interpreted as a register number."
321 :type '(choice (const :tag "Disabled" nil) 321 :type '(choice (const :tag "Disabled" nil)
322 (const :tag "Enabled, but C-u arg is not a register" not-ctrl-u) 322 (const :tag "Enabled, but C-u arg is not a register" not-ctrl-u)
@@ -331,7 +331,7 @@ interpreted as a register number."
331 331
332(defcustom cua-use-hyper-key nil 332(defcustom cua-use-hyper-key nil
333 "*If non-nil, bind rectangle commands to H-... instead of M-.... 333 "*If non-nil, bind rectangle commands to H-... instead of M-....
334If set to 'also, toggle region command is also on C-return. 334If set to `also', toggle region command is also on C-return.
335Must be set prior to enabling CUA." 335Must be set prior to enabling CUA."
336 :type '(choice (const :tag "Meta key and C-return" nil) 336 :type '(choice (const :tag "Meta key and C-return" nil)
337 (const :tag "Hyper key only" only) 337 (const :tag "Hyper key only" only)
@@ -362,7 +362,7 @@ managers, so try setting this to nil, if prefix override doesn't work."
362 "*If non-nil, rectangles have virtual straight edges. 362 "*If non-nil, rectangles have virtual straight edges.
363Note that although rectangles are always DISPLAYED with straight edges, the 363Note that although rectangles are always DISPLAYED with straight edges, the
364buffer is NOT modified, until you execute a command that actually modifies it. 364buffer is NOT modified, until you execute a command that actually modifies it.
365\[M-p] toggles this feature when a rectangle is active." 365M-p toggles this feature when a rectangle is active."
366 :type 'boolean 366 :type 'boolean
367 :group 'cua) 367 :group 'cua)
368 368
@@ -1175,7 +1175,7 @@ If ARG is the atom `-', scroll upward by nearly full screen."
1175 1175
1176(defun cua--M/H-key (map key fct) 1176(defun cua--M/H-key (map key fct)
1177 ;; bind H-KEY or M-KEY to FCT in MAP 1177 ;; bind H-KEY or M-KEY to FCT in MAP
1178 (if (eq key 'space) (setq key ? )) 1178 (if (eq key 'space) (setq key ?\s))
1179 (unless (listp key) (setq key (list key))) 1179 (unless (listp key) (setq key (list key)))
1180 (define-key map (vector (cons (if cua-use-hyper-key 'hyper 'meta) key)) fct)) 1180 (define-key map (vector (cons (if cua-use-hyper-key 'hyper 'meta) key)) fct))
1181 1181
@@ -1244,7 +1244,7 @@ If ARG is the atom `-', scroll upward by nearly full screen."
1244 (cua--M/H-key cua-global-keymap 'space 'cua-set-rectangle-mark) 1244 (cua--M/H-key cua-global-keymap 'space 'cua-set-rectangle-mark)
1245 (define-key cua-global-keymap [(hyper mouse-1)] 'cua-mouse-set-rectangle-mark)) 1245 (define-key cua-global-keymap [(hyper mouse-1)] 'cua-mouse-set-rectangle-mark))
1246 1246
1247 (define-key cua-global-keymap [(shift control ? )] 'cua-toggle-global-mark) 1247 (define-key cua-global-keymap [(shift control ?\s)] 'cua-toggle-global-mark)
1248 1248
1249 ;; replace region with rectangle or element on kill ring 1249 ;; replace region with rectangle or element on kill ring
1250 (define-key cua-global-keymap [remap yank] 'cua-paste) 1250 (define-key cua-global-keymap [remap yank] 'cua-paste)
@@ -1346,12 +1346,12 @@ If you really need to perform a command which starts with one of
1346the prefix keys even when the region is active, you have three 1346the prefix keys even when the region is active, you have three
1347options: 1347options:
1348- press the prefix key twice very quickly (within 0.2 seconds), 1348- press the prefix key twice very quickly (within 0.2 seconds),
1349- press the prefix key and the following key within 0.2 seconds), or 1349- press the prefix key and the following key within 0.2 seconds, or
1350- use the SHIFT key with the prefix key, i.e. C-S-x or C-S-c. 1350- use the SHIFT key with the prefix key, i.e. C-S-x or C-S-c.
1351 1351
1352You can customize `cua-enable-cua-keys' to completely disable the 1352You can customize `cua-enable-cua-keys' to completely disable the
1353CUA bindings, or `cua-prefix-override-inhibit-delay' to change 1353CUA bindings, or `cua-prefix-override-inhibit-delay' to change
1354the prefix fallback behaviour." 1354the prefix fallback behavior."
1355 :global t 1355 :global t
1356 :group 'cua 1356 :group 'cua
1357 :set-after '(cua-enable-modeline-indications cua-use-hyper-key) 1357 :set-after '(cua-enable-modeline-indications cua-use-hyper-key)