From: yamaoka Date: Tue, 16 May 2000 07:30:58 +0000 (+0000) Subject: Sync with `t-gnus-6_14' X-Git-Tag: t-gnus-6_14-quimby-before-AC-changed-~69 X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=efad266229764ce6229df972c32de78a7d7be7da;p=elisp%2Fgnus.git- Sync with `t-gnus-6_14' ----------------------- * message.el (message-forward, message-indent-citation): Replace the use of `eolp' with `bolp' for detecting the start of the line. Sync with Gnus -------------- * gnus-uu.el (gnus-uu-save-article): Don't insert text/plain tag; don't insert digest header when forwarding. (gnus-uu-digest-mail-forward): Replace the use of `message-forward' with `message-mail' and `message-news'. (gnus-uu-digest-headers): Add User-Agent and X-Face. * gnus-sum.el (gnus-summary-post-menu): Replace the use of `gnus-summary-post-digest' and `gnus-summary-mail-digest' with `gnus-uu-digest-post-forward' and `gnus-uu-digest-mail-forward'. * gnus-msg.el (gnus-summary-post-digest, gnus-summary-mail-digest): Comment. (gnus-summary-send-map): Replace the use of `gnus-summary-post-digest' and `gnus-summary-mail-digest' with `gnus-uu-digest-post-forward' and `gnus-uu-digest-mail-forward'. --- diff --git a/ChangeLog b/ChangeLog index 059e3f5..4dd8a73 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2000-05-16 Katsumi Yamaoka + + * 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 * lisp/gnus-bbdb.el (gnus-bbdb/pop-up-bbdb-buffer): Don't bind diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el index e9118ae..4bd870f 100644 --- a/lisp/gnus-msg.el +++ b/lisp/gnus-msg.el @@ -209,8 +209,8 @@ Thank you for your help in stamping out bugs. "\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 @@ -750,36 +750,36 @@ If FULL-HEADERS (the prefix), include full headers when forwarding." (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." diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index 7b97651..9a303aa 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -1825,8 +1825,8 @@ increase the score of each group you read." ["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] diff --git a/lisp/gnus-uu.el b/lisp/gnus-uu.el index 02deb1e..45713bd 100644 --- a/lisp/gnus-uu.el +++ b/lisp/gnus-uu.el @@ -296,7 +296,7 @@ so I simply dropped them." '("^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 @@ -549,21 +549,19 @@ didn't work, and overwrite existing files. Otherwise, ask each time." (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) @@ -855,12 +853,8 @@ When called interactively, prompt for REGEXP." (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)))) diff --git a/lisp/message.el b/lisp/message.el index 9b90486..65cf5c7 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -2276,7 +2276,7 @@ However, if `message-yank-prefix' is non-nil, insert that prefix on each line." (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 "$")) @@ -4922,7 +4922,7 @@ Optional NEWS will use news to forward instead of mail." (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))