Merge from origin/emacs-24

[gnu-emacs] / lisp / frameset.el

diff --git a/lisp/frameset.el b/lisp/frameset.el
index b943d47e7bfa04cd87a596d02865e9d30c040419..f8436259df030ff27e9030445065fb298e38a960 100644 (file)
--- a/lisp/frameset.el
+++ b/lisp/frameset.el
@@ -664,10 +664,7 @@ nil while the filtering is done to restore it."
     ;; Set the display parameter after filtering, so that filter functions
     ;; have access to its original value.
     (when frameset--target-display
-      (let ((display (assq 'display filtered)))
-       (if display
-           (setcdr display (cdr frameset--target-display))
-         (push frameset--target-display filtered))))
+      (setf (alist-get 'display filtered) (cdr frameset--target-display)))
     filtered))
 
 \f