diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-02-13 22:55:59 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-02-13 22:55:59 -0800 |
| commit | 48c4f9b124a17b4056e0b93f490befb09947f410 (patch) | |
| tree | e2822e289bb9dde032b8b07f9e81ba2c4fe066ca | |
| parent | 2804e0bd8f9a58d8d9e77965cdb34f495ee7f292 (diff) | |
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.
| -rw-r--r-- | doc/emacs/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/emacs/regs.texi | 4 | ||||
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/textmodes/remember.el | 2 |
4 files changed, 12 insertions, 3 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index f60ce67172..0e919e97b9 100644 --- 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 5bc22e94ed..a0ff707938 100644 --- 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 787fa26f30..c649821052 100644 --- 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 3f5227f908..33e44c05c3 100644 --- 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 |