summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2013-08-02 18:03:13 +0200
committerJuanma Barranquero <lekktu@gmail.com>2013-08-02 18:03:13 +0200
commitf078d5700b89af7e729d065b2c0098a360c0b56e (patch)
treefef9d2dad8a5e8fb0b774d9591da0721ae7e8b92
parent10d604f91739546014113285017296342e01b750 (diff)
downloademacs-f078d5700b89af7e729d065b2c0098a360c0b56e.tar.gz
emacs-f078d5700b89af7e729d065b2c0098a360c0b56e.tar.bz2
emacs-f078d5700b89af7e729d065b2c0098a360c0b56e.zip
lisp/frameset.el (frameset-filter-params): Fix order of arguments.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/frameset.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f75bbc29861..2ff543d3799 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
2013-08-02 Juanma Barranquero <lekktu@gmail.com>
+ * frameset.el (frameset-filter-params): Fix order of arguments.
+
+2013-08-02 Juanma Barranquero <lekktu@gmail.com>
+
Move code related to saving frames to frameset.el.
* desktop.el: Require frameset.
(desktop-restore-frames): Doc fix.
diff --git a/lisp/frameset.el b/lisp/frameset.el
index fef8c093ee9..9610d457008 100644
--- a/lisp/frameset.el
+++ b/lisp/frameset.el
@@ -230,7 +230,7 @@ nil while the filtering is done to restore it."
(:restore
(when saving (push current filtered)))
((or `(,fun . ,args) (and fun (pred fboundp)))
- (let ((this (apply fun filtered current parameters saving args)))
+ (let ((this (apply fun current filtered parameters saving args)))
(when this
(push (if (eq this t) current this) filtered))))
(other