[Emacs-diffs] emacs-25 a64b71e: Don't have help functions call x-display-pixel-width/-height on ttys

[Martin Rudalics]

branch: emacs-25
commit a64b71e3cba8bdc11222140fa69fb8c86ce5ca30
Author: Martin Rudalics <address@hidden>
Commit: Martin Rudalics <address@hidden>

    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.
---
 lisp/help.el |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/help.el b/lisp/help.el
index c558b65..d6cfae4 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.