aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2009-03-12 12:14:11 +0000
committerJuanma Barranquero2009-03-12 12:14:11 +0000
commit1a86cc81da9a6be24e32c7eec7e4c29c0532bad2 (patch)
treec70de054283d36947323e7d9aec6a8e67055ad05
parentd472514e10c3b27151e1de5fc2d59e6f136f6c35 (diff)
downloademacs-1a86cc81da9a6be24e32c7eec7e4c29c0532bad2.tar.gz
emacs-1a86cc81da9a6be24e32c7eec7e4c29c0532bad2.zip
* register.el (get-register): Rename arg REG to REGISTER for
consistency with other register functions. (set-register, jump-to-register): Fix typos in docstrings. (copy-to-register, copy-rectangle-to-register): Reflow docstrings.
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/register.el17
2 files changed, 16 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6f7ed27306a..574382aa545 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
12009-03-12 Juanma Barranquero <lekktu@gmail.com>
2
3 * register.el (get-register): Rename arg REG to REGISTER for
4 consistency with other register functions.
5 (set-register, jump-to-register): Fix typos in docstrings.
6 (copy-to-register, copy-rectangle-to-register): Reflow docstrings.
7
12009-03-12 Glenn Morris <rgm@gnu.org> 82009-03-12 Glenn Morris <rgm@gnu.org>
2 9
3 * mail/mailabbrev.el (mail-abbrev-next-line) 10 * mail/mailabbrev.el (mail-abbrev-next-line)
diff --git a/lisp/register.el b/lisp/register.el
index c944e5411d1..134589d65e2 100644
--- a/lisp/register.el
+++ b/lisp/register.el
@@ -58,13 +58,13 @@ A list of the form (WINDOW-CONFIGURATION POSITION)
58A list of the form (FRAME-CONFIGURATION POSITION) 58A list of the form (FRAME-CONFIGURATION POSITION)
59 represents a saved frame configuration plus a saved value of point.") 59 represents a saved frame configuration plus a saved value of point.")
60 60
61(defun get-register (reg) 61(defun get-register (register)
62 "Return contents of Emacs register named REG, or nil if none." 62 "Return contents of Emacs register named REGISTER, or nil if none."
63 (cdr (assq reg register-alist))) 63 (cdr (assq register register-alist)))
64 64
65(defun set-register (register value) 65(defun set-register (register value)
66 "Set contents of Emacs register named REGISTER to VALUE. Returns VALUE. 66 "Set contents of Emacs register named REGISTER to VALUE. Returns VALUE.
67See the documentation of the variable `register-alist' for possible VALUE." 67See the documentation of the variable `register-alist' for possible VALUEs."
68 (let ((aelt (assq register register-alist))) 68 (let ((aelt (assq register register-alist)))
69 (if aelt 69 (if aelt
70 (setcdr aelt value) 70 (setcdr aelt value)
@@ -105,7 +105,7 @@ Argument is a character, naming the register."
105(defun jump-to-register (register &optional delete) 105(defun jump-to-register (register &optional delete)
106 "Move point to location stored in a register. 106 "Move point to location stored in a register.
107If the register contains a file name, find that file. 107If the register contains a file name, find that file.
108 \(To put a file name in a register, you must use `set-register'.) 108\(To put a file name in a register, you must use `set-register'.)
109If the register contains a window configuration (one frame) or a frame 109If the register contains a window configuration (one frame) or a frame
110configuration (all frames), restore that frame or all frames accordingly. 110configuration (all frames), restore that frame or all frames accordingly.
111First argument is a character, naming the register. 111First argument is a character, naming the register.
@@ -288,7 +288,8 @@ Interactively, second arg is non-nil if prefix arg is supplied."
288 (if (not arg) (exchange-point-and-mark))) 288 (if (not arg) (exchange-point-and-mark)))
289 289
290(defun copy-to-register (register start end &optional delete-flag) 290(defun copy-to-register (register start end &optional delete-flag)
291 "Copy region into register REGISTER. With prefix arg, delete as well. 291 "Copy region into register REGISTER.
292With prefix arg, delete as well.
292Called from program, takes four args: REGISTER, START, END and DELETE-FLAG. 293Called from program, takes four args: REGISTER, START, END and DELETE-FLAG.
293START and END are buffer positions indicating what to copy." 294START and END are buffer positions indicating what to copy."
294 (interactive "cCopy to register: \nr\nP") 295 (interactive "cCopy to register: \nr\nP")
@@ -325,8 +326,8 @@ START and END are buffer positions indicating what to prepend."
325 326
326(defun copy-rectangle-to-register (register start end &optional delete-flag) 327(defun copy-rectangle-to-register (register start end &optional delete-flag)
327 "Copy rectangular region into register REGISTER. 328 "Copy rectangular region into register REGISTER.
328With prefix arg, delete as well. To insert this register 329With prefix arg, delete as well.
329in the buffer, use \\[insert-register]. 330To insert this register in the buffer, use \\[insert-register].
330 331
331Called from a program, takes four args: REGISTER, START, END and DELETE-FLAG. 332Called from a program, takes four args: REGISTER, START, END and DELETE-FLAG.
332START and END are buffer positions giving two corners of rectangle." 333START and END are buffer positions giving two corners of rectangle."