+2000-05-16 Katsumi Yamaoka <yamaoka@jpl.org>
+
+ * lisp/message.el (message-forward) Replace the use of `eolp' with
+ `bolp' for detecting the start of the line.
+ (message-indent-citation): Ditto.
+
2000-05-10 Daiki Ueno <ueno@unixuser.org>
* lisp/gnus-bbdb.el (gnus-bbdb/pop-up-bbdb-buffer): Don't bind
"\M-c" gnus-summary-mail-crosspost-complaint
"om" gnus-summary-mail-forward
"op" gnus-summary-post-forward
- "Om" gnus-summary-mail-digest
- "Op" gnus-summary-post-digest)
+ "Om" gnus-uu-digest-mail-forward
+ "Op" gnus-uu-digest-post-forward)
(gnus-define-keys (gnus-send-bounce-map "D" gnus-summary-send-map)
"b" gnus-summary-resend-bounced-mail
(if full-headers "" message-included-forward-headers)))
(message-forward post))))
-;;; XXX: generate Subject and ``Topics''?
-(defun gnus-summary-mail-digest (&optional n post)
- "Digests and forwards all articles in this series."
- (interactive "P")
- (let ((subject "Digested Articles")
- (articles (gnus-summary-work-articles n))
- article frame)
- (gnus-setup-message 'forward
- (gnus-summary-select-article)
- (if post (message-news nil subject) (message-mail nil subject))
- (when (and message-use-multi-frames (cdr articles))
- (setq frame (window-frame (get-buffer-window (current-buffer)))))
- (message-goto-body)
- (while (setq article (pop articles))
- (save-window-excursion
- (set-buffer gnus-summary-buffer)
- (gnus-summary-select-article nil nil nil article)
- (gnus-summary-remove-process-mark article))
- (when frame
- (select-frame frame))
- (insert (mime-make-tag "message" "rfc822") "\n")
- (insert-buffer-substring gnus-original-article-buffer))
- (push-mark)
- (message-goto-body)
- (mime-edit-enclose-digest-region (point)(mark t)))))
-
-(defun gnus-summary-post-digest (&optional n)
- "Digest and forwards all articles in this series to a newsgroup."
- (interactive "P")
- (gnus-summary-mail-digest n t))
+;;;;; XXX: generate Subject and ``Topics''?
+;;(defun gnus-summary-mail-digest (&optional n post)
+;; "Digests and forwards all articles in this series."
+;; (interactive "P")
+;; (let ((subject "Digested Articles")
+;; (articles (gnus-summary-work-articles n))
+;; article frame)
+;; (gnus-setup-message 'forward
+;; (gnus-summary-select-article)
+;; (if post (message-news nil subject) (message-mail nil subject))
+;; (when (and message-use-multi-frames (cdr articles))
+;; (setq frame (window-frame (get-buffer-window (current-buffer)))))
+;; (message-goto-body)
+;; (while (setq article (pop articles))
+;; (save-window-excursion
+;; (set-buffer gnus-summary-buffer)
+;; (gnus-summary-select-article nil nil nil article)
+;; (gnus-summary-remove-process-mark article))
+;; (when frame
+;; (select-frame frame))
+;; (insert (mime-make-tag "message" "rfc822") "\n")
+;; (insert-buffer-substring gnus-original-article-buffer))
+;; (push-mark)
+;; (message-goto-body)
+;; (mime-edit-enclose-digest-region (point)(mark t)))))
+;;
+;;(defun gnus-summary-post-digest (&optional n)
+;; "Digest and forwards all articles in this series to a newsgroup."
+;; (interactive "P")
+;; (gnus-summary-mail-digest n t))
(defun gnus-summary-resend-message (address n)
"Resend the current article to ADDRESS."
["Wide reply and yank" gnus-summary-wide-reply-with-original t]
["Mail forward" gnus-summary-mail-forward t]
["Post forward" gnus-summary-post-forward t]
- ["Digest and mail" gnus-summary-mail-digest t]
- ["Digest and post" gnus-summary-post-digest t]
+ ["Digest and mail" gnus-uu-digest-mail-forward t]
+ ["Digest and post" gnus-uu-digest-post-forward t]
["Resend message" gnus-summary-resend-message t]
["Send bounced mail" gnus-summary-resend-bounced-mail t]
["Send a mail" gnus-summary-mail-other-window t]
'("^Date:" "^From:" "^To:" "^Cc:" "^Subject:" "^Message-ID:" "^Keywords:"
"^Summary:" "^References:" "^Content-Type:" "^Content-Transfer-Encoding:"
"^MIME-Version:" "^Content-Disposition:" "^Content-Description:"
- "^Content-ID:")
+ "^Content-ID:" "^User-Agent:" "^X-Face:")
"*List of regexps to match headers included in digested messages.
The headers will be included in the sequence they are matched."
:group 'gnus-extract
(if (gnus-news-group-p gnus-newsgroup-name)
gnus-newsgroup-name
"Various"))))
- (goto-char (point-min))
- (when (re-search-forward "^Subject: ")
- (delete-region (point) (gnus-point-at-eol))
- (insert subject))
- (goto-char (point-min))
- (when (re-search-forward "^From: ")
- (delete-region (point) (gnus-point-at-eol))
- (insert from))
- (message-forward post)
- (save-excursion
- (message-goto-body)
- (delete-region (point)
- (progn
- (search-forward "\nTopics:\n")
- (1+ (match-beginning 0))))))
+ (mime-edit-enclose-digest-region (point-min) (point-max))
+ (if post
+ (message-news nil (concat "[" from "] " subject))
+ (message-mail nil (concat "[" from "] " subject)))
+ (message-goto-body)
+ ;; Make sure we're at the start of the line.
+ (unless (bolp)
+ (insert "\n"))
+ ;; Insert the forwarded buffer.
+ (insert-buffer gnus-uu-digest-buffer)
+ (kill-buffer gnus-uu-digest-buffer)
+ (set-text-properties (point-min) (point-max) nil)
+ (message-position-point))
(setq gnus-uu-digest-from-subject nil)))
(defun gnus-uu-digest-post-forward (&optional n)
(save-excursion
(set-buffer (gnus-get-buffer-create "*gnus-uu-pre*"))
(erase-buffer)
- (insert (format "From: %s\nSubject: %s Digest\n\n" name name))
- (when gnus-uu-digest-buffer
- ;; The default part in multipart/digest is message/rfc822.
- ;; Subject is a fake head.
- (let (mime-content-types)
- (mime-edit-insert-tag "text" "plain")))
+ (unless gnus-uu-digest-buffer
+ (insert (format "From: %s\nSubject: %s Digest\n\n" name name)))
(insert "Topics:\n")))
(when (not (eq in-state 'end))
(setq state (list 'middle))))
(message-delete-line))
;; Delete blank lines at the end of the buffer.
(goto-char (point-max))
- (unless (eolp)
+ (unless (bolp)
(insert "\n"))
(while (and (zerop (forward-line -1))
(looking-at "$"))
(message-goto-body)
(goto-char (point-max)))
;; Make sure we're at the start of the line.
- (unless (eolp)
+ (unless (bolp)
(insert "\n"))
;; Narrow to the area we are to insert.
(narrow-to-region (point) (point))
projects / elisp / gnus.git- / commitdiff