X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=inline;f=lisp%2Fmessage.el;h=63cdc3e84cb2df7b4f50f7cae8b521af34202646;hb=c5a1ec5514a2c218c037d83b81da9043e9f6c321;hp=8de61e28b3ee65e50145eeaa555a6dd5b882771f;hpb=aaf0a61c80f6a3fb09b5a8282fdcef1fa8afaf63;p=elisp%2Fgnus.git-

diff --git a/lisp/message.el b/lisp/message.el
index 8de61e2..63cdc3e 100644
--- 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")
 
@@ -931,7 +932,10 @@ The cdr of ech entry is a function for applying the face to a region.")
   (autoload 'gnus-output-to-rmail "gnus-util")
   (autoload 'mail-abbrev-in-expansion-header-p "mailabbrev")
   (autoload 'nndraft-request-associate-buffer "nndraft")
-  (autoload 'nndraft-request-expire-articles "nndraft"))
+  (autoload 'nndraft-request-expire-articles "nndraft")
+  (autoload 'gnus-open-server "gnus-int")
+  (autoload 'gnus-request-post "gnus-int")
+  (autoload 'rmail-output "rmail"))
 
 
 
@@ -1266,6 +1270,7 @@ C-c C-w  message-insert-signature (insert `message-signature-file' file).
 C-c C-y  message-yank-original (insert current message, if any).
 C-c C-q  message-fill-yanked-message (fill what was yanked).
 C-c C-e  message-elide-region (elide the text between point and mark).
+C-c C-z  message-kill-to-signature (kill the text up to the signature).
 C-c C-r  message-caesar-buffer-body (rot13 the message body)."
   (interactive)
   (kill-all-local-variables)
@@ -3075,7 +3080,7 @@ Headers already prepared in the buffer are not modified."
 	    (insert "Original-")
 	    (beginning-of-line))
 	  (when (or (message-news-p)
-		    (string-match "^[^@]@.+\\..+" secure-sender))
+		    (string-match "^[^@]+@.+\\..+" secure-sender))
 	    (insert "Sender: " secure-sender "\n")))))))
 
 (defun message-insert-courtesy-copy ()
@@ -3569,18 +3574,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.
@@ -3739,7 +3746,7 @@ Optional NEWS will use news to forward instead of mail."
 	(goto-char (point-max)))
       (insert mail-header-separator)
       ;; Rename all old ("Also-")Resent headers.
-      (while (re-search-backward "^\\(Also-\\)?Resent-" beg t)
+      (while (re-search-backward "^\\(Also-\\)*Resent-" beg t)
 	(beginning-of-line)
 	(insert "Also-"))
       ;; Quote any "From " lines at the beginning.