projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revision: miles@gnu.org--gnu-2004/gnus--devo--0--patch-99
[gnus]
/
lisp
/
gnus-msg.el
diff --git
a/lisp/gnus-msg.el
b/lisp/gnus-msg.el
index
3228116
..
556bb40
100644
(file)
--- a/
lisp/gnus-msg.el
+++ b/
lisp/gnus-msg.el
@@
-1,5
+1,5
@@
;;; gnus-msg.el --- mail and post interface for Gnus
;;; gnus-msg.el --- mail and post interface for Gnus
-;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
, 2004
;; Free Software Foundation, Inc.
;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
;; Free Software Foundation, Inc.
;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
@@
-318,11
+318,7
@@
Thank you for your help in stamping out bugs.
")
(eval-and-compile
")
(eval-and-compile
- (autoload 'gnus-uu-post-news "gnus-uu" nil t)
- (autoload 'news-setup "rnewspost")
- (autoload 'news-reply-mode "rnewspost")
- (autoload 'rmail-dont-reply-to "mail-utils")
- (autoload 'rmail-output "rmailout"))
+ (autoload 'gnus-uu-post-news "gnus-uu" nil t))
\f
;;;
\f
;;;
@@
-363,10
+359,10
@@
Thank you for your help in stamping out bugs.
;;; Internal functions.
;;; Internal functions.
-(defun gnus-inews-make-draft ()
+(defun gnus-inews-make-draft (
articles
)
`(lambda ()
(gnus-inews-make-draft-meta-information
`(lambda ()
(gnus-inews-make-draft-meta-information
- ,gnus-newsgroup-name ',
gnus-article-reply
)))
+ ,gnus-newsgroup-name ',
articles
)))
(defvar gnus-article-reply nil)
(defmacro gnus-setup-message (config &rest forms)
(defvar gnus-article-reply nil)
(defmacro gnus-setup-message (config &rest forms)
@@
-395,15
+391,20
@@
Thank you for your help in stamping out bugs.
;; added an optional argument to `gnus-configure-posting-styles' to
;; make sure that the correct value for the group name is used. -- drv
(add-hook 'message-mode-hook
;; added an optional argument to `gnus-configure-posting-styles' to
;; make sure that the correct value for the group name is used. -- drv
(add-hook 'message-mode-hook
- (lambda ()
- (gnus-configure-posting-styles ,group)))
+ (if (memq ,config '(reply-yank reply))
+ (lambda ()
+ (gnus-configure-posting-styles ,group))
+ (lambda ()
+ ;; There may be an old " *gnus article copy*" buffer.
+ (let (gnus-article-copy)
+ (gnus-configure-posting-styles ,group)))))
(gnus-pull ',(intern gnus-draft-meta-information-header)
message-required-headers)
(when (and ,group
(not (string= ,group "")))
(push (cons
(intern gnus-draft-meta-information-header)
(gnus-pull ',(intern gnus-draft-meta-information-header)
message-required-headers)
(when (and ,group
(not (string= ,group "")))
(push (cons
(intern gnus-draft-meta-information-header)
- (gnus-inews-make-draft))
+ (gnus-inews-make-draft
,yanked
))
message-required-headers))
(unwind-protect
(progn
message-required-headers))
(unwind-protect
(progn
@@
-431,12
+432,19
@@
Thank you for your help in stamping out bugs.
(run-hooks 'post-command-hook)
(set-buffer-modified-p nil))))
(run-hooks 'post-command-hook)
(set-buffer-modified-p nil))))
-(defun gnus-inews-make-draft-meta-information (group article)
+(defun gnus-inews-make-draft-meta-information (group articles)
+ (when (numberp articles)
+ (setq articles (list articles)))
(concat "(\"" group "\" "
(concat "(\"" group "\" "
- (if article (number-to-string
- (if (listp article)
- (car article)
- article)) "\"\"")
+ (if articles
+ (mapconcat
+ (lambda (elem)
+ (number-to-string
+ (if (consp elem)
+ (car elem)
+ elem)))
+ articles " ")
+ "")
")"))
;;;###autoload
")"))
;;;###autoload
@@
-673,9
+681,9
@@
network. The corresponding back end must have a 'request-post method."
(progn
(message-news (gnus-group-real-name gnus-newsgroup-name))
(set (make-local-variable 'gnus-discouraged-post-methods)
(progn
(message-news (gnus-group-real-name gnus-newsgroup-name))
(set (make-local-variable 'gnus-discouraged-post-methods)
- (
delq
+ (
remove
(car (gnus-find-method-for-group gnus-newsgroup-name))
(car (gnus-find-method-for-group gnus-newsgroup-name))
-
(copy-sequence gnus-discouraged-post-methods)
)))))
+
gnus-discouraged-post-methods
)))))
(save-excursion
(set-buffer buffer)
(setq gnus-newsgroup-name group)))))
(save-excursion
(set-buffer buffer)
(setq gnus-newsgroup-name group)))))
@@
-724,7
+732,9
@@
article number, and the cdr is the string to be yanked."
(gnus-summary-handle-replysign)))
(defun gnus-summary-followup-with-original (n &optional force-news)
(gnus-summary-handle-replysign)))
(defun gnus-summary-followup-with-original (n &optional force-news)
- "Compose a followup to an article and include the original article."
+ "Compose a followup to an article and include the original article.
+The text in the region will be yanked. If the region isn't
+active, the entire article will be yanked."
(interactive "P")
(gnus-summary-followup (gnus-summary-work-articles n) force-news))
(interactive "P")
(gnus-summary-followup (gnus-summary-work-articles n) force-news))
@@
-906,7
+916,9
@@
header line with the old Message-ID."
(not to-address)))
;; This is news.
(if post
(not to-address)))
;; This is news.
(if post
- (message-news (or to-group group))
+ (message-news
+ (or to-group
+ (and (not (gnus-virtual-group-p pgroup)) group)))
(set-buffer gnus-article-copy)
(gnus-msg-treat-broken-reply-to)
(message-followup (if (or newsgroup-p force-news)
(set-buffer gnus-article-copy)
(gnus-msg-treat-broken-reply-to)
(message-followup (if (or newsgroup-p force-news)
@@
-1259,6
+1271,7
@@
composing a new message."
;; Get a normal message buffer.
(message-pop-to-buffer (message-buffer-name "Resend" to))
(insert-buffer-substring cur)
;; Get a normal message buffer.
(message-pop-to-buffer (message-buffer-name "Resend" to))
(insert-buffer-substring cur)
+ (mime-to-mml)
(message-narrow-to-head-1)
;; Gnus will generate a new one when sending.
(message-remove-header "Message-ID")
(message-narrow-to-head-1)
;; Gnus will generate a new one when sending.
(message-remove-header "Message-ID")
@@
-1377,7
+1390,7
@@
The current group name will be inserted at \"%s\".")
(not (gnus-group-read-only-p group)))
(setq group (read-string "Put in group: " nil (gnus-writable-groups))))
(not (gnus-group-read-only-p group)))
(setq group (read-string "Put in group: " nil (gnus-writable-groups))))
- (when (gnus-g
ethash group gnus-newsrc-hashtb
)
+ (when (gnus-g
roup-entry group
)
(error "No such group: %s" group))
(save-excursion
(save-restriction
(error "No such group: %s" group))
(save-excursion
(save-restriction
@@
-1508,14
+1521,14
@@
The source file has to be in the Emacs load path."
(while olist
(if (boundp (car olist))
(ignore-errors
(while olist
(if (boundp (car olist))
(ignore-errors
- (pp `(setq ,(car olist)
-
,(if (or (consp (setq sym (symbol-value (car olist)))
)
-
(and (symbolp sym
)
-
(not (or (eq sym nil
)
-
(eq sym t))))
)
-
(list 'quote (symbol-value (car olist
)))
-
(symbol-value (car olist)
)))
-
(current-buffer
)))
+ (gnus-pp
+
`(setq ,(car olist
)
+
,(if (or (consp (setq sym (symbol-value (car olist)))
)
+
(and (symbolp sym
)
+
(not (or (eq sym nil
)
+
(eq sym t))
)))
+
(list 'quote (symbol-value (car olist
)))
+
(symbol-value (car olist)))
)))
(insert ";; (makeunbound '" (symbol-name (car olist)) ")\n"))
(setq olist (cdr olist)))
(insert "\n\n")
(insert ";; (makeunbound '" (symbol-name (car olist)) ")\n"))
(setq olist (cdr olist)))
(insert "\n\n")
@@
-1628,11
+1641,13
@@
this is a reply."
(concat "^" (regexp-quote mail-header-separator) "$")
nil t)
(replace-match "" t t ))
(concat "^" (regexp-quote mail-header-separator) "$")
nil t)
(replace-match "" t t ))
- (unless (setq group-art
- (gnus-request-accept-article group method t t))
+ (when (or (not (gnus-check-backend-function
+ 'request-accept-article group))
+ (not (setq group-art
+ (gnus-request-accept-article
+ group method t t))))
(gnus-message 1 "Couldn't store article in group %s: %s"
(gnus-message 1 "Couldn't store article in group %s: %s"
- group (gnus-status-message method))
- (sit-for 2))
+ group (gnus-status-message method)))
(when (and group-art
;; FIXME: Should gcc-mark-as-read work when
;; Gnus is not running?
(when (and group-art
;; FIXME: Should gcc-mark-as-read work when
;; Gnus is not running?
@@
-1921,4
+1936,5
@@
this is a reply."
(provide 'gnus-msg)
(provide 'gnus-msg)
+;;; arch-tag: 9f22b2f5-1c0a-49de-916e-4c88e984852b
;;; gnus-msg.el ends here
;;; gnus-msg.el ends here