* gnus-cite.el (gnus-message-highlight-citation): Move to gnus-msg.el.

* gnus-msg.el (gnus-setup-message): Add gnus-message-citation-mode.
(gnus-message-highlight-citation): Move defcustom here from
gnus-cite.el.
(gnus-message-citation-mode): Autoload.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cb7b944..1ab22ba 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,12 @@
 2006-12-26  Reiner Steib  <Reiner.Steib@gmx.de>
 
+       * gnus-cite.el (gnus-message-highlight-citation): Move to gnus-msg.el.
+
+       * gnus-msg.el (gnus-setup-message): Add gnus-message-citation-mode.
+       (gnus-message-highlight-citation): Move defcustom here from
+       gnus-cite.el.
+       (gnus-message-citation-mode): Autoload.
+
        * gnus-cite.el: Adjust Oliver's code to Gnus namespace.  Add some
        checks to make it compile with XEmacs.
        (gnus-message-citation-mode): New minor mode.

diff --git a/lisp/gnus-cite.el b/lisp/gnus-cite.el
index bc37399..17d12e1 100644 (file)
--- a/lisp/gnus-cite.el
+++ b/lisp/gnus-cite.el
@@ -1180,14 +1180,6 @@ positive."
   "Turn on `gnus-message-citation-mode'."
   (gnus-message-citation-mode -1))
 
-;; (add-hook 'gnus-message-setup-hook 'turn-on-gnus-message-citation-mode)
-(defcustom gnus-message-highlight-citation (fboundp 'font-lock-add-keywords)
-  "Enable highlighting of different citation levels in message-mode."
-  :version "23.0" ;; No Gnus
-  :group 'gnus-cite
-  :group 'gnus-message
-  :type 'boolean)
-
 (gnus-ems-redefine)
 
 (provide 'gnus-cite)

diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el
index 8ae9518..fbfb8c9 100644 (file)
--- a/lisp/gnus-msg.el
+++ b/lisp/gnus-msg.el
@@ -289,6 +289,15 @@ If nil, the address field will always be empty after invoking
   :group 'gnus-message
   :type 'boolean)
 
+(defcustom gnus-message-highlight-citation (fboundp 'font-lock-add-keywords)
+  "Enable highlighting of different citation levels in message-mode."
+  :version "23.0" ;; No Gnus
+  :group 'gnus-cite
+  :group 'gnus-message
+  :type 'boolean)
+
+(autoload 'gnus-message-citation-mode "gnus-msg" nil t)
+
 ;;; Internal variables.
 
 (defvar gnus-inhibit-posting-styles nil
@@ -422,6 +431,9 @@ Thank you for your help in stamping out bugs.
         (set (make-local-variable 'gnus-message-group-art)
              (cons ,group ,article))
         (set (make-local-variable 'gnus-newsgroup-name) ,group)
+        ;; Enable highlighting of different citation levels
+        (when gnus-message-highlight-citation
+          (gnus-message-citation-mode 1))
         (gnus-run-hooks 'gnus-message-setup-hook)
         (if (eq major-mode 'message-mode)
             (let ((mbl1 mml-buffer-list))