[Emacs-diffs] emacs-24 r117141: * window.el (window--dump-frame): Avoid error in --without-x builds.

[Glenn Morris]

------------------------------------------------------------
revno: 117141
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Wed 2014-05-21 23:36:37 -0700
message:
  * window.el (window--dump-frame): Avoid error in --without-x builds.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/window.el                 window.el-20091113204419-o5vbwnq5f7feedwu-94

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-05-21 20:07:27 +0000
+++ b/lisp/ChangeLog    2014-05-22 06:36:37 +0000
@@ -1,3 +1,7 @@
+2014-05-22  Glenn Morris  <address@hidden>
+
+       * window.el (window--dump-frame): Avoid error in --without-x builds.
+
 2014-05-21  Glenn Morris  <address@hidden>
 
        * nxml/nxml-mode.el (xml-mode): Only define this alias once.

=== modified file 'lisp/window.el'
--- a/lisp/window.el    2014-03-16 09:26:58 +0000
+++ b/lisp/window.el    2014-05-22 06:36:37 +0000
@@ -1102,7 +1102,9 @@
               (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)