From: Glenn Morris <rgm@gnu.org>
Date: Sun, 3 Oct 2010 02:26:35 +0000 (-0700)
Subject: * textmodes/rst.el (rst-font-lock-keywords-function): Drop Emacs 20 code.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~46^2~224
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=aee3c6f7f6b813ecaa7ce38a7e9ba8a743c01e8d;p=emacs.git

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

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  <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 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