From: Chong Yidong <cyd@stupidchicken.com>
Date: Tue, 26 May 2009 20:19:26 +0000 (+0000)
Subject: * edmacro.el (edmacro-parse-keys): Fix 2008-08-19 change (Bug#3387).
X-Git-Tag: emacs-pretest-23.0.95~160
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c46768fcff4496ae50136039b114bab5ba4c6442;p=emacs.git

* edmacro.el (edmacro-parse-keys): Fix 2008-08-19 change (Bug#3387).
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 59c44bb4221..73c8c3f1a39 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2009-05-26  Chong Yidong  <cyd@stupidchicken.com>
 
+	* edmacro.el (edmacro-parse-keys): Fix 2008-08-19
+	change (Bug#3387).
+
 	* view.el (view-recenter): Allow recenter to compute window height
 	normally.
 	(view-window-size): Use window-line-height to find window height.
diff --git a/lisp/edmacro.el b/lisp/edmacro.el
index db8bf6a6c31..96d1bc316fc 100644
--- a/lisp/edmacro.el
+++ b/lisp/edmacro.el
@@ -698,7 +698,7 @@ This function assumes that the events can be stored in a string."
 	     (times 1)
 	     key)
 	;; Try to catch events of the form "<as df>".
-	(if (string-match "^<[^ <>\t\n\f][^>\t\n\f]*>" word)
+	(if (string-match "\\`<[^ <>\t\n\f][^>\t\n\f]*>" word)
 	    (setq word (match-string 0 word)
 		  pos (+ word-beg (match-end 0)))
 	  (setq word (substring string word-beg word-end)