Sync from Emacs.

2002-05-09  Miles Bader  <miles@gnu.org>

	* gnus-cite.el (gnus-cite-blank-line-after-header): New variable.
	(gnus-article-hide-citation): Respect it.

2002-04-12  Juanma Barranquero  <lektu@terra.es>

	* pop3.el (pop3-open-server): Fix typo.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e494477..c178ec0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2002-05-09  Miles Bader  <miles@gnu.org>
+
+       * gnus-cite.el (gnus-cite-blank-line-after-header): New variable.
+       (gnus-article-hide-citation): Respect it.
+
+2002-04-12  Juanma Barranquero  <lektu@terra.es>
+
+       * pop3.el (pop3-open-server): Fix typo.
+
 2002-06-18  Josh Huber  <huber@alum.wpi.edu>
 
        * gnus.el (gnus-find-subscribed-addresses): Use add-to-list

diff --git a/lisp/gnus-cite.el b/lisp/gnus-cite.el
index 1c5e424..59ccf01 100644 (file)
--- a/lisp/gnus-cite.el
+++ b/lisp/gnus-cite.el
@@ -1,6 +1,6 @@
 ;;; gnus-cite.el --- parse citations in articles for Gnus
 
-;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Per Abhiddenware
@@ -259,6 +259,11 @@ This should make it easier to see who wrote what."
   :group 'gnus-cite
   :type 'integer)
 
+(defcustom gnus-cite-blank-line-after-header t
+  "If non-nil, put a blank line between the citation header and the button."
+  :group 'gnus-cite
+  :type 'boolean)
+
 ;;; Internal Variables:
 
 (defvar gnus-cite-article nil)
@@ -518,7 +523,8 @@ always hide."
                    end (set-marker (make-marker) end))
              (gnus-add-text-properties-when 'article-type nil beg end props)
              (goto-char beg)
-             (unless (save-excursion (search-backward "\n\n" nil t))
+             (when (and gnus-cite-blank-line-after-header
+                        (not (save-excursion (search-backward "\n\n" nil t))))
                (insert "\n"))
              (put-text-property
               (setq start (point-marker))

diff --git a/lisp/pop3.el b/lisp/pop3.el
index 685fefb..184b891 100644 (file)
--- a/lisp/pop3.el
+++ b/lisp/pop3.el
@@ -139,7 +139,7 @@ Returns the process associated with the connection."
                                             mailhost)))
       (erase-buffer)
       (setq pop3-read-point (point-min))
-      (setq process (open-network-stream "POP"(current-buffer) mailhost port))
+      (setq process (open-network-stream "POP" (current-buffer) mailhost port))
       (let ((response (pop3-read-response process t)))
        (setq pop3-timestamp
              (substring response (or (string-match "<" response) 0)