diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/frame.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f00bef537f6..50d33c69b37 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-03-23 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * frame.el (make-frame): Don't quote display name in error message, | ||
| 4 | it is already a string. | ||
| 5 | |||
| 1 | 2014-03-23 Thierry Volpiatto <thierry.volpiatto@gmail.com> | 6 | 2014-03-23 Thierry Volpiatto <thierry.volpiatto@gmail.com> |
| 2 | 7 | ||
| 3 | * net/tramp.el (tramp-read-passwd): Suspend the timers while reading | 8 | * net/tramp.el (tramp-read-passwd): Suspend the timers while reading |
diff --git a/lisp/frame.el b/lisp/frame.el index b62c939d536..7b0a0a80082 100644 --- a/lisp/frame.el +++ b/lisp/frame.el | |||
| @@ -668,7 +668,7 @@ the new frame according to its own rules." | |||
| 668 | (cdr (assq 'window-system parameters))) | 668 | (cdr (assq 'window-system parameters))) |
| 669 | (display | 669 | (display |
| 670 | (or (window-system-for-display display) | 670 | (or (window-system-for-display display) |
| 671 | (error "Don't know how to interpret display \"%S\"" | 671 | (error "Don't know how to interpret display %S" |
| 672 | display))) | 672 | display))) |
| 673 | (t window-system))) | 673 | (t window-system))) |
| 674 | (frame-creation-function (cdr (assq w frame-creation-function-alist))) | 674 | (frame-creation-function (cdr (assq w frame-creation-function-alist))) |