diff options
author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2016-11-30 21:56:42 +0100 |
---|---|---|
committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2016-11-30 21:56:42 +0100 |
commit | 305ff7d74aae186040a41bcef2e59446350c438e (patch) | |
tree | 73e7c63cdec9a296a84be5d1c15a1c15e52a0759 | |
parent | 3271cbab6575176e9663c0ddc77ee98bf53d9fb9 (diff) | |
parent | e336f39ce7cb101d1fe735e2e35fb76d93bfe173 (diff) | |
download | org-mode-305ff7d74aae186040a41bcef2e59446350c438e.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/org.el | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lisp/org.el b/lisp/org.el index 5763829..6651436 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -19458,9 +19458,8 @@ inspection." (defun org--get-display-dpi () "Get the DPI of the display. - -Assumes that the display has the same pixel width in the -horizontal and vertical directions." +The function assumes that the display has the same pixel width in +the horizontal and vertical directions." (if (display-graphic-p) (round (/ (display-pixel-height) (/ (display-mm-height) 25.4))) @@ -19503,12 +19502,11 @@ a HTML file." (texfilebase (make-temp-name (expand-file-name "orgtex" tmpdir))) (texfile (concat texfilebase ".tex")) - (font-height (face-attribute 'default :height nil)) (image-size-adjust (or (plist-get processing-info :image-size-adjust) '(1.0 . 1.0))) (scale (* (if buffer (car image-size-adjust) (cdr image-size-adjust)) (or (plist-get options (if buffer :scale :html-scale)) 1.0))) - (dpi (* scale (floor (if buffer font-height 140.0)))) + (dpi (* scale (if buffer (org--get-display-dpi) 140.0))) (fg (or (plist-get options (if buffer :foreground :html-foreground)) "Black")) (bg (or (plist-get options (if buffer :background :html-background)) |