[Emacs-diffs] /srv/bzr/emacs/trunk r101750: * textmodes/rst.el (rst-font-lock-keywords-function): Drop Emacs 20 code.

[Glenn Morris]

------------------------------------------------------------
revno: 101750
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2010-10-02 19:26:35 -0700
message:
  * textmodes/rst.el (rst-font-lock-keywords-function): Drop Emacs 20 code.
modified:
  lisp/ChangeLog
  lisp/textmodes/rst.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-10-03 02:22:40 +0000
+++ b/lisp/ChangeLog    2010-10-03 02:26:35 +0000
@@ -1,5 +1,8 @@
 2010-10-03  Glenn Morris  <address@hidden>
 
+       * 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.

=== modified file 'lisp/textmodes/rst.el'
--- a/lisp/textmodes/rst.el     2010-05-25 02:11:08 +0000
+++ b/lisp/textmodes/rst.el     2010-10-03 02:26:35 +0000
@@ -2859,10 +2859,7 @@
 
         ;; 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