2006-12-31 Steve Youngs <steve@sxemacs.org>

	* gnus-cite.el: Load easy-mmode at compile time for (S)XEmacs to get
	`define-minor-mode' macro definition expanded properly.
	(gnus-message-citation-mode): This is now OK for (S)XEmacs so don't
	exclude it there.

	* gnus-msg.el (gnus-message-highlight-citation): Revert Reiner's patch
	of 2006-12-30.  The default is nil on (S)XEmacs already because of the
	`fboundp' test.
	(gnus-message-citation-mode): Revert Reiner's patch of 2006-12-30.
	This is OK to autoload in (S)XEmacs now.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6e2767a..4d4208b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
+2006-12-31  Steve Youngs  <steve@sxemacs.org>
+
+       * gnus-cite.el: Load easy-mmode at compile time for (S)XEmacs to get
+       `define-minor-mode' macro definition expanded properly.
+       (gnus-message-citation-mode): This is now OK for (S)XEmacs so don't
+       exclude it there.
+
+       * gnus-msg.el (gnus-message-highlight-citation): Revert Reiner's patch
+       of 2006-12-30.  The default is nil on (S)XEmacs already because of the
+       `fboundp' test.
+       (gnus-message-citation-mode): Revert Reiner's patch of 2006-12-30.
+       This is OK to autoload in (S)XEmacs now.
+
 2006-12-30  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * gnus-sum.el (gnus-summary-limit-to-singletons): New command and

diff --git a/lisp/gnus-cite.el b/lisp/gnus-cite.el
index 96f2ffe..d1f4b3c 100644 (file)
--- a/lisp/gnus-cite.el
+++ b/lisp/gnus-cite.el
@@ -27,6 +27,9 @@
 ;;; Code:
 
 (eval-when-compile (require 'cl))
+(eval-when-compile
+  (when (featurep 'xemacs)
+    (require 'easy-mmode))) ; for `define-minor-mode'
 
 (require 'gnus)
 (require 'gnus-range)
@@ -1159,20 +1162,19 @@ Returns nil if there is no such line before LIMIT, t otherwise."
       (font-lock-remove-keywords nil gnus-message-citation-keywords)
     (gnus-message 1 "`font-lock-remove-keywords' not supported.")))
 
-(unless (featurep 'xemacs)
-  (define-minor-mode gnus-message-citation-mode
-    "Toggle `gnus-message-citation-mode' in current buffer.
+(define-minor-mode gnus-message-citation-mode
+  "Toggle `gnus-message-citation-mode' in current buffer.
 This buffer local minor mode provides additional font-lock support for
 nested citations.
 With prefix ARG, turn `gnus-message-citation-mode' on if and only if ARG is
 positive."
-    nil ;; init-value
-    ""  ;; lighter
-    nil ;; keymap
-    (if gnus-message-citation-mode
-       (gnus-message-add-citation-keywords)
-      (gnus-message-remove-citation-keywords))
-    (font-lock-fontify-buffer)))
+  nil ;; init-value
+  "" ;; lighter
+  nil ;; keymap
+  (if gnus-message-citation-mode
+      (gnus-message-add-citation-keywords)
+    (gnus-message-remove-citation-keywords))
+  (font-lock-fontify-buffer))
 
 (defun turn-on-gnus-message-citation-mode ()
   "Turn on `gnus-message-citation-mode'."

diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el
index f650d7e..1b2200b 100644 (file)
--- a/lisp/gnus-msg.el
+++ b/lisp/gnus-msg.el
@@ -290,8 +290,7 @@ If nil, the address field will always be empty after invoking
   :type 'boolean)
 
 (defcustom gnus-message-highlight-citation
-  (and (not (featurep 'xemacs))
-       ;; gnus-treat-highlight-citation ;; gnus-cite dependency
+  (and t ;; gnus-treat-highlight-citation ;; gnus-cite dependency
        (fboundp 'font-lock-add-keywords))
   "Enable highlighting of different citation levels in message-mode."
   :version "23.0" ;; No Gnus
@@ -299,8 +298,7 @@ If nil, the address field will always be empty after invoking
   :group 'gnus-message
   :type 'boolean)
 
-(unless (featurep 'xemacs)
-  (autoload 'gnus-message-citation-mode "gnus-cite" nil t))
+(autoload 'gnus-message-citation-mode "gnus-cite" nil t)
 
 ;;; Internal variables.