From 03c33d0d387fb7cd5dfd1fa8d5567bfd1263bbd7 Mon Sep 17 00:00:00 2001
From: Bastien Guerry <bzg@altern.org>
Date: Sat, 12 Feb 2011 19:02:52 +0100
Subject: [PATCH] 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.
---
 lisp/ob.el        |  4 +---
 lisp/org-table.el | 11 +++--------
 lisp/org.el       |  4 +---
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/lisp/ob.el b/lisp/ob.el
index 7b9bd6079..44808faab 100644
--- a/lisp/ob.el
+++ b/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))))
diff --git a/lisp/org-table.el b/lisp/org-table.el
index 951bff706..bf7a876b6 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 a63b7430c..0a5623b36 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)