2003-10-16 Lars Magne Ingebrigtsen <larsi@gnus.org>

	* gnus-group.el (gnus-group-mark-regexp): Jump to groups.

2003-10-16  Ed L. Cashin  <ecashin@uga.edu>

	* imap.el (imap-interactive-login): Set imap-password to nil if
	login fails.

2003-10-16  Lars Magne Ingebrigtsen  <larsi@gnus.org>

	* message.el (message-inserted-headers): New variable.
	(message-mode): Make local.
	(message-mode): Set all the local action variables to nil.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2268cb5..b702f1e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2003-10-16  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * nndraft.el (nndraft-request-move-article): Fix infinite
+       recursion. 
+
        * gnus-group.el (gnus-group-mark-regexp): Jump to groups.
 
 2003-10-16  Ed L. Cashin  <ecashin@uga.edu>

diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index 97e798e..9807cd2 100644 (file)
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -1736,9 +1736,11 @@ If UNMARK, remove the mark instead."
   (interactive "sMark (regexp): ")
   (let ((alist (cdr gnus-newsrc-alist))
        group)
-    (while alist
-      (when (string-match regexp (setq group (gnus-info-group (pop alist))))
-       (gnus-group-set-mark group))))
+    (save-excursion
+      (while alist
+       (when (string-match regexp (setq group (gnus-info-group (pop alist))))
+         (gnus-group-jump-to-group group)
+         (gnus-group-set-mark group)))))
   (gnus-group-position-point))
 
 (defun gnus-group-remove-mark (group &optional test-marked)

diff --git a/lisp/imap.el b/lisp/imap.el
index 7d7b750..61ee5c0 100644 (file)
--- a/lisp/imap.el
+++ b/lisp/imap.el
@@ -817,6 +817,7 @@ Returns t if login was successful, nil otherwise."
                    (setq imap-password passwd)))
            (message "Login failed...")
            (setq passwd nil)
+           (setq imap-password nil)
            (sit-for 1))))
       ;;       (quit (with-current-buffer buffer
       ;;               (setq user nil

diff --git a/lisp/message.el b/lisp/message.el
index 930b97a..5f0d166 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -1337,6 +1337,7 @@ no, only reply back to the author."
 (defvar message-draft-article nil)
 (defvar message-mime-part nil)
 (defvar message-posting-charset nil)
+(defvar message-inserted-headers nil)
 
 ;; Byte-compiler warning
 (eval-when-compile
@@ -2320,11 +2321,12 @@ C-c M-f  `message-mark-insert-file' (insert file marked with enclosing tags).
 M-RET    `message-newline-and-reformat' (break the line and reformat)."
   (setq local-abbrev-table text-mode-abbrev-table)
   (set (make-local-variable 'message-reply-buffer) nil)
-  (make-local-variable 'message-send-actions)
-  (make-local-variable 'message-exit-actions)
-  (make-local-variable 'message-kill-actions)
-  (make-local-variable 'message-postpone-actions)
-  (make-local-variable 'message-draft-article)
+  (set (make-local-variable 'message-inserted-headers) nil)
+  (set (make-local-variable 'message-send-actions) nil)
+  (set (make-local-variable 'message-exit-actions) nil)
+  (set (make-local-variable 'message-kill-actions) nil)
+  (set (make-local-variable 'message-postpone-actions) nil)
+  (set (make-local-variable 'message-draft-article) nil)
   (setq buffer-offer-save t)
   (set (make-local-variable 'facemenu-add-face-function)
        (lambda (face end)
@@ -4803,7 +4805,7 @@ Headers already prepared in the buffer are not modified."
           (Expires (message-make-expires))
           (case-fold-search t)
           (optionalp nil)
-          header value elem)
+          header value elem header-string)
       ;; First we remove any old generated headers.
       (let ((headers message-deletable-headers))
        (unless (buffer-modified-p)
@@ -4828,13 +4830,12 @@ Headers already prepared in the buffer are not modified."
                      optionalp t)
              (setq header (car elem)))
          (setq header elem))
+       (setq header-string  (if (stringp header)
+                                header
+                              (symbol-name header)))
        (when (or (not (re-search-forward
                        (concat "^"
-                               (regexp-quote
-                                (downcase
-                                 (if (stringp header)
-                                     header
-                                   (symbol-name header))))
+                               (regexp-quote (downcase header-string))
                                ":")
                        nil t))
                  (progn
@@ -4847,7 +4848,8 @@ Headers already prepared in the buffer are not modified."
          (setq value
                (cond
                 ((and (consp elem)
-                      (eq (car elem) 'optional))
+                      (eq (car elem) 'optional)
+                      (not (member header-string message-inserted-headers)))
                  ;; This is an optional header.  If the cdr of this
                  ;; is something that is nil, then we do not insert
                  ;; this header.
@@ -4887,9 +4889,7 @@ Headers already prepared in the buffer are not modified."
                           (cdr (assq header message-header-format-alist))))
                      (if formatter
                          (funcall formatter header value)
-                       (insert (if (stringp header)
-                                   header (symbol-name header))
-                               ": " value))
+                       (insert header-string ": " value))
                      ;; We check whether the value was ended by a
                      ;; newline.  If now, we insert one.
                      (unless (bolp)
@@ -4901,6 +4901,7 @@ Headers already prepared in the buffer are not modified."
                ;; If the header is optional, and the header was
                ;; empty, we con't insert it anyway.
                (unless optionalp
+                 (push header-string message-inserted-headers)
                  (insert value)))
              ;; Add the deletable property to the headers that require it.
              (and (memq header message-deletable-headers)

diff --git a/lisp/nndraft.el b/lisp/nndraft.el
index 2b384b0..c956305 100644 (file)
--- a/lisp/nndraft.el
+++ b/lisp/nndraft.el
@@ -200,7 +200,7 @@
                                              accept-form &optional last)
   (nndraft-possibly-change-group group)
   (let ((nnmh-allow-delete-final t))
-    (nnoo-parent-function 'nndraft 'nndraft-request-move-article
+    (nnoo-parent-function 'nndraft 'nnmh-request-move-article
                          (list article group server accept-form last))))
 
 (deffoo nndraft-request-expire-articles (articles group &optional server force)