From: Glenn Morris <rgm@gnu.org>
Date: Mon, 3 Feb 2014 07:56:44 +0000 (-0800)
Subject: Tidy up some -to-register function argument specs
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~182
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7bcbca405fcab0cec6629856e9eeec8f97fd0a7d;p=emacs.git

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.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b4391a165d3..77a81cfa3da 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,9 @@
 2014-02-03  Glenn Morris  <rgm@gnu.org>
 
-	* frameset.el (frameset-to-register):
+	* register.el (window-configuration-to-register)
+	(frame-configuration-to-register): Unadvertise unused argument.
+	* frameset.el (frameset-to-register): Remove unused argument.
+
 	* kmacro.el (kmacro-to-register):
 	* register.el (increment-register):
 	* 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."
 	(goto-char (aref data 2))))))
 
 ;;;###autoload
-(defun frameset-to-register (register &optional _arg)
+(defun frameset-to-register (register)
   "Store the current frameset in register REGISTER.
 Use \\[jump-to-register] to restore the frameset.
 Argument is a character, naming the register.
 
 Interactively, reads the register using `register-read-with-preview'."
-  (interactive (list (register-read-with-preview "Frameset to register: ")
-		     current-prefix-arg))
+  (interactive (list (register-read-with-preview "Frameset to register: ")))
   (set-register register
 		(registerv-make
 		 (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'."
   ;; of point in the current buffer, so record that separately.
   (set-register register (list (current-window-configuration) (point-marker))))
 
+;; It has had the optional arg for ages, but never used it.
+(set-advertised-calling-convention 'window-configuration-to-register
+				   '(register) "24.4")
+
 (defun frame-configuration-to-register (register &optional _arg)
   "Store the window configuration of all frames in register REGISTER.
 Use \\[jump-to-register] to restore the configuration.
@@ -214,6 +218,10 @@ Interactively, reads the register using `register-read-with-preview'."
   ;; of point in the current buffer, so record that separately.
   (set-register register (list (current-frame-configuration) (point-marker))))
 
+;; It has had the optional arg for ages, but never used it.
+(set-advertised-calling-convention 'frame-configuration-to-register
+				   '(register) "24.4")
+
 (defalias 'register-to-point 'jump-to-register)
 (defun jump-to-register (register &optional delete)
   "Move point to location stored in a register.