diff options
| author | Glenn Morris <rgm@gnu.org> | 2019-01-30 09:12:15 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2019-01-30 09:12:15 -0800 |
| commit | 08bc407a228796b64e321cb28b38b39062ab1732 (patch) | |
| tree | 8e390c58a811f64a4f44c7f0e6934b3255155af2 /lisp/image-mode.el | |
| parent | 49e253a0f803b497ee3177c1c346d4e0ac70fdae (diff) | |
| parent | b94d76752776cca4d1652cfe715a60f4a36f14a3 (diff) | |
| download | emacs-08bc407a228796b64e321cb28b38b39062ab1732.tar.gz | |
Merge from origin/emacs-26
b94d767 (origin/emacs-26) Minor copyedits in last manual change
73508e6 Improve documentation of face numbers
bf235ce * doc/emacs/custom.texi (Authentication): Refer to the "Help ...
ceccb3c New node Authentication in the Emacs manual
9078f34 Fix a loop in c-fl-decl-start. This fixes bug #34186.
a177fe7 Fix LaTeX output of month and day from cal-tex.el
90177d7 Avoid elisp crash for OpenPGP User IDs with no e-mail address
68e55a0 image-mode: Do not use default scaling (bug#33990)
b6c762a create-image: Expand documentation (bug#33990)
928d342 Improve documentation of 'isearch-filter-predicate'
9034dd6 Fix cursor column positioning on Grep hits
# Conflicts:
# doc/emacs/custom.texi
Diffstat (limited to 'lisp/image-mode.el')
| -rw-r--r-- | lisp/image-mode.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/image-mode.el b/lisp/image-mode.el index 3be515d9143..fa1362c471b 100644 --- a/lisp/image-mode.el +++ b/lisp/image-mode.el @@ -741,9 +741,11 @@ was inserted." (type (if (image--imagemagick-wanted-p filename) 'imagemagick (image-type file-or-data nil data-p))) + ;; :scale 1: If we do not set this, create-image will apply + ;; default scaling based on font size. (image (if (not edges) - (create-image file-or-data type data-p) - (create-image file-or-data type data-p + (create-image file-or-data type data-p :scale 1) + (create-image file-or-data type data-p :scale 1 :max-width (- (nth 2 edges) (nth 0 edges)) :max-height (- (nth 3 edges) (nth 1 edges))))) (inhibit-read-only t) |