ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2015-08-23 23:51:07 +02:00
parent 4bc8008e8b cd1d623b85
commit cf6d936701
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lisp/ox.el
View File

@ -1369,14 +1369,14 @@ for export. Return options as a plist."
(let ((plist (let ((plist
;; EXPORT_OPTIONS are parsed in a non-standard way. Take ;; EXPORT_OPTIONS are parsed in a non-standard way. Take
;; care of them right from the start. ;; care of them right from the start.
(let ((o (org-entry-get (point) "EXPORT_OPTIONS"))) (let ((o (org-entry-get (point) "EXPORT_OPTIONS" 'selective)))
(and o (org-export--parse-option-keyword o backend)))) (and o (org-export--parse-option-keyword o backend))))
;; Take care of EXPORT_TITLE. If it isn't defined, use ;; Take care of EXPORT_TITLE. If it isn't defined, use
;; headline's title (with no todo keyword, priority cookie or ;; headline's title (with no todo keyword, priority cookie or
;; tag) as its fallback value. ;; tag) as its fallback value.
(cache (list (cache (list
(cons "TITLE" (cons "TITLE"
(or (org-entry-get (point) "EXPORT_TITLE") (or (org-entry-get (point) "EXPORT_TITLE" 'selective)
(progn (looking-at org-complex-heading-regexp) (progn (looking-at org-complex-heading-regexp)
(org-match-string-no-properties 4)))))) (org-match-string-no-properties 4))))))
;; Look for both general keywords and back-end specific ;; Look for both general keywords and back-end specific
@ -1391,7 +1391,8 @@ for export. Return options as a plist."
(let ((value (let ((value
(or (cdr (assoc keyword cache)) (or (cdr (assoc keyword cache))
(let ((v (org-entry-get (point) (let ((v (org-entry-get (point)
(concat "EXPORT_" keyword)))) (concat "EXPORT_" keyword)
'selective)))
(push (cons keyword v) cache) v)))) (push (cons keyword v) cache) v))))
(when value (when value
(setq plist (setq plist
@ -5907,7 +5908,7 @@ Return file name as a string."
(org-entry-get (org-entry-get
(save-excursion (save-excursion
(ignore-errors (org-back-to-heading) (point))) (ignore-errors (org-back-to-heading) (point)))
"EXPORT_FILE_NAME" t)) "EXPORT_FILE_NAME" 'selective))
;; File name may be extracted from buffer's associated ;; File name may be extracted from buffer's associated
;; file, if any. ;; file, if any.
(and visited-file (file-name-nondirectory visited-file)) (and visited-file (file-name-nondirectory visited-file))