Sync up with qgnus-0.31.

diff --git a/lisp/message.el b/lisp/message.el
index cf7e0bd..2bb0627 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -114,7 +114,7 @@
   :type 'integer)
 
 (defcustom message-send-rename-function nil
-  "*Function called to rename the buffer after sending it."
+  "Function called to rename the buffer after sending it."
   :group 'message-buffers
   :type 'function)
 
@@ -166,7 +166,7 @@ Otherwise, most addresses look like `angles', but they look like
   :group 'message-headers)
 
 (defcustom message-syntax-checks nil
-  ;; Guess this one shouldn't be easy to customize...
+  ; Guess this one shouldn't be easy to customize...
   "*Controls what syntax checks should not be performed on outgoing posts.
 To disable checking of long signatures, for instance, add
  `(signature . disabled)' to this list.
@@ -203,7 +203,7 @@ included.  Organization, Lines and X-Mailer are optional."
   :type '(repeat sexp))
 
 (defcustom message-deletable-headers '(Message-ID Date Lines)
-  "*Headers to be deleted if they already exist and were generated by message previously."
+  "Headers to be deleted if they already exist and were generated by message previously."
   :group 'message-headers
   :type 'sexp)
 
@@ -229,7 +229,7 @@ any confusion."
 
 ;;;###autoload
 (defcustom message-signature-separator "^-- *$"
-  "*Regexp matching the signature separator."
+  "Regexp matching the signature separator."
   :type 'regexp
   :group 'message-various)
 
@@ -239,7 +239,7 @@ any confusion."
   :group 'message-various)
 
 (defcustom message-interactive nil
-  "*Non-nil means when sending a message wait for and display errors.
+  "Non-nil means when sending a message wait for and display errors.
 nil means let mailer mail back a message to report errors."
   :group 'message-sending
   :group 'message-mail
@@ -320,14 +320,14 @@ If nil, Message won't autosave."
   :type 'regexp)
 
 (defcustom message-cancel-message "I am canceling my own article."
-  "*Message to be inserted in the cancel message."
+  "Message to be inserted in the cancel message."
   :group 'message-interface
   :type 'string)
 
 ;; Useful to set in site-init.el
 ;;;###autoload
 (defcustom message-send-mail-function 'message-send-mail-with-sendmail
-  "*Function to call to send the current buffer as mail.
+  "Function to call to send the current buffer as mail.
 The headers should be delimited by a line whose contents match the
 variable `mail-header-separator'.
 
@@ -344,7 +344,7 @@ Legal values include `message-send-mail-with-sendmail' (the default),
 
 ;; 1997-09-29 by MORIOKA Tomohiko
 (defcustom message-send-news-function 'message-send-news-with-gnus
-  "*Function to call to send the current buffer as news.
+  "Function to call to send the current buffer as news.
 The headers should be delimited by a line whose contents match the
 variable `mail-header-separator'."
   :group 'message-sending
@@ -352,21 +352,21 @@ variable `mail-header-separator'."
   :type 'function)
 
 (defcustom message-reply-to-function nil
-  "*Function that should return a list of headers.
+  "Function that should return a list of headers.
 This function should pick out addresses from the To, Cc, and From headers
 and respond with new To and Cc headers."
   :group 'message-interface
   :type 'function)
 
 (defcustom message-wide-reply-to-function nil
-  "*Function that should return a list of headers.
+  "Function that should return a list of headers.
 This function should pick out addresses from the To, Cc, and From headers
 and respond with new To and Cc headers."
   :group 'message-interface
   :type 'function)
 
 (defcustom message-followup-to-function nil
-  "*Function that should return a list of headers.
+  "Function that should return a list of headers.
 This function should pick out addresses from the To, Cc, and From headers
 and respond with new To and Cc headers."
   :group 'message-interface
@@ -392,12 +392,12 @@ command line, because it is even more evil than leaving it out."
 
 ;; qmail-related stuff
 (defcustom message-qmail-inject-program "/var/qmail/bin/qmail-inject"
-  "*Location of the qmail-inject program."
+  "Location of the qmail-inject program."
   :group 'message-sending
   :type 'file)
 
 (defcustom message-qmail-inject-args nil
-  "*Arguments passed to qmail-inject programs.
+  "Arguments passed to qmail-inject programs.
 This should be a list of strings, one string for each argument.
 
 For e.g., if you wish to set the envelope sender address so that bounces
@@ -429,30 +429,30 @@ might set this variable to '(\"-f\" \"you@some.where\")."
 
 (defcustom message-setup-hook
   '(message-maybe-setup-default-charset turn-on-mime-edit)
-  "*Normal hook, run each time a new outgoing message is initialized.
+  "Normal hook, run each time a new outgoing message is initialized.
 The function `message-setup' runs this hook."
   :group 'message-various
   :type 'hook)
 
 (defcustom message-signature-setup-hook nil
-  "*Normal hook, run each time a new outgoing message is initialized.
+  "Normal hook, run each time a new outgoing message is initialized.
 It is run after the headers have been inserted and before
 the signature is inserted."
   :group 'message-various
   :type 'hook)
 
 (defcustom message-mode-hook nil
-  "*Hook run in message mode buffers."
+  "Hook run in message mode buffers."
   :group 'message-various
   :type 'hook)
 
 (defcustom message-header-hook '(eword-encode-header)
-  "*Hook run in a message mode buffer narrowed to the headers."
+  "Hook run in a message mode buffer narrowed to the headers."
   :group 'message-various
   :type 'hook)
 
 (defcustom message-header-setup-hook nil
-  "*Hook called narrowed to the headers when setting up a message
+  "Hook called narrowed to the headers when setting up a message
 buffer."
   :group 'message-various
   :type 'hook)
@@ -524,14 +524,14 @@ If a form, the result from the form will be used instead."
   :type 'function)
 
 (defcustom message-expires 14
-  "*Number of days before your article expires."
+  "Number of days before your article expires."
   :group 'message-news
   :group 'message-headers
   :link '(custom-manual "(message)News Headers")
   :type 'integer)
 
 (defcustom message-user-path nil
-  "*If nil, use the NNTP server name in the Path header.
+  "If nil, use the NNTP server name in the Path header.
 If stringp, use this; if non-nil, use no host name (user name only)."
   :group 'message-news
   :group 'message-headers
@@ -807,23 +807,23 @@ Defaults to `text-mode-abbrev-table'.")
 The cdr of ech entry is a function for applying the face to a region.")
 
 (defcustom message-send-hook nil
-  "*Hook run before sending messages."
+  "Hook run before sending messages."
   :group 'message-various
   :options '(ispell-message)
   :type 'hook)
 
 (defcustom message-send-mail-hook nil
-  "*Hook run before sending mail messages."
+  "Hook run before sending mail messages."
   :group 'message-various
   :type 'hook)
 
 (defcustom message-send-news-hook nil
-  "*Hook run before sending news messages."
+  "Hook run before sending news messages."
   :group 'message-various
   :type 'hook)
 
 (defcustom message-sent-hook nil
-  "*Hook run after sending messages."
+  "Hook run after sending messages."
   :group 'message-various
   :type 'hook)
 

diff --git a/lisp/pop3.el b/lisp/pop3.el
index 5358d94..1bfd8ec 100644 (file)
--- a/lisp/pop3.el
+++ b/lisp/pop3.el
@@ -4,7 +4,7 @@
 
 ;; Author: Richard L. Pieri <ratinox@peorth.gweep.net>
 ;; Keywords: mail, pop3
-;; Version: 1.3k
+;; Version: 1.3l+
 
 ;; This file is part of GNU Emacs.
 
@@ -37,9 +37,9 @@
 (require 'mail-utils)
 (provide 'pop3)
 
-(defconst pop3-version "1.3k")
+(defconst pop3-version "1.3l+")
 
-(defvar pop3-maildrop (or user-login-name (getenv "LOGNAME") (getenv "USER") nil)
+(defvar pop3-maildrop (or (user-login-name) (getenv "LOGNAME") (getenv "USER") nil)
   "*POP3 maildrop.")
 (defvar pop3-mailhost (or (getenv "MAILHOST") nil)
   "*POP3 mailhost.")