# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1286072795 25200
# Node ID e7a37ab0778274e9afdd4f238a1195875391e22e
# Parent  ad5ef46bca3e231c5bb31f6b7b611f98f6c02687
* textmodes/rst.el (rst-font-lock-keywords-function): Drop Emacs 20 code.

diff -r ad5ef46bca3e -r e7a37ab07782 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Oct 02 19:22:40 2010 -0700
+++ b/lisp/ChangeLog	Sat Oct 02 19:26:35 2010 -0700
@@ -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 -r ad5ef46bca3e -r e7a37ab07782 lisp/textmodes/rst.el
--- a/lisp/textmodes/rst.el	Sat Oct 02 19:22:40 2010 -0700
+++ b/lisp/textmodes/rst.el	Sat Oct 02 19:26:35 2010 -0700
@@ -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