diff options
| author | Juanma Barranquero | 2007-11-15 18:32:34 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2007-11-15 18:32:34 +0000 |
| commit | a198d2c9158ca14968181e2af9d145e94d425f0a (patch) | |
| tree | f90f3b9945e5af6211ea31b714baf67058d79136 | |
| parent | 1fc0c6247c2b8c0102028d1ba95d9bcc03d3f1e4 (diff) | |
| download | emacs-a198d2c9158ca14968181e2af9d145e94d425f0a.tar.gz emacs-a198d2c9158ca14968181e2af9d145e94d425f0a.zip | |
(cua-highlight-region-shift-only, cua-paste-pop): Fix typos in docstrings.
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/emulation/cua-base.el | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8a847ec9e12..a45abc3e3ac 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,11 @@ | |||
| 1 | 2007-11-15 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * progmodes/cc-engine.el (c-crosses-statement-barrier-p): | ||
| 4 | Fix typo in docstring. | ||
| 5 | |||
| 6 | * emulation/cua-base.el (cua-paste-pop): Fix typo in docstring. | ||
| 7 | (cua-highlight-region-shift-only): Doc fix. | ||
| 8 | |||
| 1 | 2007-11-15 Richard Stallman <rms@gnu.org> | 9 | 2007-11-15 Richard Stallman <rms@gnu.org> |
| 2 | 10 | ||
| 3 | * bindings.el (esc-map): Bind C-M-l here; moved from reposition.el. | 11 | * bindings.el (esc-map): Bind C-M-l here; moved from reposition.el. |
diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el index e5410c272ff..62fa2bd7bbb 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>. |
| 287 | When this is non-nil, CUA toggles `transient-mark-mode' on when the region | 287 | When this is non-nil, CUA toggles `transient-mark-mode' on when the region |
| 288 | is marked using shifted movement keys, and off when the mark is cleared. | 288 | is marked using shifted movement keys, and off when the mark is cleared. |
| 289 | But when the mark was set using \\[cua-set-mark], transient-mark-mode | 289 | But when the mark was set using \\[cua-set-mark], Transient Mark mode |
| 290 | is not turned on." | 290 | is not turned on." |
| 291 | :type 'boolean | 291 | :type 'boolean |
| 292 | :group 'cua) | 292 | :group 'cua) |
| @@ -951,8 +951,8 @@ If global mark is active, copy from register or one character." | |||
| 951 | 951 | ||
| 952 | (defun cua-paste-pop (arg) | 952 | (defun cua-paste-pop (arg) |
| 953 | "Replace a just-pasted text or rectangle with a different text. | 953 | "Replace a just-pasted text or rectangle with a different text. |
| 954 | See `yank-pop' for details about the default behaviour. For an alternative | 954 | See `yank-pop' for details about the default behavior. For an alternative |
| 955 | behaviour, see `cua-paste-pop-rotate-temporarily'." | 955 | behavior, see `cua-paste-pop-rotate-temporarily'." |
| 956 | (interactive "P") | 956 | (interactive "P") |
| 957 | (cond | 957 | (cond |
| 958 | ((eq last-command 'cua--paste-rectangle) | 958 | ((eq last-command 'cua--paste-rectangle) |