diff options
author | Bastien Guerry <bzg@altern.org> | 2014-06-19 00:49:20 +0200 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2014-06-19 00:49:20 +0200 |
commit | a77118b3cad9bdda753ec0397233faabfc5018fa (patch) | |
tree | 5ce96a3f8f34a9099ddf560ab9ff4c5940fd863f | |
parent | 8b959237fca518fbd6dc7cd36a67093e1ec1f00b (diff) | |
parent | 08a9587e0183fa2831ba0d5f084d49665f7bec0f (diff) | |
download | org-mode-a77118b3cad9bdda753ec0397233faabfc5018fa.tar.gz |
Merge branch 'maint'
Conflicts:
contrib/lisp/ox-koma-letter.el
-rw-r--r-- | contrib/lisp/ox-koma-letter.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/lisp/ox-koma-letter.el b/contrib/lisp/ox-koma-letter.el index aa75ab8..c1ed57f 100644 --- a/contrib/lisp/ox-koma-letter.el +++ b/contrib/lisp/ox-koma-letter.el @@ -390,7 +390,8 @@ was not present." '((:latex-class "LATEX_CLASS" nil org-koma-letter-default-class t) (:lco "LCO" nil org-koma-letter-class-option-file) (:author "AUTHOR" nil (org-koma-letter--get-value org-koma-letter-author) t) - (:from-address "FROM_ADDRESS" nil nil newline) + (:author-changed-in-buffer-p "AUTHOR" nil nil t) + (:from-address "FROM_ADDRESS" nil org-koma-letter-from-address newline) (:phone-number "PHONE_NUMBER" nil org-koma-letter-phone-number) (:email "EMAIL" nil (org-koma-letter--get-value org-koma-letter-email) t) (:to-address "TO_ADDRESS" nil nil newline) |