Applied a patch from KITAGAWA Takurou <i30x1641@ip.media.kyoto-u.ac.jp>

* lisp/Makefile.in (clever): Use `if test... then' instead of `test... &&'.

Synch with Oort Gnus.

diff --git a/ChangeLog b/ChangeLog
index 03b2ea1..8448e3a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-06  KITAGAWA Takurou  <i30x1641@ip.media.kyoto-u.ac.jp>
+
+       * lisp/Makefile.in (clever): Use `if test... then' instead of
+       `test... &&'.
+
 2001-07-06  Katsumi Yamaoka <yamaoka@jpl.org>
 
        * lisp/Makefile.in (clever): Change the quoting style for the

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b24d756..6021697 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,21 @@
+2001-07-07  Simon Josefsson  <jas@extundo.com>
+
+       * rfc2047.el (rfc2047-encode-message-header): Skip header when
+       trying to fold. Thanks to Colin Walters
+       <walters@cis.ohio-state.edu>
+
+2001-07-06  Simon Josefsson  <jas@extundo.com>
+
+       * imap.el (imap-parse-address-list, imap-parse-flag-list)
+       (imap-parse-body-extension, imap-parse-body-ext, imap-parse-body):
+       Add information in `assert's.
+
+       * nnimap.el (nnimap-possibly-change-group): Ignore uidvalidity
+       changes. (From nnimaps' point of view, `nnimap-verify-uidvalidity'
+       and `nnimap-group-overview-filename', should handle all
+       change-of-uidvalidity related issues.  But there may be other
+       problems.)
+
 2001-07-05  Colin Walters  <walters@cis.ohio-state.edu>
 
        * rfc2047.el (rfc2047-encode-message-header): Don't include the

diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 424ad15..0bac6c5 100644 (file)
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -18,6 +18,10 @@ EMACS_COMP = URLDIR=$(URLDIR) W3DIR=$(W3DIR) lispdir=$(lispdir) srcdir=$(srcdir)
 GNUS_PRODUCT_NAME = @GNUS_PRODUCT_NAME@
 EXPORTING_FILES = $(EMACS_COMP) -f dgnushack-exporting-files 2>/dev/null
 
+# We should never use `COMMAND && ...' form, use `if COMMAND then ...'
+# form instead.  Because, as far as we know, FreeBSD's native make will
+# be discontinued if COMMAND returns a non-zero exit status.
+
 all total: clean-some gnus-load.elc
        $(EMACS_COMP) -f dgnushack-compile
 
@@ -37,9 +41,9 @@ clever some: gnus-load.elc
          if test `$(EMACS) -batch -q -no-site-file \
                -eval '(prin1 (featurep (quote xemacs)))' \
                2>/dev/null` = t; then \
-           test ! -f $(srcdir)/gnus-xmas.elc && RM_ELC=t; \
+           if test ! -f $(srcdir)/gnus-xmas.elc; then RM_ELC=t; fi; \
          else \
-           test -f $(srcdir)/gnus-xmas.elc && RM_ELC=t; \
+           if test -f $(srcdir)/gnus-xmas.elc; then RM_ELC=t; fi; \
          fi; \
          if test $$RM_ELC = t; then \
            echo " => maybe yes;" \

diff --git a/lisp/imap.el b/lisp/imap.el
index 1cf7a54..1539a44 100644 (file)
--- a/lisp/imap.el
+++ b/lisp/imap.el
@@ -1809,7 +1809,7 @@ Return nil if no complete line has arrived."
        (when (eq (char-after) ?\))
          (imap-forward)
          (nreverse addresses)))
-    (assert (imap-parse-nil))))
+    (assert (imap-parse-nil) t "In imap-parse-address-list")))
 
 ;;   mailbox         = "INBOX" / astring
 ;;                       ; INBOX is case-insensitive.  All case variants of
@@ -2234,7 +2234,7 @@ Return nil if no complete line has arrived."
 
 (defun imap-parse-flag-list ()
   (let (flag-list start)
-    (assert (eq (char-after) ?\())
+    (assert (eq (char-after) ?\() t "In imap-parse-flag-list")
     (while (and (not (eq (char-after) ?\)))
                (setq start (progn
                              (imap-forward)
@@ -2243,7 +2243,7 @@ Return nil if no complete line has arrived."
                              (point)))
                (> (skip-chars-forward "^ )" (imap-point-at-eol)) 0))
       (push (buffer-substring start (point)) flag-list))
-    (assert (eq (char-after) ?\)))
+    (assert (eq (char-after) ?\)) t "In imap-parse-flag-list")
     (imap-forward)
     (nreverse flag-list)))
 
@@ -2328,7 +2328,7 @@ Return nil if no complete line has arrived."
        (while (eq (char-after) ?\ )
          (imap-forward)
          (push (imap-parse-body-extension) b-e))
-       (assert (eq (char-after) ?\)))
+       (assert (eq (char-after) ?\)) t "In imap-parse-body-extension")
        (imap-forward)
        (nreverse b-e))
     (or (imap-parse-number)
@@ -2356,7 +2356,7 @@ Return nil if no complete line has arrived."
              (imap-forward)
              (push (imap-parse-string-list) dsp)
              (imap-forward))
-         (assert (imap-parse-nil)))
+         (assert (imap-parse-nil) t "In imap-parse-body-ext"))
        (push (nreverse dsp) ext))
       (when (eq (char-after) ?\ );; body-fld-lang
        (imap-forward)
@@ -2452,7 +2452,7 @@ Return nil if no complete line has arrived."
                (push (and (imap-parse-nil) nil) body))
              (setq body
                    (append (imap-parse-body-ext) body)));; body-ext-...
-           (assert (eq (char-after) ?\)))
+           (assert (eq (char-after) ?\)) t "In imap-parse-body")
            (imap-forward)
            (nreverse body))
 
@@ -2512,7 +2512,7 @@ Return nil if no complete line has arrived."
          (push (imap-parse-nstring) body);; body-fld-md5
          (setq body (append (imap-parse-body-ext) body)));; body-ext-1part..
     
-       (assert (eq (char-after) ?\)))
+       (assert (eq (char-after) ?\)) t "In imap-parse-body 2")
        (imap-forward)
        (nreverse body)))))
 

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index 4c969a8..4511d6a 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -396,6 +396,8 @@ If EXAMINE is non-nil the group is selected read-only."
            (if (or (nnimap-verify-uidvalidity
                     group (or server nnimap-current-server))
                    (zerop (imap-mailbox-get 'exists group))
+                   t ;; for OGnus to see if ignoring uidvalidity
+                     ;; changes has any bad effects.
                    (yes-or-no-p
                     (format
                      "nnimap: Group %s is not uidvalid.  Continue? " group)))

diff --git a/lisp/rfc2047.el b/lisp/rfc2047.el
index e553f25..b6edfdf 100644 (file)
--- a/lisp/rfc2047.el
+++ b/lisp/rfc2047.el
@@ -141,6 +141,8 @@ Should be called narrowed to the head of the message."
                (rfc2047-fold-region (save-excursion
                                       (goto-char (point-min))
                                       (skip-chars-forward "^:")
+                                      (and (looking-at ": ")
+                                           (forward-char 2))
                                       (point)) (point-max)))
            ;; We found something that may perhaps be encoded.
            (setq method nil