2000-11-15 13:21 ShengHuo ZHU <zsh@cs.rochester.edu>

[gnus] / lisp / pop3.el

diff --git a/lisp/pop3.el b/lisp/pop3.el
index ee2948e..6838432 100644 (file)
--- a/lisp/pop3.el
+++ b/lisp/pop3.el
@@ -1,6 +1,7 @@
 ;;; pop3.el --- Post Office Protocol (RFC 1460) interface
 
-;; Copyright (C) 1996-2000 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000
+;;        Free Software Foundation, Inc.
 
 ;; Author: Richard L. Pieri <ratinox@peorth.gweep.net>
 ;; Maintainer: FSF
@@ -118,7 +119,7 @@ Returns the process associated with the connection."
        (coding-system-for-write 'binary)
        process)
     (save-excursion
-      (set-buffer (get-buffer-create (concat " trace of POP session to %s"
+      (set-buffer (get-buffer-create (concat " trace of POP session to "
                                             mailhost)))
       (erase-buffer)
       (setq pop3-read-point (point-min))
@@ -233,7 +234,10 @@ Return the response string if optional second argument is non-nil."
                                  (substring From_ (match-end 0)))))
            (goto-char (point-min))
            (insert From_)
-           (re-search-forward "\n\n")
+           (if (search-forward "\n\n" nil t)
+               nil
+             (goto-char (point-max))
+             (insert "\n"))
            (narrow-to-region (point) (point-max))
            (let ((size (- (point-max) (point-min))))
              (goto-char (point-min))