* textmodes/rst.el (rst-font-lock-keywords-function): Drop Emacs 20 code.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2b38bac89a1abc5de74542af7f760c9f7064e281..9e36ed9aa109cdf1049a3a0fe3fa334241ceb8ff 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2010-10-03  Glenn Morris  <rgm@gnu.org>
 
+       * 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 fd3148d3f12a4892a15f90cc440e963b5e956f53..afc4dd892c9aa9ff5516f8822579d3e2d6947a27 100644 (file)
--- 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