diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/window.el | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a06cc0c1209..f5918102f8b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2014-05-22 Glenn Morris <rgm@gnu.org> + + * window.el (window--dump-frame): Avoid error in --without-x builds. + 2014-05-21 Glenn Morris <rgm@gnu.org> * nxml/nxml-mode.el (xml-mode): Only define this alias once. diff --git a/lisp/window.el b/lisp/window.el index 60f13e65c4e..21c9b925238 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -1102,7 +1102,9 @@ dumping to it." (frame-text-width frame) (frame-text-height frame) (frame-text-cols frame) (frame-text-lines frame)) (format "tool: %s scroll: %s fringe: %s border: %s right: %s bottom: %s\n\n" - (tool-bar-height frame t) + (if (fboundp 'tool-bar-height) + (tool-bar-height frame t) + "0") (frame-scroll-bar-width frame) (frame-fringe-width frame) (frame-border-width frame) |