Sync up with gnus-5.6.3.

diff --git a/lisp/message.el b/lisp/message.el
index 79b3367..3b2921c 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -556,6 +556,7 @@ If stringp, use this; if non-nil, use no host name (user name only)."
 
 (define-widget 'message-header-lines 'text
   "All header lines must be LFD terminated."
+  :format "%t:%n%v"
   :valid-regexp "^\\'"
   :error "All header lines must be newline terminated")
 
@@ -3572,18 +3573,20 @@ responses here are directed to other newsgroups."))
   (unless (message-news-p)
     (error "This is not a news article; canceling is impossible"))
   (when (yes-or-no-p "Do you really want to cancel this article? ")
-    (let (from newsgroups message-id distribution buf)
+    (let (from newsgroups message-id distribution buf sender)
       (save-excursion
        ;; Get header info. from original article.
        (save-restriction
          (message-narrow-to-head)
          (setq from (message-fetch-field "from")
+               sender (message-fetch-field "sender")
                newsgroups (message-fetch-field "newsgroups")
                message-id (message-fetch-field "message-id" t)
                distribution (message-fetch-field "distribution")))
        ;; Make sure that this article was written by the user.
        (unless (string-equal
-                (downcase (cadr (std11-extract-address-components from)))
+                (downcase
+                 (or sender (cadr (std11-extract-address-components from))))
                 (downcase (message-make-address)))
          (error "This article is not yours"))
        ;; Make control message.

diff --git a/texi/Makefile.in b/texi/Makefile.in
index b8eb937..be10a0d 100644 (file)
--- a/texi/Makefile.in
+++ b/texi/Makefile.in
@@ -109,7 +109,7 @@ veryclean:
 
 distclean:
        make clean
-       rm -f *.orig *.rej *.elc *~ gnus gnus-[0-9] gnus-[0-9][0-9]
+       rm -f *.orig *.rej *.elc *~ gnus gnus-[0-9] gnus-[0-9][0-9] Makefile
        rm -f message message-[0-9]
 
 install: