diff options
| author | Juanma Barranquero | 2014-03-23 23:14:11 +0100 |
|---|---|---|
| committer | Juanma Barranquero | 2014-03-23 23:14:11 +0100 |
| commit | ee79b33f490f476db6ebde90eff5268588d32207 (patch) | |
| tree | 3aea21787b4e4ecc6d8e99ac5abc1ec62bcf3a64 | |
| parent | 3ea2c7811bb678c31ee2db467080c397cbf9e3a7 (diff) | |
| download | emacs-ee79b33f490f476db6ebde90eff5268588d32207.tar.gz emacs-ee79b33f490f476db6ebde90eff5268588d32207.zip | |
lisp/frameset.el (frameset-restore): Compare display strings with equal.
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/frameset.el | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 50d33c69b37..943a5e8da7c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2014-03-23 Juanma Barranquero <lekktu@gmail.com> | 1 | 2014-03-23 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 2 | ||
| 3 | * frameset.el (frameset-restore): Compare display strings with equal. | ||
| 4 | |||
| 3 | * frame.el (make-frame): Don't quote display name in error message, | 5 | * frame.el (make-frame): Don't quote display name in error message, |
| 4 | it is already a string. | 6 | it is already a string. |
| 5 | 7 | ||
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." | |||
| 1146 | frame to-tty duplicate) | 1146 | frame to-tty duplicate) |
| 1147 | ;; Only set target if forcing displays and the target display is different. | 1147 | ;; Only set target if forcing displays and the target display is different. |
| 1148 | (unless (or (frameset-keep-original-display-p force-display) | 1148 | (unless (or (frameset-keep-original-display-p force-display) |
| 1149 | (eq (frame-parameter nil 'display) | 1149 | (equal (frame-parameter nil 'display) |
| 1150 | (cdr (assq 'display frame-cfg)))) | 1150 | (cdr (assq 'display frame-cfg)))) |
| 1151 | (setq frameset--target-display (cons 'display | 1151 | (setq frameset--target-display (cons 'display |
| 1152 | (frame-parameter nil 'display)) | 1152 | (frame-parameter nil 'display)) |
| 1153 | to-tty (null (cdr frameset--target-display)))) | 1153 | to-tty (null (cdr frameset--target-display)))) |