diff options
| author | Glenn Morris | 2010-10-02 19:26:35 -0700 |
|---|---|---|
| committer | Glenn Morris | 2010-10-02 19:26:35 -0700 |
| commit | aee3c6f7f6b813ecaa7ce38a7e9ba8a743c01e8d (patch) | |
| tree | 93f4c30e80ffb4f7ed539dea92e2f8b91e61d0c5 | |
| parent | f88cd1141101429b2495f8246fb59d986cde0b85 (diff) | |
| download | emacs-aee3c6f7f6b813ecaa7ce38a7e9ba8a743c01e8d.tar.gz emacs-aee3c6f7f6b813ecaa7ce38a7e9ba8a743c01e8d.zip | |
* textmodes/rst.el (rst-font-lock-keywords-function): Drop Emacs 20 code.
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/textmodes/rst.el | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2b38bac89a1..9e36ed9aa10 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2010-10-03 Glenn Morris <rgm@gnu.org> | 1 | 2010-10-03 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * textmodes/rst.el (rst-font-lock-keywords-function): | ||
| 4 | Drop Emacs 20 code. | ||
| 5 | |||
| 3 | * textmodes/artist.el (artist-replace-char): Drop Emacs 20 code. | 6 | * textmodes/artist.el (artist-replace-char): Drop Emacs 20 code. |
| 4 | 7 | ||
| 5 | * printing.el: Drop Emacs 20 code. | 8 | * printing.el: Drop Emacs 20 code. |
diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el index fd3148d3f12..afc4dd892c9 100644 --- a/lisp/textmodes/rst.el +++ b/lisp/textmodes/rst.el | |||
| @@ -2859,10 +2859,7 @@ details check the Rst Faces Defaults group." | |||
| 2859 | 2859 | ||
| 2860 | ;; There seems to be a bug leading to error "Stack overflow in regexp | 2860 | ;; There seems to be a bug leading to error "Stack overflow in regexp |
| 2861 | ;; matcher" when "|" or "\\*" are the characters searched for | 2861 | ;; matcher" when "|" or "\\*" are the characters searched for |
| 2862 | (re-imendbeg | 2862 | (re-imendbeg "\\]\\|\\\\.") |
| 2863 | (if (< emacs-major-version 21) | ||
| 2864 | "]" | ||
| 2865 | "\\]\\|\\\\.")) | ||
| 2866 | ;; inline markup content end | 2863 | ;; inline markup content end |
| 2867 | (re-imend (concat re-imendbeg "\\)*[^\t \\\\]\\)")) | 2864 | (re-imend (concat re-imendbeg "\\)*[^\t \\\\]\\)")) |
| 2868 | ;; inline markup content without asterisk | 2865 | ;; inline markup content without asterisk |