*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bd4298c..17bf67b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,29 @@
+Fri Apr 21 02:50:11 1995  Lars Magne Ingebrigtsen  <larsi@gjalp.ifi.uio.no>
+
+       * gnus.el (gnus-start-news-server): Set nnmh-directory in the
+       select method.
+
+       * nnfolder.el: Installed Scott Byer's patches.
+
+       * nnheader.el (nnheader-make-complex-temp-name): New variable. 
+
+       * gnus-mh.el: Installed Eric Selberg's patches.
+
+       * gnus.el (gnus-summary-check-current): New variable.
+       (gnus-summary-search-subject): Use variable.
+       Did the (replace-match "" t t) thing.
+       (gnus-simplify-subject-fuzzy): Buffer implementation.
+
+       * nnspool.el (nnspool-seconds-since-epoch): Returned incorrect
+       data. 
+
+       * gnus.el (gnus-article-prepare): Go to the next subject if the
+       article is canceled.
+
+Fri Apr 21 02:48:19 1995  Lars Magne Ingebrigtsen  <larsi@menja.ifi.uio.no>
+
+       * gnus.el: 0.54 is released.
+
 Thu Apr 20 06:36:33 1995  Lars Ingebrigtsen  <lars@eyesore.no>
 
        * gnus.el (gnus-setup-news): Read .newsrc.eld before reading the

diff --git a/lisp/gnus-mh.el b/lisp/gnus-mh.el
index 0c85dbf..242b4ad 100644 (file)
--- a/lisp/gnus-mh.el
+++ b/lisp/gnus-mh.el
@@ -68,60 +68,63 @@ Optional argument FOLDER specifies folder name."
   "Compose reply mail using mh-e.
 Optional argument YANK means yank original article.
 The command \\[mh-yank-cur-msg] yank the original message into current buffer."
-  ;; First of all, prepare mhe mail buffer.
-  ;; Bug fix by Timo METZEMAKERS <metzemakers@labri.u-bordeaux.fr>.
   (let (from cc subject date to reply-to to-userid orig-to
             (config (current-window-configuration))
-            (buffer))
+            buffer)
     (pop-to-buffer gnus-article-buffer)
     (setq buffer (current-buffer))
-    (save-restriction
-      (or gnus-user-login-name ;; here cuz we need it here.
-         (setq gnus-user-login-name (or (getenv "USER")
-                                        (getenv "LOGNAME"))))
-      ;; junk which mh-send did, but now we do. also better, cuz doesn't
-      ;; call delete-other-windows when we don't want it to.
-      (if gnus-split-window 
-         (progn
-           (split-window-vertically)
-           ))
-
-      (gnus-article-show-all-headers)  ;I don't think this is really needed.
-      (setq from (gnus-fetch-field "from")
-           subject (let ((subject (or (gnus-fetch-field "subject")
-                                      "(None)")))
-                     (if (and subject
-                              (not (string-match "^[Rr][Ee]:.+$" subject)))
-                         (concat "Re: " subject) subject))
-           reply-to (gnus-fetch-field "reply-to")
-           cc (gnus-fetch-field "cc")
-           orig-to (or (gnus-fetch-field "to") "")
-           date (gnus-fetch-field "date"))
-      (setq to (or reply-to from))
-      (setq to-userid (mail-strip-quoted-names orig-to))
-      (if (or (string-match "," orig-to)
-             (not (string-match (substring to-userid 0 (string-match "@" to-userid))
-                           gnus-user-login-name)))
-         (setq cc (concat (if cc (concat cc ", ") "") orig-to))
-       )
-;      (setq mh-show-buffer buffer)
-
-      (mh-find-path)
-      (mh-goto-header-end 0)
-      (if gnus-split-window
-         (mh-send-sub to (or cc "") (or subject "(None)") config) ;; Erik Selberg 1/23/94
-       (mh-send to (or cc "") subject) ;; shouldn't use according to mhe
-       )
-      (save-excursion
-       (mh-insert-fields
-        "In-reply-to:"
-        (concat
-         (substring from 0 (string-match "  *at \\|  *@ \\| *(\\| *<" from))
-         "'s message of " date)))
-      (setq mh-sent-from-folder buffer)
-      (setq mh-sent-from-msg 1)
-      (setq mh-previous-window-config config)
-      ))
+    (save-excursion
+      (save-restriction
+       (or gnus-user-login-name ; we need this
+           (setq gnus-user-login-name (or (getenv "USER")
+                                          (getenv "LOGNAME"))))
+
+       (gnus-article-show-all-headers) ;; so colors are happy
+       ;; lots of junk to avoid mh-send deleting other windows
+       (if gnus-split-window 
+             (split-window-vertically)
+         )
+
+       (setq from (gnus-fetch-field "from")
+             subject (let ((subject (or (gnus-fetch-field "subject")
+                                        "(None)")))
+                       (if (and subject
+                                (not (string-match "^[Rr][Ee]:.+$" subject)))
+                           (concat "Re: " subject) subject))
+             reply-to (gnus-fetch-field "reply-to")
+             cc (gnus-fetch-field "cc")
+             orig-to (or (gnus-fetch-field "to") "")
+             date (gnus-fetch-field "date"))
+       (setq to (or reply-to from))
+       (setq to-userid (mail-strip-quoted-names orig-to))
+       (if (or (string-match "," orig-to)
+               (not (string-match (substring to-userid 0 (string-match "@" to-userid))
+                                  gnus-user-login-name)))
+           (setq cc (concat (if cc (concat cc ", ") "") orig-to))
+         )
+       ;;    (setq mh-show-buffer buffer)
+       )) ;; save excursion/restriction
+
+    (mh-find-path)
+    (if gnus-split-window
+       (mh-send-sub to (or cc "") (or subject "(None)") config);; Erik Selberg 1/23/94
+      (mh-send to (or cc "") subject);; shouldn't use according to mhe
+      )
+    
+    ;; note - current buffer is now draft!
+    (save-excursion
+      (mh-insert-fields
+       "In-reply-to:"
+       (concat
+       (substring from 0 (string-match "  *at \\|  *@ \\| *(\\| *<" from))
+       "'s message of " date)))
+
+    ;; need this for mh-yank-cur-msg
+    (setq mh-sent-from-folder buffer)
+    (setq mh-sent-from-msg 1)
+    (setq mh-show-buffer buffer)
+    (setq mh-previous-window-config config)
+    )
 
     ;; Then, yank original article if requested.
   (if yank