diff options
| author | Juanma Barranquero | 2014-03-12 22:16:34 +0100 |
|---|---|---|
| committer | Juanma Barranquero | 2014-03-12 22:16:34 +0100 |
| commit | a5765a3dc2a1469289d2c1c86b819672441fc23a (patch) | |
| tree | 5945d4aedfeda7f4bbb0cd036793be984bb96f59 /lisp | |
| parent | 46e3f6b5061b641c1cc17543e0d248bcb1b093ba (diff) | |
| download | emacs-a5765a3dc2a1469289d2c1c86b819672441fc23a.tar.gz emacs-a5765a3dc2a1469289d2c1c86b819672441fc23a.zip | |
lisp/register.el (register-separator, copy-to-register): Doc fixes.
(register-preview-default): Remove unnecessary call to concat.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/register.el | 19 |
2 files changed, 12 insertions, 10 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 23da480f6b2..d051434bb31 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2014-03-12 Juanma Barranquero <lekktu@gmail.com> | 1 | 2014-03-12 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 2 | ||
| 3 | * register.el (register-separator, copy-to-register): Doc fixes. | ||
| 4 | (register-preview-default): Remove unnecessary call to concat. | ||
| 5 | |||
| 3 | * frameset.el (frameset-restore): When checking for a visible frame, | 6 | * frameset.el (frameset-restore): When checking for a visible frame, |
| 4 | use the action map instead of calling visible-frame-list. | 7 | use the action map instead of calling visible-frame-list. |
| 5 | 8 | ||
diff --git a/lisp/register.el b/lisp/register.el index 102ba6c60e4..bfe3e35223f 100644 --- a/lisp/register.el +++ b/lisp/register.el | |||
| @@ -81,10 +81,9 @@ A list of the form (FRAME-CONFIGURATION POSITION) | |||
| 81 | (defcustom register-separator nil | 81 | (defcustom register-separator nil |
| 82 | "Register containing the text to put between collected texts, or nil if none. | 82 | "Register containing the text to put between collected texts, or nil if none. |
| 83 | 83 | ||
| 84 | When collecting text with | 84 | When collecting text with \\[append-to-register] (or \\[prepend-to-register]), |
| 85 | `append-to-register' (resp. `prepend-to-register') contents of | 85 | contents of this register is added to the beginning (or end, respectively) |
| 86 | this register is added to the beginning (resp. end) of the marked | 86 | of the marked text." |
| 87 | text." | ||
| 88 | :group 'register | 87 | :group 'register |
| 89 | :type '(choice (const :tag "None" nil) | 88 | :type '(choice (const :tag "None" nil) |
| 90 | (character :tag "Use register" :value ?+))) | 89 | (character :tag "Use register" :value ?+))) |
| @@ -121,8 +120,8 @@ See the documentation of the variable `register-alist' for possible VALUEs." | |||
| 121 | 120 | ||
| 122 | (defun register-preview-default (r) | 121 | (defun register-preview-default (r) |
| 123 | "Default function for the variable `register-preview-function'." | 122 | "Default function for the variable `register-preview-function'." |
| 124 | (format "%s %s\n" | 123 | (format "%s: %s\n" |
| 125 | (concat (single-key-description (car r)) ":") | 124 | (single-key-description (car r)) |
| 126 | (register-describe-oneline (car r)))) | 125 | (register-describe-oneline (car r)))) |
| 127 | 126 | ||
| 128 | (defvar register-preview-function #'register-preview-default | 127 | (defvar register-preview-function #'register-preview-default |
| @@ -456,10 +455,10 @@ Interactively, reads the register using `register-read-with-preview'." | |||
| 456 | (defun copy-to-register (register start end &optional delete-flag region) | 455 | (defun copy-to-register (register start end &optional delete-flag region) |
| 457 | "Copy region into register REGISTER. | 456 | "Copy region into register REGISTER. |
| 458 | With prefix arg, delete as well. | 457 | With prefix arg, delete as well. |
| 459 | Called from program, takes four args: REGISTER, START, END and DELETE-FLAG. | 458 | Called from program, takes five args: REGISTER, START, END, DELETE-FLAG, |
| 460 | START and END are buffer positions indicating what to copy. | 459 | and REGION. START and END are buffer positions indicating what to copy. |
| 461 | The optional argument REGION if non-nil, indicates that we're not just copying | 460 | The optional argument REGION if non-nil, indicates that we're not just |
| 462 | some text between START and END, but we're copying the region. | 461 | copying some text between START and END, but we're copying the region. |
| 463 | 462 | ||
| 464 | Interactively, reads the register using `register-read-with-preview'." | 463 | Interactively, reads the register using `register-read-with-preview'." |
| 465 | (interactive (list (register-read-with-preview "Copy to register: ") | 464 | (interactive (list (register-read-with-preview "Copy to register: ") |