[Emacs-diffs] emacs-24 r116845: lisp/frameset.el (frameset-restore): Compare display strings with equal.

[Juanma Barranquero]

------------------------------------------------------------
revno: 116845
revision-id: address@hidden
parent: address@hidden
committer: Juanma Barranquero <address@hidden>
branch nick: emacs-24
timestamp: Sun 2014-03-23 23:14:11 +0100
message:
  lisp/frameset.el (frameset-restore): Compare display strings with equal.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/frameset.el               frameset.el-20130802043218-tfwraxv1c2zlibpw-1

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-03-23 22:11:59 +0000
+++ b/lisp/ChangeLog    2014-03-23 22:14:11 +0000
@@ -1,5 +1,7 @@
 2014-03-23  Juanma Barranquero  <address@hidden>
 
+       * 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.
 

=== modified file 'lisp/frameset.el'
--- a/lisp/frameset.el  2014-03-12 18:36:26 +0000
+++ b/lisp/frameset.el  2014-03-23 22:14:11 +0000
@@ -1146,8 +1146,8 @@
                     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))))