diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-08-05 14:09:09 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-08-05 14:09:09 -0700 |
| commit | a855bf48d42cd7cbc9c72def3584fd354d433f97 (patch) | |
| tree | 9c9c2d5329af83b6cdf9de3871e268072b96ffeb /lisp/rect.el | |
| parent | 8c818d8cb75f4d61cc1875311a7b6b5f0a2d8bd1 (diff) | |
| parent | 9a41cd1215e60415777bb139c0669100e347375b (diff) | |
| download | emacs-a855bf48d42cd7cbc9c72def3584fd354d433f97.tar.gz | |
Merge from origin/emacs-25
9a41cd1 ; Fix typo
9356fe2 Expand FIXME near definition of fboundp
219b39f kill-rectangle should mention killed-rectangle
59fa4c3 Avoid assertion violations in nhexl-mode
Diffstat (limited to 'lisp/rect.el')
| -rw-r--r-- | lisp/rect.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/rect.el b/lisp/rect.el index 8803a47215f..13db7d8ee3d 100644 --- a/lisp/rect.el +++ b/lisp/rect.el @@ -284,7 +284,7 @@ With a prefix (or a FILL) argument, also fill lines where nothing has to be deleted. If the buffer is read-only, Emacs will beep and refrain from deleting -the rectangle, but put it in the kill ring anyway. This means that +the rectangle, but put it in `killed-rectangle' anyway. This means that you can use this command to copy text from a read-only buffer. \(If the variable `kill-read-only-ok' is non-nil, then this won't even beep.)" @@ -295,7 +295,7 @@ even beep.)" (setq deactivate-mark t) (setq killed-rectangle (extract-rectangle start end)) (if kill-read-only-ok - (progn (message "Read only text copied to kill ring") nil) + (progn (message "Read only text copied to `killed-rectangle'") nil) (barf-if-buffer-read-only) (signal 'text-read-only (list (current-buffer))))))) @@ -403,7 +403,7 @@ With a prefix (or a FILL) argument, also fill too short lines." :version "25.1") (defcustom rectangle-preview t - "If non-nil, `string-rectangle' will show an-the-fly preview." + "If non-nil, `string-rectangle' will show an on-the-fly preview." :version "25.1" :type 'boolean) |