* window.el (window--dump-frame): Avoid error in --without-x builds.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a06cc0c1209bd482fd1ac83b0c0a27bac575b705..f5918102f8bc0575b7b5f1e81044e025d91f72fe 100644 (file)
--- 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 60f13e65c4e053f8b702e9cad3fed3de6ead62f1..21c9b925238d0520d55b13d74f69558e3cfd27fa 100644 (file)
--- 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)