From aee3c6f7f6b813ecaa7ce38a7e9ba8a743c01e8d Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 2 Oct 2010 19:26:35 -0700 Subject: [PATCH] * textmodes/rst.el (rst-font-lock-keywords-function): Drop Emacs 20 code. --- lisp/ChangeLog | 3 +++ 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 @@ 2010-10-03 Glenn Morris + * textmodes/rst.el (rst-font-lock-keywords-function): + Drop Emacs 20 code. + * textmodes/artist.el (artist-replace-char): Drop Emacs 20 code. * 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." ;; There seems to be a bug leading to error "Stack overflow in regexp ;; matcher" when "|" or "\\*" are the characters searched for - (re-imendbeg - (if (< emacs-major-version 21) - "]" - "\\]\\|\\\\.")) + (re-imendbeg "\\]\\|\\\\.") ;; inline markup content end (re-imend (concat re-imendbeg "\\)*[^\t \\\\]\\)")) ;; inline markup content without asterisk -- 2.39.5