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

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.
This commit is contained in:
Bastien Guerry 2011-02-12 19:02:52 +01:00
parent f0c9e8d672
commit 03c33d0d38
3 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/ob.el
View File

@ -863,9 +863,7 @@ may be specified in the properties of the current outline entry."
(mapcar (mapcar
(lambda (header-arg) (lambda (header-arg)
(and (setq val (and (setq val
(or (condition-case nil (or (org-entry-get (point) header-arg t)
(org-entry-get (point) header-arg t)
(error nil))
(cdr (assoc header-arg org-file-properties)))) (cdr (assoc header-arg org-file-properties))))
(cons (intern (concat ":" header-arg)) (cons (intern (concat ":" header-arg))
(org-babel-read val)))) (org-babel-read val))))

9
lisp/org-table.el
View File

@ -520,14 +520,9 @@ property, locally or anywhere up in the hierarchy."
(let* ((beg (org-table-begin)) (let* ((beg (org-table-begin))
(end (org-table-end)) (end (org-table-end))
(txt (buffer-substring-no-properties beg end)) (txt (buffer-substring-no-properties beg end))
(file (or file (file (or file (org-entry-get beg "TABLE_EXPORT_FILE" t)))
(condition-case nil
(org-entry-get beg "TABLE_EXPORT_FILE" t)
(error nil))))
(format (or format (format (or format
(condition-case nil (org-entry-get beg "TABLE_EXPORT_FORMAT" t)))
(org-entry-get beg "TABLE_EXPORT_FORMAT" t)
(error nil))))
buf deffmt-readable) buf deffmt-readable)
(unless file (unless file
(setq file (read-file-name "Export table to: ")) (setq file (read-file-name "Export table to: "))

4
lisp/org.el
View File

@ -8401,9 +8401,7 @@ For file links, arg negates `org-context-in-file-links'."
(interactive-p) (interactive-p)
(not custom-id)) (not custom-id))
(and org-link-to-org-use-id (and org-link-to-org-use-id
(condition-case nil (org-entry-get nil "ID"))))
(org-entry-get nil "ID")
(error nil)))))
;; We can make a link using the ID. ;; We can make a link using the ID.
(setq link (condition-case nil (setq link (condition-case nil
(prog1 (org-id-store-link) (prog1 (org-id-store-link)