Browse Source

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.
Bastien Guerry 9 years ago
parent
commit
03c33d0d38
3 changed files with 5 additions and 14 deletions
  1. 1 3
      lisp/ob.el
  2. 3 8
      lisp/org-table.el
  3. 1 3
      lisp/org.el

+ 1 - 3
lisp/ob.el

@@ -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))))

+ 3 - 8
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: "))

+ 1 - 3
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)