Merge v5-10 branch.

2005-12-12  Richard M. Stallman  <rms@gnu.org>

	* mm-url.el (mm-url-load-url): Require url-parse and url-vars.

2005-11-14  Kevin Greiner  <kevin.greiner@compsol.cc>

	* nntp.el (nntp-end-of-line): Doc fix.

2005-10-30  Chong Yidong  <cyd@stupidchicken.com>

	* imap.el (imap-open): Handle case where buffer is a buffer
	object.

2005-11-30  Stefan Monnier  <monnier@iro.umontreal.ca>

	* gnus-delay.el (gnus-delay): Don't autoload.
	It's useless and could trigger a bug in cus-dep.el causing ldefs-boot
	to be re-loaded when customizing the `gnus-delay' group.

2005-11-19  Chong Yidong  <cyd@stupidchicken.com>

	* message.el (message-insert-citation-line): Use newlines.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 81454d3..42a49c5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,4 +1,12 @@
-2005-11-04 Ken Manheimer  <ken.manheimer@gmail.com>
+2005-12-12  Richard M. Stallman  <rms@gnu.org>
+
+       * mm-url.el (mm-url-load-url): Require url-parse and url-vars.
+
+2005-11-14  Kevin Greiner  <kevin.greiner@compsol.cc>
+
+       * nntp.el (nntp-end-of-line): Doc fix.
+
+2005-11-04  Ken Manheimer  <ken.manheimer@gmail.com>
 
        * pgg-pgp.el (pgg-pgp-encrypt-region, pgg-pgp-decrypt-region)
        (pgg-pgp-sign-region): Add optional 'passphrase' argument to all
@@ -14,6 +22,11 @@
        (pgg-pgp5-sign-region): Use new name of
        pgg-add-passphrase-to-cache function.
 
+2005-10-30  Chong Yidong  <cyd@stupidchicken.com>
+
+       * imap.el (imap-open): Handle case where buffer is a buffer
+       object.
+
 2005-10-29  Ken Manheimer  <ken.manheimer@gmail.com>
 
        * pgg-gpg.el (pgg-gpg-select-matching-key): Fix: look at the right
@@ -35,12 +48,12 @@
        (pgg-remove-passphrase-from-cache): Rename from
        `pgg-remove-passphrase-cache' to reduce confusion (all callers
        changed).
-       (pgg-read-passphrase) (pgg-add-passphrase-cache)
+       (pgg-read-passphrase, pgg-add-passphrase-cache)
        (pgg-remove-passphrase-cache): Add informative docstrings.
        (pgg-decrypt): Convey provided passphrase in subordinate call to
        pgg-decrypt-region.
 
-2005-10-20  Ken Manheimer <ken.manheimer+emacs@gmail.com>
+2005-10-20  Ken Manheimer  <ken.manheimer+emacs@gmail.com>
 
        * pgg.el (pgg-encrypt-region, pgg-encrypt-symmetric-region)
        (pgg-encrypt-symmetric, pgg-encrypt, pgg-decrypt-region)
@@ -75,6 +88,16 @@
        * pgg.el (pgg-encrypt-symmetric, pgg-encrypt-symmetric-region):
        New user commands for symmetric encryption.
 
+2005-11-30  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * gnus-delay.el (gnus-delay): Don't autoload.
+       It's useless and could trigger a bug in cus-dep.el causing ldefs-boot
+       to be re-loaded when customizing the `gnus-delay' group.
+
+2005-11-19  Chong Yidong  <cyd@stupidchicken.com>
+
+       * message.el (message-insert-citation-line): Use newlines.
+
 2006-01-19  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * mm-bodies.el (mm-decode-body): Don't decode decoded body.

diff --git a/lisp/gnus-delay.el b/lisp/gnus-delay.el
index 2ac7a80..33ad307 100644 (file)
--- a/lisp/gnus-delay.el
+++ b/lisp/gnus-delay.el
@@ -1,6 +1,7 @@
 ;;; gnus-delay.el --- Delayed posting of articles
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 ;; Keywords: mail, news, extensions
@@ -39,7 +40,6 @@
 (require 'gnus-draft)
 (autoload 'parse-time-string "parse-time" nil nil)
 
-;;;###autoload
 (defgroup gnus-delay nil
   "Arrange for sending postings later."
   :version "22.1"

diff --git a/lisp/imap.el b/lisp/imap.el
index 147dff1..6d489b6 100644 (file)
--- a/lisp/imap.el
+++ b/lisp/imap.el
@@ -1,7 +1,7 @@
 ;;; imap.el --- imap library
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <jas@pdc.kth.se>
 ;; Keywords: mail
@@ -1102,8 +1102,11 @@ necessary.  If nil, the buffer name is generated."
                           stream))
                      ;; We're done, kill the first connection
                      (imap-close buffer)
-                     (kill-buffer buffer)
-                     (rename-buffer buffer)
+                     (let ((name (if (stringp buffer)
+                                     buffer
+                                   (buffer-name buffer))))
+                       (kill-buffer buffer)
+                       (rename-buffer name))
                      (message "imap: Reconnecting with stream `%s'...done"
                               stream)
                      (setq imap-stream stream)

diff --git a/lisp/message.el b/lisp/message.el
index 84b8d65..62cd66b 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -3408,7 +3408,9 @@ This function strips off the signature from the original message."
 (defun message-insert-citation-line ()
   "Insert a simple citation line."
   (when message-reply-headers
-    (insert (mail-header-from message-reply-headers) " writes:\n\n")))
+    (insert (mail-header-from message-reply-headers) " writes:")
+    (newline)
+    (newline)))
 
 (defun message-position-on-field (header &rest afters)
   (let ((case-fold-search t))

diff --git a/lisp/mm-url.el b/lisp/mm-url.el
index ab6abe9..0b769a6 100644 (file)
--- a/lisp/mm-url.el
+++ b/lisp/mm-url.el
@@ -1,6 +1,7 @@
 ;;; mm-url.el --- a wrapper of url functions/commands for Gnus
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
 
@@ -273,7 +274,10 @@ This is taken from RFC 2396.")
 (defun mm-url-load-url ()
   "Load `url-insert-file-contents'."
   (unless (condition-case ()
-             (require 'url-handlers)
+             (progn
+               (require 'url-handlers)
+               (require 'url-parse)
+               (require 'url-vars))
            (error nil))
     ;; w3-4.0pre0.46 or earlier version.
     (require 'w3-vars)

diff --git a/lisp/nntp.el b/lisp/nntp.el
index 0c200dc..46294af 100644 (file)
--- a/lisp/nntp.el
+++ b/lisp/nntp.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 1987, 1988, 1989, 1990, 1992, 1993,
 ;;   1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002,
-;;   2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
@@ -104,8 +104,8 @@ This command is used by the methods `nntp-open-telnet-stream',
 
 (defvoo nntp-end-of-line "\r\n"
   "*String to use on the end of lines when talking to the NNTP server.
-This is \"\\r\\n\" by default, but should be \"\\n\" when using and
-indirect telnet connection method (nntp-open-via-*-and-telnet).")
+This is \"\\r\\n\" by default, but should be \"\\n\" when using an indirect
+connection method (nntp-open-via-*).")
 
 (defvoo nntp-via-rlogin-command "rsh"
   "*Rlogin command used to connect to an intermediate host.