summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJambunathan K <kjambunathan@gmail.com>2012-04-22 13:33:31 +0530
committerJambunathan K <kjambunathan@gmail.com>2012-04-22 19:47:53 +0530
commit00cc5d5cef8f0fbe0f639578b381c23f03ea3196 (patch)
treeb3adee0a175c99a85767a16b7d85dd78f0324608
parentd73db66a387b8eb9ddd558d8e6072c4e9ff436e0 (diff)
downloadorg-mode-00cc5d5cef8f0fbe0f639578b381c23f03ea3196.tar.gz
org-export: Minor fixes
* contrib/lisp/org-export.el (org-export-creator-string): Check for `org-version' being bound before using it. (org-export-get-inbuffer-options): Use `org-element-restriction'.
-rw-r--r--contrib/lisp/org-export.el12
1 files changed, 5 insertions, 7 deletions
diff --git a/contrib/lisp/org-export.el b/contrib/lisp/org-export.el
index 015934d..bce3ab4 100644
--- a/contrib/lisp/org-export.el
+++ b/contrib/lisp/org-export.el
@@ -308,7 +308,9 @@ If the value is `comment' insert it as a comment."
(const :tag "Insert the sentence" t)))
(defcustom org-export-creator-string
- (format "Generated by Org mode %s in Emacs %s." org-version emacs-version)
+ (format "Generated by Org mode %s in Emacs %s."
+ (if (boundp 'org-version) org-version "(Unknown)")
+ emacs-version)
"String to insert at the end of the generated document."
:group 'org-export-general
:type '(string :tag "Creator string"))
@@ -1055,10 +1057,7 @@ Assume buffer is in Org mode. Narrowing, if any, is ignored."
(t
(list
key
- (let ((restr
- (cdr
- (assq 'macro
- org-element-object-restrictions))))
+ (let ((restr (org-element-restriction 'macro)))
(org-element-parse-secondary-string
;; If user explicitly asks for
;; a newline, be sure to preserve it
@@ -1126,8 +1125,7 @@ Assume buffer is in Org mode. Narrowing, if any, is ignored."
(plist-put
plist prop
(org-element-parse-secondary-string
- value
- (cdr (assq 'keyword org-element-string-restrictions))))))))
+ value (org-element-restriction 'keyword)))))))
org-element-parsed-keywords))
;; 3. Return final value.
plist)))