diff options
| author | Martin Rudalics | 2015-12-18 11:03:03 +0100 |
|---|---|---|
| committer | Martin Rudalics | 2015-12-18 11:03:03 +0100 |
| commit | a64b71e3cba8bdc11222140fa69fb8c86ce5ca30 (patch) | |
| tree | caf2f4a8c730454c9c8400091e13c77dfe6b8cc9 | |
| parent | f4747f6c51a07522ea4d9863b20357489f03ce69 (diff) | |
| download | emacs-a64b71e3cba8bdc11222140fa69fb8c86ce5ca30.tar.gz emacs-a64b71e3cba8bdc11222140fa69fb8c86ce5ca30.zip | |
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.
| -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." | |||
| 1069 | ;;; Automatic resizing of temporary buffers. | 1069 | ;;; Automatic resizing of temporary buffers. |
| 1070 | (defcustom temp-buffer-max-height | 1070 | (defcustom temp-buffer-max-height |
| 1071 | (lambda (buffer) | 1071 | (lambda (buffer) |
| 1072 | (if (eq (selected-window) (frame-root-window)) | 1072 | (if (and (display-graphic-p) (eq (selected-window) (frame-root-window))) |
| 1073 | (/ (x-display-pixel-height) (frame-char-height) 2) | 1073 | (/ (x-display-pixel-height) (frame-char-height) 2) |
| 1074 | (/ (- (frame-height) 2) 2))) | 1074 | (/ (- (frame-height) 2) 2))) |
| 1075 | "Maximum height of a window displaying a temporary buffer. | 1075 | "Maximum height of a window displaying a temporary buffer. |
| @@ -1086,7 +1086,7 @@ function is called, the window to be resized is selected." | |||
| 1086 | 1086 | ||
| 1087 | (defcustom temp-buffer-max-width | 1087 | (defcustom temp-buffer-max-width |
| 1088 | (lambda (buffer) | 1088 | (lambda (buffer) |
| 1089 | (if (eq (selected-window) (frame-root-window)) | 1089 | (if (and (display-graphic-p) (eq (selected-window) (frame-root-window))) |
| 1090 | (/ (x-display-pixel-width) (frame-char-width) 2) | 1090 | (/ (x-display-pixel-width) (frame-char-width) 2) |
| 1091 | (/ (- (frame-width) 2) 2))) | 1091 | (/ (- (frame-width) 2) 2))) |
| 1092 | "Maximum width of a window displaying a temporary buffer. | 1092 | "Maximum width of a window displaying a temporary buffer. |