diff options
| author | Glenn Morris | 2014-02-02 23:56:44 -0800 |
|---|---|---|
| committer | Glenn Morris | 2014-02-02 23:56:44 -0800 |
| commit | 7bcbca405fcab0cec6629856e9eeec8f97fd0a7d (patch) | |
| tree | ff44f9ae4be646c5d597301118084654bec91c1a /lisp | |
| parent | 15baaea8e763b5df8a7dee722c20293852845bd5 (diff) | |
| download | emacs-7bcbca405fcab0cec6629856e9eeec8f97fd0a7d.tar.gz emacs-7bcbca405fcab0cec6629856e9eeec8f97fd0a7d.zip | |
Tidy up some -to-register function argument specs
* lisp/register.el (window-configuration-to-register)
(frame-configuration-to-register): Unadvertise unused argument.
* lisp/frameset.el (frameset-to-register): Remove unused argument.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/frameset.el | 5 | ||||
| -rw-r--r-- | lisp/register.el | 8 |
3 files changed, 14 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b4391a165d3..77a81cfa3da 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,6 +1,9 @@ | |||
| 1 | 2014-02-03 Glenn Morris <rgm@gnu.org> | 1 | 2014-02-03 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * frameset.el (frameset-to-register): | 3 | * register.el (window-configuration-to-register) |
| 4 | (frame-configuration-to-register): Unadvertise unused argument. | ||
| 5 | * frameset.el (frameset-to-register): Remove unused argument. | ||
| 6 | |||
| 4 | * kmacro.el (kmacro-to-register): | 7 | * kmacro.el (kmacro-to-register): |
| 5 | * register.el (increment-register): | 8 | * register.el (increment-register): |
| 6 | * calc/calc-yank.el (calc-copy-to-register, calc-insert-register) | 9 | * calc/calc-yank.el (calc-copy-to-register, calc-insert-register) |
diff --git a/lisp/frameset.el b/lisp/frameset.el index 378fe20a497..7b8d613b836 100644 --- a/lisp/frameset.el +++ b/lisp/frameset.el | |||
| @@ -1220,14 +1220,13 @@ Called from `jump-to-register'. Internal use only." | |||
| 1220 | (goto-char (aref data 2)))))) | 1220 | (goto-char (aref data 2)))))) |
| 1221 | 1221 | ||
| 1222 | ;;;###autoload | 1222 | ;;;###autoload |
| 1223 | (defun frameset-to-register (register &optional _arg) | 1223 | (defun frameset-to-register (register) |
| 1224 | "Store the current frameset in register REGISTER. | 1224 | "Store the current frameset in register REGISTER. |
| 1225 | Use \\[jump-to-register] to restore the frameset. | 1225 | Use \\[jump-to-register] to restore the frameset. |
| 1226 | Argument is a character, naming the register. | 1226 | Argument is a character, naming the register. |
| 1227 | 1227 | ||
| 1228 | Interactively, reads the register using `register-read-with-preview'." | 1228 | Interactively, reads the register using `register-read-with-preview'." |
| 1229 | (interactive (list (register-read-with-preview "Frameset to register: ") | 1229 | (interactive (list (register-read-with-preview "Frameset to register: "))) |
| 1230 | current-prefix-arg)) | ||
| 1231 | (set-register register | 1230 | (set-register register |
| 1232 | (registerv-make | 1231 | (registerv-make |
| 1233 | (vector (frameset-save nil | 1232 | (vector (frameset-save nil |
diff --git a/lisp/register.el b/lisp/register.el index 1a42d0bf376..786646139f1 100644 --- a/lisp/register.el +++ b/lisp/register.el | |||
| @@ -201,6 +201,10 @@ Interactively, reads the register using `register-read-with-preview'." | |||
| 201 | ;; of point in the current buffer, so record that separately. | 201 | ;; of point in the current buffer, so record that separately. |
| 202 | (set-register register (list (current-window-configuration) (point-marker)))) | 202 | (set-register register (list (current-window-configuration) (point-marker)))) |
| 203 | 203 | ||
| 204 | ;; It has had the optional arg for ages, but never used it. | ||
| 205 | (set-advertised-calling-convention 'window-configuration-to-register | ||
| 206 | '(register) "24.4") | ||
| 207 | |||
| 204 | (defun frame-configuration-to-register (register &optional _arg) | 208 | (defun frame-configuration-to-register (register &optional _arg) |
| 205 | "Store the window configuration of all frames in register REGISTER. | 209 | "Store the window configuration of all frames in register REGISTER. |
| 206 | Use \\[jump-to-register] to restore the configuration. | 210 | Use \\[jump-to-register] to restore the configuration. |
| @@ -214,6 +218,10 @@ Interactively, reads the register using `register-read-with-preview'." | |||
| 214 | ;; of point in the current buffer, so record that separately. | 218 | ;; of point in the current buffer, so record that separately. |
| 215 | (set-register register (list (current-frame-configuration) (point-marker)))) | 219 | (set-register register (list (current-frame-configuration) (point-marker)))) |
| 216 | 220 | ||
| 221 | ;; It has had the optional arg for ages, but never used it. | ||
| 222 | (set-advertised-calling-convention 'frame-configuration-to-register | ||
| 223 | '(register) "24.4") | ||
| 224 | |||
| 217 | (defalias 'register-to-point 'jump-to-register) | 225 | (defalias 'register-to-point 'jump-to-register) |
| 218 | (defun jump-to-register (register &optional delete) | 226 | (defun jump-to-register (register &optional delete) |
| 219 | "Move point to location stored in a register. | 227 | "Move point to location stored in a register. |