From mboxrd@z Thu Jan  1 00:00:00 1970
From: Mikael Fornius <mfo@abc.se>
Subject: [PATCH 2/3] Use save-match-data macro instead of let.
Date: Thu, 10 Jun 2010 16:54:50 +0200
Message-ID: <1276181691-7544-3-git-send-email-mfo@abc.se>
References: <1276181691-7544-1-git-send-email-mfo@abc.se>
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from [140.186.70.92] (port=33245 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OMj9n-0000sG-IV
	for emacs-orgmode@gnu.org; Thu, 10 Jun 2010 10:55:01 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <mfo@abc.se>) id 1OMj9l-0006BF-Ps
	for emacs-orgmode@gnu.org; Thu, 10 Jun 2010 10:54:59 -0400
Received: from violet.abc.se ([62.80.200.155]:56516)
	by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from <mfo@abc.se>)
	id 1OMj9l-0006Aa-C8
	for emacs-orgmode@gnu.org; Thu, 10 Jun 2010 10:54:57 -0400
In-Reply-To: <1276181691-7544-1-git-send-email-mfo@abc.se>
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
To: emacs-orgmode@gnu.org
Cc: Mikael Fornius <mfo@abc.se>

* org.el (org-at-property-p): Use save-match-data macro instead of let.
---
 lisp/org.el |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/lisp/org.el b/lisp/org.el
index 2a2cef9..7715ad7 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -13198,12 +13198,11 @@ allowed value."
   (save-excursion
     (beginning-of-line 1)
     (when (looking-at (org-re "^[ \t]*\\(:\\([[:alpha:]][[:alnum:]_-]*\\):\\)[ \t]*\\(.*\\)"))
-     (let ((match (match-data)) ;; Keep match-data for use by calling
-	   (p (point))          ;; procedures.
-	   (range (unless (org-before-first-heading-p)
-		    (org-get-property-block))))
-       (prog1 (and range (<= (car range) p) (< p (cdr range)))
-	 (set-match-data match))))))
+      (save-match-data ;; Used by calling procedures
+	(let ((p (point))
+	      (range (unless (org-before-first-heading-p)
+		       (org-get-property-block))))
+	  (and range (<= (car range) p) (< p (cdr range))))))))
 
 (defun org-get-property-block (&optional beg end force)
   "Return the (beg . end) range of the body of the property drawer.
-- 
1.7.1