diff options
author | Sébastien Delafond <sdelafond@gmail.com> | 2015-11-27 17:40:16 +0100 |
---|---|---|
committer | Sébastien Delafond <sdelafond@gmail.com> | 2015-11-27 17:40:16 +0100 |
commit | 09600666ecbbebe86830a937658465d046e13d06 (patch) | |
tree | f8140dfdec0fdfc11323d6c491f7680673bcc0de /contrib/lisp/ox-koma-letter.el | |
parent | 1be13d57dc8357576a8285c6dadc03db9e3ed7b0 (diff) |
Imported Upstream version 8.3.2
Diffstat (limited to 'contrib/lisp/ox-koma-letter.el')
-rw-r--r-- | contrib/lisp/ox-koma-letter.el | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/contrib/lisp/ox-koma-letter.el b/contrib/lisp/ox-koma-letter.el index 8ba380c..e6fed3b 100644 --- a/contrib/lisp/ox-koma-letter.el +++ b/contrib/lisp/ox-koma-letter.el @@ -435,7 +435,8 @@ e.g. \"title-subject:t\"." (:inbuffer-with-backaddress nil "backaddress" 'koma-letter:empty) (:inbuffer-with-email nil "email" 'koma-letter:empty) (:inbuffer-with-foldmarks nil "foldmarks" 'koma-letter:empty) - (:inbuffer-with-phone nil "phone" 'koma-letter:empty)) + (:inbuffer-with-phone nil "phone" 'koma-letter:empty) + (:inbuffer-with-place nil "place" 'koma-letter:empty)) :translate-alist '((export-block . org-koma-letter-export-block) (export-snippet . org-koma-letter-export-snippet) (headline . org-koma-letter-headline) @@ -734,9 +735,13 @@ a communication channel." (format "\\KOMAoption{backaddress}{%s}\n" (if (plist-get info :with-backaddress) "true" "false"))) ;; Place. - (and (funcall check-scope 'place) - (format "\\setkomavar{place}{%s}\n" - (if (plist-get info :with-place) (plist-get info :place) ""))) + (let ((with-place-set (funcall check-scope 'with-place)) + (place-set (funcall check-scope 'place))) + (and (or (and with-place-set place-set) + (and (eq scope 'buffer) (or with-place-set place-set))) + (format "\\setkomavar{place}{%s}\n" + (if (plist-get info :with-place) (plist-get info :place) + "")))) ;; Folding marks. (and (funcall check-scope 'with-foldmarks) (let ((foldmarks (plist-get info :with-foldmarks))) |