diff options
author | Bastien Guerry <bzg@altern.org> | 2011-02-12 19:02:52 +0100 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2011-02-12 19:02:52 +0100 |
commit | 03c33d0d387fb7cd5dfd1fa8d5567bfd1263bbd7 (patch) | |
tree | 7a89e70bbc483c907e6f0116c497d5a728f17893 | |
parent | f0c9e8d672e418d9e8dc788b44eaf4ae4a2c2823 (diff) | |
download | org-mode-03c33d0d387fb7cd5dfd1fa8d5567bfd1263bbd7.tar.gz |
Don't wrap org-entry-get into condition-case.
* ob.el (org-babel-params-from-properties): don't wrap
org-entry-get into condition-case.
* org-table.el (org-table-export): don't wrap org-entry-get
into condition-case.
* org.el (org-store-link): don't wrap org-entry-get into
condition-case.
-rw-r--r-- | lisp/ob.el | 4 | ||||
-rw-r--r-- | lisp/org-table.el | 11 | ||||
-rw-r--r-- | lisp/org.el | 4 |
3 files changed, 5 insertions, 14 deletions
@@ -863,9 +863,7 @@ may be specified in the properties of the current outline entry." (mapcar (lambda (header-arg) (and (setq val - (or (condition-case nil - (org-entry-get (point) header-arg t) - (error nil)) + (or (org-entry-get (point) header-arg t) (cdr (assoc header-arg org-file-properties)))) (cons (intern (concat ":" header-arg)) (org-babel-read val)))) diff --git a/lisp/org-table.el b/lisp/org-table.el index 951bff7..bf7a876 100644 --- a/lisp/org-table.el +++ b/lisp/org-table.el @@ -520,14 +520,9 @@ property, locally or anywhere up in the hierarchy." (let* ((beg (org-table-begin)) (end (org-table-end)) (txt (buffer-substring-no-properties beg end)) - (file (or file - (condition-case nil - (org-entry-get beg "TABLE_EXPORT_FILE" t) - (error nil)))) - (format (or format - (condition-case nil - (org-entry-get beg "TABLE_EXPORT_FORMAT" t) - (error nil)))) + (file (or file (org-entry-get beg "TABLE_EXPORT_FILE" t))) + (format (or format + (org-entry-get beg "TABLE_EXPORT_FORMAT" t))) buf deffmt-readable) (unless file (setq file (read-file-name "Export table to: ")) diff --git a/lisp/org.el b/lisp/org.el index a63b743..0a5623b 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -8401,9 +8401,7 @@ For file links, arg negates `org-context-in-file-links'." (interactive-p) (not custom-id)) (and org-link-to-org-use-id - (condition-case nil - (org-entry-get nil "ID") - (error nil))))) + (org-entry-get nil "ID")))) ;; We can make a link using the ID. (setq link (condition-case nil (prog1 (org-id-store-link) |