From: Juanma Barranquero Date: Sun, 23 Mar 2014 22:14:11 +0000 (+0100) Subject: lisp/frameset.el (frameset-restore): Compare display strings with equal. X-Git-Tag: emacs-24.3.90~105 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ee79b33f490f476db6ebde90eff5268588d32207;p=emacs.git lisp/frameset.el (frameset-restore): Compare display strings with equal. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 50d33c69b37..943a5e8da7c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2014-03-23 Juanma Barranquero + * frameset.el (frameset-restore): Compare display strings with equal. + * frame.el (make-frame): Don't quote display name in error message, it is already a string. diff --git a/lisp/frameset.el b/lisp/frameset.el index 05fae1b4fa2..50055bb2782 100644 --- a/lisp/frameset.el +++ b/lisp/frameset.el @@ -1146,8 +1146,8 @@ All keyword parameters default to nil." frame to-tty duplicate) ;; Only set target if forcing displays and the target display is different. (unless (or (frameset-keep-original-display-p force-display) - (eq (frame-parameter nil 'display) - (cdr (assq 'display frame-cfg)))) + (equal (frame-parameter nil 'display) + (cdr (assq 'display frame-cfg)))) (setq frameset--target-display (cons 'display (frame-parameter nil 'display)) to-tty (null (cdr frameset--target-display))))