* gnus-msg.el (gnus-message-highlight-citation): Ensure default to be

nil for XEmacs.
(gnus-message-citation-mode): Don't autoload in XEmacs.

* gnus-cite.el (gnus-message-citation-mode): Don't define in XEmacs.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 70abf4f..dd98ff2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2006-12-30  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * gnus-msg.el (gnus-message-highlight-citation): Ensure default to be
+       nil for XEmacs.
+       (gnus-message-citation-mode): Don't autoload in XEmacs.
+
+       * gnus-cite.el (gnus-message-citation-mode): Don't define in XEmacs.
+
 2006-12-28  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * spam.el: Revert to make-obsolete-variable because

diff --git a/lisp/gnus-cite.el b/lisp/gnus-cite.el
index 17d12e1..380d578 100644 (file)
--- a/lisp/gnus-cite.el
+++ b/lisp/gnus-cite.el
@@ -1159,19 +1159,20 @@ 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.")))
 
-(define-minor-mode gnus-message-citation-mode
-  "Toggle `gnus-message-citation-mode' in current buffer.
+(unless (featurep 'xemacs)
+  (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 1b2200b..f650d7e 100644 (file)
--- a/lisp/gnus-msg.el
+++ b/lisp/gnus-msg.el
@@ -290,7 +290,8 @@ If nil, the address field will always be empty after invoking
   :type 'boolean)
 
 (defcustom gnus-message-highlight-citation
-  (and t ;; gnus-treat-highlight-citation ;; gnus-cite dependency
+  (and (not (featurep 'xemacs))
+       ;; 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
@@ -298,7 +299,8 @@ If nil, the address field will always be empty after invoking
   :group 'gnus-message
   :type 'boolean)
 
-(autoload 'gnus-message-citation-mode "gnus-cite" nil t)
+(unless (featurep 'xemacs)
+  (autoload 'gnus-message-citation-mode "gnus-cite" nil t))
 
 ;;; Internal variables.