Replace lazy-lock-mode by jit-lock-mode for Emacs 22, fixes bug 205815.

(Portage version: 2.1.4_rc14)

5 files changed, 45 insertions, 11 deletions

diff --git a/app-emacs/rst/files/50rst-mode-gentoo.el b/app-emacs/rst/files/50rst-mode-gentoo.el
deleted file mode 100644
index 9259ddd9ea0f..000000000000
--- a/app-emacs/rst/files/50rst-mode-gentoo.el
+++ /dev/null
@@ -1,8 +0,0 @@
-
-;;; rst-mode site-lisp configuration
-
-(add-to-list 'load-path "@SITELISP@")
-(autoload 'rst-mode "rst-mode" "mode for editing reStructuredText documents" t)
-(setq auto-mode-alist
-      (append '(("\\.rst$" . rst-mode)
-		("\\.rest$" . rst-mode)) auto-mode-alist))
diff --git a/app-emacs/rst/files/51rst-gentoo.el b/app-emacs/rst/files/51rst-gentoo.el
new file mode 100644
index 000000000000..6cea463ed14a
--- /dev/null
+++ b/app-emacs/rst/files/51rst-gentoo.el
@@ -0,0 +1,6 @@
+
+;;; rst site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'rst-mode "rst" "mode for editing reStructuredText documents" t)
+(add-to-list 'auto-mode-alist '("\\.re?st\\'" . rst-mode))
diff --git a/app-emacs/rst/files/digest-rst-0.2.9 b/app-emacs/rst/files/digest-rst-0.2.9
deleted file mode 100644
index 4850604ece97..000000000000
--- a/app-emacs/rst/files/digest-rst-0.2.9
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 cb39a433257f2d819ef923efb8946401 rst-mode-0.2.9.tar.gz 9000
-RMD160 e388555ec8393149bb2f9872f2f3cfba7fb7cd84 rst-mode-0.2.9.tar.gz 9000
-SHA256 8e26e4e0d786e58737231b8e7d18b02dc29711f9de864750e1f7bf25decac690 rst-mode-0.2.9.tar.gz 9000
diff --git a/app-emacs/rst/files/digest-rst-0.4-r1 b/app-emacs/rst/files/digest-rst-0.4-r1
new file mode 100644
index 000000000000..2a4fbf925c65
--- /dev/null
+++ b/app-emacs/rst/files/digest-rst-0.4-r1
@@ -0,0 +1,3 @@
+MD5 0fe7b42bb3c2aa3680fe30f9a5fbf712 docutils-0.4.tar.gz 1237801
+RMD160 f6a3c5bfb79ed08ce282bcaf3ded05bd2e3f95b5 docutils-0.4.tar.gz 1237801
+SHA256 b81f29e4f39540d06c7d8c0dc1a2c209816c47ce33a66ac50ee28ae38d242c0e docutils-0.4.tar.gz 1237801
diff --git a/app-emacs/rst/files/rst-0.4-lazy-lock-mode-fix.patch b/app-emacs/rst/files/rst-0.4-lazy-lock-mode-fix.patch
new file mode 100644
index 000000000000..a6c3b906dc87
--- /dev/null
+++ b/app-emacs/rst/files/rst-0.4-lazy-lock-mode-fix.patch
@@ -0,0 +1,36 @@
+--- rst.el.orig	2005-12-27 14:12:04.000000000 +0100
++++ rst.el	2008-01-14 18:49:33.000000000 +0100
+@@ -2199,20 +2199,30 @@
+   (when (boundp 'font-lock-support-mode)
+     ;; rst-mode has its own mind about font-lock-support-mode
+     (make-local-variable 'font-lock-support-mode)
++    ;; jit-lock-mode replaced lazy-lock-mode in GNU Emacs 22
++    (let ((jit-or-lazy-lock-mode
++           (cond
++            ((fboundp 'jit-lock-mode) 'jit-lock-mode)
++            ((fboundp 'lazy-lock-mode) 'lazy-lock-mode)
++            ;; if neither lazy-lock nor jit-lock is supported,
++            ;; tell user and disable rst-mode-lazy
++            (t (when rst-mode-lazy
++                 (message "Disabled lazy fontification, because no known support mode found.")
++                 (setq rst-mode-lazy nil))))))
+     (cond
+      ((and (not rst-mode-lazy) (not font-lock-support-mode)))
+      ;; No support mode set and none required - leave it alone
+      ((or (not font-lock-support-mode) ;; No support mode set (but required)
+ 	  (symbolp font-lock-support-mode)) ;; or a fixed mode for all
+       (setq font-lock-support-mode
+-	    (list (cons 'rst-mode (and rst-mode-lazy 'lazy-lock-mode))
++	    (list (cons 'rst-mode (and rst-mode-lazy jit-or-lazy-lock-mode))
+ 		  (cons t font-lock-support-mode))))
+      ((and (listp font-lock-support-mode)
+ 	   (not (assoc 'rst-mode font-lock-support-mode)))
+       ;; A list of modes missing rst-mode
+       (setq font-lock-support-mode
+-	    (append '((cons 'rst-mode (and rst-mode-lazy 'lazy-lock-mode)))
+-		    font-lock-support-mode)))))
++	    (cons (cons 'rst-mode (and rst-mode-lazy jit-or-lazy-lock-mode))
++		  font-lock-support-mode))))))
+ 
+   ;; Names and hooks
+   (setq mode-name "reST")