diff options
| author | Glenn Morris | 2019-04-17 09:32:39 -0700 |
|---|---|---|
| committer | Glenn Morris | 2019-04-17 09:32:39 -0700 |
| commit | 632f489f7da21d682d2b292cf3b3079145ea83ca (patch) | |
| tree | e3052c6f308a0117596d32d12278791a9065fbae /doc | |
| parent | 63a190a640f620f49b42e70e9e68f88e61c158b3 (diff) | |
| parent | 266c62290f5a0843555d2a18878a58395a6fd05f (diff) | |
| download | emacs-632f489f7da21d682d2b292cf3b3079145ea83ca.tar.gz emacs-632f489f7da21d682d2b292cf3b3079145ea83ca.zip | |
Merge from origin/emacs-26
266c622 Downcase charset
92f3459 Update for Emacs-26
beb4eac * doc/lispref/display.texi (Showing Images): Fix a typo. (Bu...
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/lispref/display.texi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index a97aabe9dff..a2ed4b38913 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi | |||
| @@ -5909,8 +5909,8 @@ This function returns the size of an image as a pair | |||
| 5909 | specification. @var{pixels} non-@code{nil} means return sizes measured | 5909 | specification. @var{pixels} non-@code{nil} means return sizes measured |
| 5910 | in pixels, otherwise return sizes measured in the default character size | 5910 | in pixels, otherwise return sizes measured in the default character size |
| 5911 | of @var{frame} (@pxref{Frame Font}). @var{frame} is the frame on which | 5911 | of @var{frame} (@pxref{Frame Font}). @var{frame} is the frame on which |
| 5912 | the image will be displayed. @var{frame} null or omitted means use the | 5912 | the image will be displayed. @var{frame} @code{nil} or omitted means |
| 5913 | selected frame (@pxref{Input Focus}). | 5913 | use the selected frame (@pxref{Input Focus}). |
| 5914 | @end defun | 5914 | @end defun |
| 5915 | 5915 | ||
| 5916 | @defvar max-image-size | 5916 | @defvar max-image-size |