From: Martin Rudalics <rudalics@gmx.at>
Date: Fri, 18 Dec 2015 10:03:03 +0000 (+0100)
Subject: Don't have help functions call x-display-pixel-width/-height on ttys
X-Git-Tag: emacs-25.0.90~450
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a64b71e3cba8bdc11222140fa69fb8c86ce5ca30;p=emacs.git

Don't have help functions call x-display-pixel-width/-height on ttys

* lisp/help.el (temp-buffer-max-height, temp-buffer-max-width):
Don't call x-display-pixel-width/-height on ttys.
---

diff --git a/lisp/help.el b/lisp/help.el
index c558b652b7e..d6cfae44183 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -1069,7 +1069,7 @@ is currently activated with completion."
 ;;; Automatic resizing of temporary buffers.
 (defcustom temp-buffer-max-height
   (lambda (buffer)
-    (if (eq (selected-window) (frame-root-window))
+    (if (and (display-graphic-p) (eq (selected-window) (frame-root-window)))
 	(/ (x-display-pixel-height) (frame-char-height) 2)
       (/ (- (frame-height) 2) 2)))
   "Maximum height of a window displaying a temporary buffer.
@@ -1086,7 +1086,7 @@ function is called, the window to be resized is selected."
 
 (defcustom temp-buffer-max-width
   (lambda (buffer)
-    (if (eq (selected-window) (frame-root-window))
+    (if (and (display-graphic-p) (eq (selected-window) (frame-root-window)))
 	(/ (x-display-pixel-width) (frame-char-width) 2)
       (/ (- (frame-width) 2) 2)))
   "Maximum width of a window displaying a temporary buffer.