mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-04 02:51:31 -08:00
Code Issues Projects Releases Wiki Activity

lisp/register.el (register-separator, copy-to-register): Doc fixes.

Browse source 
(register-preview-default): Remove unnecessary call to concat.
This commit is contained in:
Juanma Barranquero 2014-03-12 22:16:34 +01:00
parent 46e3f6b506
commit a5765a3dc2
2 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lisp/ChangeLog
View file

@ -1,5 +1,8 @@
2014-03-12 Juanma Barranquero <lekktu@gmail.com> 2014-03-12 Juanma Barranquero <lekktu@gmail.com>
* register.el (register-separator, copy-to-register): Doc fixes.
(register-preview-default): Remove unnecessary call to concat.
* frameset.el (frameset-restore): When checking for a visible frame, * frameset.el (frameset-restore): When checking for a visible frame,
use the action map instead of calling visible-frame-list. use the action map instead of calling visible-frame-list.

19
lisp/register.el
View file

@ -81,10 +81,9 @@ A list of the form (FRAME-CONFIGURATION POSITION)
(defcustom register-separator nil (defcustom register-separator nil
"Register containing the text to put between collected texts, or nil if none. "Register containing the text to put between collected texts, or nil if none.
When collecting text with When collecting text with \\[append-to-register] (or \\[prepend-to-register]),
`append-to-register' (resp. `prepend-to-register') contents of contents of this register is added to the beginning (or end, respectively)
this register is added to the beginning (resp. end) of the marked of the marked text."
text."
:group 'register :group 'register
:type '(choice (const :tag "None" nil) :type '(choice (const :tag "None" nil)
(character :tag "Use register" :value ?+))) (character :tag "Use register" :value ?+)))
@ -121,8 +120,8 @@ See the documentation of the variable `register-alist' for possible VALUEs."
(defun register-preview-default (r) (defun register-preview-default (r)
"Default function for the variable `register-preview-function'." "Default function for the variable `register-preview-function'."
(format "%s %s\n" (format "%s: %s\n"
(concat (single-key-description (car r)) ":") (single-key-description (car r))
(register-describe-oneline (car r)))) (register-describe-oneline (car r))))
(defvar register-preview-function #'register-preview-default (defvar register-preview-function #'register-preview-default
@ -456,10 +455,10 @@ Interactively, reads the register using `register-read-with-preview'."
(defun copy-to-register (register start end &optional delete-flag region) (defun copy-to-register (register start end &optional delete-flag region)
"Copy region into register REGISTER. "Copy region into register REGISTER.
With prefix arg, delete as well. With prefix arg, delete as well.
Called from program, takes four args: REGISTER, START, END and DELETE-FLAG. Called from program, takes five args: REGISTER, START, END, DELETE-FLAG,
START and END are buffer positions indicating what to copy. and REGION. START and END are buffer positions indicating what to copy.
The optional argument REGION if non-nil, indicates that we're not just copying The optional argument REGION if non-nil, indicates that we're not just
some text between START and END, but we're copying the region. copying some text between START and END, but we're copying the region.
Interactively, reads the register using `register-read-with-preview'." Interactively, reads the register using `register-read-with-preview'."
(interactive (list (register-read-with-preview "Copy to register: ") (interactive (list (register-read-with-preview "Copy to register: ")