* gnus-art.el (article-make-date-line): Get the hours right.

(gnus-ignored-headers): More hiding.

* nnmail.el (nnmail-expiry-wait): Not an integer.

* message.el (message-goto-body): Only expand abbrev when called
interactively.
(message-make-lines): Use it.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a1dd290..348dd95 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2000-12-30 00:17:38  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * gnus-art.el (article-make-date-line): Get the hours right.
+       (gnus-ignored-headers): More hiding.
+
+       * nnmail.el (nnmail-expiry-wait): Not an integer.
+
+       * message.el (message-goto-body): Only expand abbrev when called
+       interactively. 
+       (message-make-lines): Use it.
+
 2000-12-29 20:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * gnus-msg.el (gnus-inews-yank-articles): Reparse headers.

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index b55f266..3a4cec4 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -128,7 +128,8 @@
     "^X-Notes-Item:" "^X-MS-TNEF-Correlator:" "^x-uunet-gateway:"
     "^X-Received:" "^Content-length:" "X-precedence:"
     "^X-Authenticated-User:" "^X-Comment" "^X-Report:" "^X-Abuse-Info:"
-    "^X-HTTP-Proxy:" "^X-Mydeja-Info:")
+    "^X-HTTP-Proxy:" "^X-Mydeja-Info:" "^X-Copyright" "^X-No-Markup:"
+    "^X-Abuse-Info:")
   "*All headers that start with this regexp will be hidden.
 This variable can also be a list of regexps of headers to be ignored.
 If `gnus-visible-headers' is non-nil, this variable will be ignored."
@@ -2260,9 +2261,9 @@ should replace the \"Date:\" one, or should be added below it."
         " "
         (number-to-string (nth 5 dtime))
         " at "
-        (number-to-string (nth 0 dtime))
+        (format "%02d" (nth 2 dtime))
         ":"
-        (number-to-string (nth 1 dtime)))))
+        (format "%02d" (nth 1 dtime)))))
      (t
       (error "Unknown conversion type: %s" type)))))
 

diff --git a/lisp/message.el b/lisp/message.el
index e76018f..c88b5c9 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -1667,10 +1667,12 @@ M-RET    message-newline-and-reformat (break the line and reformat)."
   (interactive)
   (message-position-on-field "Summary" "Subject"))
 
-(defun message-goto-body ()
+(defun message-goto-body (&optional interactivep)
   "Move point to the beginning of the message body."
-  (interactive)
-  (if (looking-at "[ \t]*\n") (expand-abbrev))
+  (interactive (list t))
+  (when (and interactivep
+            (looking-at "[ \t]*\n"))
+    (expand-abbrev))
   (goto-char (point-min))
   (or (search-forward (concat "\n" mail-header-separator "\n") nil t)
       (search-forward "\n\n" nil t)))
@@ -3184,10 +3186,7 @@ If NOW, use that time instead."
   (save-excursion
     (save-restriction
       (widen)
-      (goto-char (point-min))
-      (re-search-forward
-       (concat "^" (regexp-quote mail-header-separator) "$"))
-      (forward-line 1)
+      (message-goto-body)
       (int-to-string (count-lines (point) (point-max))))))
 
 (defun message-make-in-reply-to ()

diff --git a/lisp/nnmail.el b/lisp/nnmail.el
index 6ccc1ca..519eea3 100644 (file)
--- a/lisp/nnmail.el
+++ b/lisp/nnmail.el
@@ -145,7 +145,7 @@ number of days) -- this doesn't have to be an integer.  This variable
 can also be `immediate' and `never'."
   :group 'nnmail-expire
   :type '(choice (const immediate)
-                (integer :tag "days")
+                (number :tag "days")
                 (const never)))
 
 (defcustom nnmail-expiry-wait-function nil