diff options
| author | Chong Yidong | 2009-05-26 20:19:26 +0000 |
|---|---|---|
| committer | Chong Yidong | 2009-05-26 20:19:26 +0000 |
| commit | c46768fcff4496ae50136039b114bab5ba4c6442 (patch) | |
| tree | 6058233f1c0261cc1effb23dd6da8a3c3325a038 | |
| parent | 9d14bd379a030813e16da079f968057d4b831f78 (diff) | |
| download | emacs-c46768fcff4496ae50136039b114bab5ba4c6442.tar.gz emacs-c46768fcff4496ae50136039b114bab5ba4c6442.zip | |
* edmacro.el (edmacro-parse-keys): Fix 2008-08-19 change (Bug#3387).
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/edmacro.el | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 59c44bb4221..73c8c3f1a39 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2009-05-26 Chong Yidong <cyd@stupidchicken.com> | 1 | 2009-05-26 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 2 | ||
| 3 | * edmacro.el (edmacro-parse-keys): Fix 2008-08-19 | ||
| 4 | change (Bug#3387). | ||
| 5 | |||
| 3 | * view.el (view-recenter): Allow recenter to compute window height | 6 | * view.el (view-recenter): Allow recenter to compute window height |
| 4 | normally. | 7 | normally. |
| 5 | (view-window-size): Use window-line-height to find window height. | 8 | (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." | |||
| 698 | (times 1) | 698 | (times 1) |
| 699 | key) | 699 | key) |
| 700 | ;; Try to catch events of the form "<as df>". | 700 | ;; Try to catch events of the form "<as df>". |
| 701 | (if (string-match "^<[^ <>\t\n\f][^>\t\n\f]*>" word) | 701 | (if (string-match "\\`<[^ <>\t\n\f][^>\t\n\f]*>" word) |
| 702 | (setq word (match-string 0 word) | 702 | (setq word (match-string 0 word) |
| 703 | pos (+ word-beg (match-end 0))) | 703 | pos (+ word-beg (match-end 0))) |
| 704 | (setq word (substring string word-beg word-end) | 704 | (setq word (substring string word-beg word-end) |