From 19aec9ed9a53a18deaa58b69714bae724aec7111 Mon Sep 17 00:00:00 2001 From: Carsten Dominik Date: Mon, 10 May 2010 08:46:03 +0200 Subject: [PATCH] Fix minor bug Patch by Gregory J. Grubbs --- lisp/ChangeLog | 4 ++++ lisp/org.el | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index fba0bb0ac..58aadadb8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2010-05-10 Carsten Dominik + + * org.el (org-replace-escapes): Make sure the cdr is not nil. + 2010-05-09 Carsten Dominik * org.el (org-sparse-tree): Make `C-c / t' search for all TODO diff --git a/lisp/org.el b/lisp/org.el index 8f9e16cc8..85c79eeee 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -17700,7 +17700,7 @@ so values can contain further %-escapes if they are define later in TABLE." e re rpl) (while (setq e (pop tbl)) (setq re (concat "%-?[0-9.]*" (substring (car e) 1))) - (when (string-match re (cdr e)) + (when (and (cdr e) (string-match re (cdr e))) (let ((sref (substring (cdr e) (match-beginning 0) (match-end 0))) (safe "SREF")) (add-text-properties 0 3 (list 'sref sref) safe)