Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-633

Merge from gnus--rel--5.10

Patches applied:

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-57
 - miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-58
   Update from CVS

2004-10-21  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/mm-view.el (mm-display-inline-fontify): Inhibit font-lock when
   running the major-mode function.

2004-10-21  Kevin Greiner  <kevin.greiner@compsol.cc>

   * lisp/gnus/gnus-start.el (gnus-convert-old-newsrc): Two of the converters
   have been backported to 'Gnus v5.11' from 'No Gnus v0.2'.  Added a
   boolean check to not apply converters that apply to future
   versions of gnus.

3 files changed, 28 insertions, 11 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 7e56de4c9f7..2a4b0a80398 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,14 +1,26 @@
+2004-10-21  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * mm-view.el (mm-display-inline-fontify): Inhibit font-lock when
+        running the major-mode function.
+
+2004-10-21  Kevin Greiner  <kevin.greiner@compsol.cc>
+
+        * gnus-start.el (gnus-convert-old-newsrc): Two of the converters
+        have been backported to 'Gnus v5.11' from 'No Gnus v0.2'.  Added a
+        boolean check to not apply converters that apply to future
+        versions of gnus.
+
 2004-10-19  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * gnus-sum.el (gnus-update-summary-mark-positions): Search for
         dummy marks in the right way.
 
-2004-10-18  Kevin Greiner  <kgreiner@compsol.cc>
+2004-10-18  Kevin Greiner  <kevin.greiner@compsol.cc>
 
         * nnagent.el (nnagent-request-type): Bind gnus-agent to nil to
         avoid infinite recursion via gnus-get-function.
 
-2004-10-18  Kevin Greiner  <kgreiner@compsol.cc>
+2004-10-18  Kevin Greiner  <kevin.greiner@compsol.cc>
 
         * gnus-agent.el (gnus-agent-synchronize-group-flags): When
         necessary, pass full group name to gnus-request-set-marks.
@@ -16,13 +28,13 @@
         tick marks.
         (gnus-agent-synchronize-flags-server): Be silent when writing file.
 
-2004-10-18  Kevin Greiner  <kgreiner@compsol.cc>
+2004-10-18  Kevin Greiner  <kevin.greiner@compsol.cc>
 
         * gnus-agent.el (gnus-agent-synchronize-group-flags): Replaced
         gnus-request-update-info with explicit code to sync the in-memory
         info read flags with the marks being sync'd to the backend.
 
-2004-10-18  Kevin Greiner  <kgreiner@compsol.cc>
+2004-10-18  Kevin Greiner  <kevin.greiner@compsol.cc>
 
         * gnus-agent.el (gnus-agent-possibly-synchronize-flags): Ignore
         servers that are offline.  Avoids having gnus-agent-toggle-plugged
@@ -45,7 +57,7 @@
         method, to ensure that synchronization updates marks in the
         backend and in the info (in memory) structure.
 
-2004-10-18  Kevin Greiner  <kgreiner@compsol.cc>
+2004-10-18  Kevin Greiner  <kevin.greiner@compsol.cc>
 
         * gnus-agent.el (gnus-agent-synchronize-flags-server): Do nothing
         unless plugged.  Disable the agent so that an open failure causes
@@ -57,7 +69,7 @@
         (gnus-agent-expire-unagentized-dirs)
         (gnus-agent-auto-agentize-methods): Add :version.
 
-2004-10-18  Kevin Greiner  <kgreiner@compsol.cc>
+2004-10-18  Kevin Greiner  <kevin.greiner@compsol.cc>
 
         * legacy-gnus-agent.el (gnus-agent-convert-to-compressed-agentview-prompt):
         New function. Used internally to only display 'gnus converting
@@ -70,7 +82,7 @@
         gnus-agent-unfetch-articles in place of gnus-agent-expire to
         improve performance.
 
-2004-10-18  Kevin Greiner  <kgreiner@compsol.cc>
+2004-10-18  Kevin Greiner  <kevin.greiner@compsol.cc>
 
         * gnus-agent.el (gnus-agent-cat-groups): rewrote avoiding defsetf
         to avoid run-time CL dependencies.
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index 67d86fef02a..c6445b460ff 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -2247,9 +2247,9 @@ If FORCE is non-nil, the .newsrc file is read."
                          gnus-convert-old-ticks)
                         ("Oort Gnus v0.08"     "legacy-gnus-agent"
                          gnus-agent-convert-to-compressed-agentview)
-                        ("No Gnus v0.2"        "legacy-gnus-agent"
+                        ("Gnus v5.11"          "legacy-gnus-agent"
                          gnus-agent-unlist-expire-days)
-                        ("No Gnus v0.2"        "legacy-gnus-agent" 
+                        ("Gnus v5.11"          "legacy-gnus-agent" 
                          gnus-agent-unhook-expire-days)))
               #'car-less-than-car)))
         ;; Skip converters older than the file version
@@ -2258,7 +2258,8 @@ If FORCE is non-nil, the .newsrc file is read."
 
         ;; Perform converters to bring older version up to date.
         (when (and converters (< fcv (caar converters)))
-          (while (and converters (< fcv (caar converters)))
+          (while (and converters (< fcv (caar converters))
+                      (<= (caar converters) gnus-version))
             (let* ((converter-spec  (pop converters))
                    (convert-to      (nth 1 converter-spec))
                    (load-from       (nth 2 converter-spec))
diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el
index 9c22298c678..2b58d103ade 100644
--- a/lisp/gnus/mm-view.el
+++ b/lisp/gnus/mm-view.el
@@ -466,8 +466,12 @@
           (progn
             (buffer-disable-undo)
             (mm-insert-part handle)
-            (funcall mode)
             (require 'font-lock)
+            ;; Inhibit font-lock this time (*-mode-hook might run
+            ;; `turn-on-font-lock') so that jit-lock may not turn off
+            ;; font-lock immediately after this.
+            (let ((font-lock-mode t))
+              (funcall mode))
             (let ((font-lock-verbose nil))
               ;; I find font-lock a bit too verbose.
               (font-lock-fontify-buffer))