aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2014-03-12 03:21:09 +0100
committerJuanma Barranquero2014-03-12 03:21:09 +0100
commit13c00cf02f3be8d0c71caba9a1a7edd9e752142d (patch)
tree5b8b8d28eef5a288ce3178850f3c81fc3fa6f5c6
parent536a17e3c6e808e34f4a9477025f4000b7975fd5 (diff)
downloademacs-13c00cf02f3be8d0c71caba9a1a7edd9e752142d.tar.gz
emacs-13c00cf02f3be8d0c71caba9a1a7edd9e752142d.zip
lisp/frameset.el (frameset--jump-to-register): Add autoload.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/frameset.el1
2 files changed, 6 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1155b8a2533..b99c5f07071 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12014-03-12 Juanma Barranquero <lekktu@gmail.com>
2
3 * frameset.el (frameset--jump-to-register): Add autoload; it could be
4 called from jump-to-register after unloading the frameset package.
5
12014-03-11 Stefan Monnier <monnier@iro.umontreal.ca> 62014-03-11 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * simple.el (set-mark): Ensure mark-active is nil if the mark is nil 8 * simple.el (set-mark): Ensure mark-active is nil if the mark is nil
diff --git a/lisp/frameset.el b/lisp/frameset.el
index ca0926ab652..6470833d825 100644
--- a/lisp/frameset.el
+++ b/lisp/frameset.el
@@ -1236,6 +1236,7 @@ All keyword parameters default to nil."
1236 1236
1237;; Register support 1237;; Register support
1238 1238
1239;;;###autoload
1239(defun frameset--jump-to-register (data) 1240(defun frameset--jump-to-register (data)
1240 "Restore frameset from DATA stored in register. 1241 "Restore frameset from DATA stored in register.
1241Called from `jump-to-register'. Internal use only." 1242Called from `jump-to-register'. Internal use only."