aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2014-03-05 17:22:47 +0100
committerJuanma Barranquero2014-03-05 17:22:47 +0100
commit9284000e100d7c41be17edfe4a643263e3dc13b0 (patch)
treecb28d6d81385dcb4d87dd6f2f642419de2162971
parente1a2cb1ce53d6c59e8c2d56bbdee8aac2e8151b1 (diff)
downloademacs-9284000e100d7c41be17edfe4a643263e3dc13b0.tar.gz
emacs-9284000e100d7c41be17edfe4a643263e3dc13b0.zip
lisp/frameset.el (frameset--initial-params): Filter out null entries.
-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 579acdb90c5..7ee1f2f21ec 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12014-03-05 Juanma Barranquero <lekktu@gmail.com>
2
3 * frameset.el (frameset--initial-params): Filter out null entries.
4
12014-03-05 Martin Rudalics <rudalics@gmx.at> 52014-03-05 Martin Rudalics <rudalics@gmx.at>
2 6
3 * window.el (window-min-height, window-min-width): Rewrite 7 * window.el (window-min-height, window-min-width): Rewrite
diff --git a/lisp/frameset.el b/lisp/frameset.el
index f0d38d911f3..6fd23f739ae 100644
--- a/lisp/frameset.el
+++ b/lisp/frameset.el
@@ -941,7 +941,7 @@ Setting position and size parameters as soon as possible helps reducing
941flickering; other parameters, like `minibuffer' and `border-width', can 941flickering; other parameters, like `minibuffer' and `border-width', can
942not be changed once the frame has been created. Internal use only." 942not be changed once the frame has been created. Internal use only."
943 (cl-loop for param in '(left top with height border-width minibuffer) 943 (cl-loop for param in '(left top with height border-width minibuffer)
944 collect (assq param parameters))) 944 when (assq param parameters) collect it))
945 945
946(defun frameset--restore-frame (parameters window-state filters force-onscreen) 946(defun frameset--restore-frame (parameters window-state filters force-onscreen)
947 "Set up and return a frame according to its saved state. 947 "Set up and return a frame according to its saved state.