Tiny doc etc changes related to frameset-to-register

* doc/emacs/regs.texi (Configuration Registers): Update C-x r f binding.

* lisp/textmodes/remember.el (remember): Use frameset-to-register
rather than frame-configuration-to-register.

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index f60ce6717289d7184ab256b5747ff2a29afe109d..0e919e97b9b6db26ddd2e238cf776acc8d15b827 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2014-02-14  Glenn Morris  <rgm@gnu.org>
+
+       * regs.texi (Configuration Registers): Update C-x r f binding.
+
 2014-02-12  Glenn Morris  <rgm@gnu.org>
 
        * mini.texi (Completion Options): No longer mention icomplete,

diff --git a/doc/emacs/regs.texi b/doc/emacs/regs.texi
index 5bc22e94ed33f7f3e2d6ef0011dd256e604e86d7..a0ff70793885b7330c7534b39eb11c3d9f38f854 100644 (file)
--- a/doc/emacs/regs.texi
+++ b/doc/emacs/regs.texi
@@ -182,7 +182,7 @@ rather than a text string, if the register contains a rectangle.
 @cindex saving window configuration in a register
 
 @findex window-configuration-to-register
-@findex frame-configuration-to-register
+@findex frameset-to-register
 @kindex C-x r w
 @kindex C-x r f
   You can save the window configuration of the selected frame in a
@@ -196,7 +196,7 @@ Save the state of the selected frame's windows in register @var{r}
 (@code{window-configuration-to-register}).
 @item C-x r f @var{r}
 Save the state of all frames, including all their windows, in register
-@var{r} (@code{frame-configuration-to-register}).
+@var{r} (@code{frameset-to-register}).
 @end table
 
   Use @kbd{C-x r j @var{r}} to restore a window or frame configuration.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 787fa26f30ca7ae672aacb7f9c852d9e5ce336d6..c6498210524769f49a4b3f949f409ed45e66daee 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-14  Glenn Morris  <rgm@gnu.org>
+
+       * textmodes/remember.el (remember): Use frameset-to-register
+       rather than frame-configuration-to-register.
+
 2014-02-14  Jay Belanger  <jay.p.belanger@gmail.com>
 
        * calc/calc-menu.el (calc-vectors-menu): Remove menu item for

diff --git a/lisp/textmodes/remember.el b/lisp/textmodes/remember.el
index 3f5227f908b4852046c111e208d393c8355eeda4..33e44c05c339388537c2e0444a151293fc4e6eb3 100644 (file)
--- a/lisp/textmodes/remember.el
+++ b/lisp/textmodes/remember.el
@@ -276,7 +276,7 @@ With a prefix or a visible region, use the region as INITIAL."
                         transient-mark-mode))
            (buffer-substring (region-beginning) (region-end)))))
   (funcall (if remember-in-new-frame
-               #'frame-configuration-to-register
+               #'frameset-to-register
              #'window-configuration-to-register) remember-register)
   (let* ((annotation
           (if remember-run-all-annotation-functions-flag