diff options
| author | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:39:08 -0800 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:39:08 -0800 |
| commit | ec0a80cc283badc7f7fd5ef78512dde6d34b1355 (patch) | |
| tree | 7190e0fb3d4aa06018d8cf997f06b806fb09a9c8 /lisp/help.el | |
| parent | d259328fb87db8cc67d52771efcfa653e52c5b71 (diff) | |
| parent | e823c34072bf045800d91e12c7ddb61fa23c6e30 (diff) | |
| download | emacs-25-merge.tar.gz | |
Merge emacs-25 into master (using imerge)emacs-25-merge
Diffstat (limited to 'lisp/help.el')
| -rw-r--r-- | lisp/help.el | 4 |
1 files changed, 2 insertions, 2 deletions
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. |