From be72d42ef22bc759ee0a6442477f76703786c624 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Sat, 14 Sep 2002 04:06:31 +0000 Subject: [PATCH] Synch with Oort Gnus. --- lisp/ChangeLog | 23 +++++++++++++++++++---- lisp/gnus-art.el | 8 +++++--- lisp/gnus-msg.el | 10 ++++++---- lisp/gnus-sum.el | 20 ++++++++++++-------- lisp/mail-source.el | 7 ++++++- lisp/rfc2047.el | 11 +++++++---- 6 files changed, 55 insertions(+), 24 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e49bf1d..2855146 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,18 @@ +2002-09-13 ShengHuo ZHU + + * gnus-msg.el (gnus-copy-article-buffer): Bind mail-header-separator. + + * gnus-art.el (article-fill-long-lines): Fill-paragraph properly. + Trivial patch from Urban Engberg . + + * rfc2047.el (message-posting-charset): Defvar it. + (rfc2047-charset-encoding-alist): Use B for iso-8859-7 and + iso-8859-8. Fix doc. Suggested by Dave Love . + + * mail-source.el (mail-source-fetch): Hide password. + + * gnus-sum.el (gnus-summary-next-group): Semi-exit only when needed. + 2002-09-12 Katsumi Yamaoka From John Paul Wallington . @@ -403,7 +418,7 @@ * nnimap.el (nnimap-split-to-groups): Allow group string to be a function. From KANEMATSU Daiji . -2002-07-09 Nevin Kapur +2002-07-09 Nevin Kapur * gnus-sum.el (gnus-summary-delete-article): Respect group parameters while expiring. @@ -1290,7 +1305,7 @@ * gnus-util.el (gnus-extract-address-components): Don't break on names such as James "Kibo" Parry. From Francis Litterio - . + . 2002-03-13 Simon Josefsson @@ -1339,7 +1354,7 @@ (gnus-summary-save-parts-last-directory): Ditto. Trivial change from andre@slamdunknetworks.com -2002-03-09 Paul Jarc * gnus-start.el (gnus-auto-subscribed-groups): Include nnmaildir. @@ -7585,7 +7600,7 @@ * gnus-sum.el (gnus-summary-mark-article-as-replied): Make into a command. -2001-03-31 01:04:54 Francis Litterio +2001-03-31 01:04:54 Francis Litterio * message.el (message-set-auto-save-file-name): Don't use asterisks under nt. diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index 58008fe..b6b0584 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -1931,9 +1931,11 @@ unfolded." (while (not (eobp)) (end-of-line) (when (>= (current-column) (min fill-column width)) - (narrow-to-region (point) (gnus-point-at-bol)) - (fill-paragraph nil) - (goto-char (point-max)) + (narrow-to-region (min (1+ (point)) (point-max)) + (gnus-point-at-bol)) + (let ((goback (point-marker))) + (fill-paragraph nil) + (goto-char (marker-position goback))) (widen)) (forward-line 1))))))) diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el index 654abb9..f30e99a 100644 --- a/lisp/gnus-msg.el +++ b/lisp/gnus-msg.el @@ -892,12 +892,14 @@ header line with the old Message-ID." (goto-char (point-min)) (while (looking-at message-unix-mail-delimiter) (forward-line 1)) - (setq beg (point) - end (or (message-goto-body) beg)) + (let ((mail-header-separator "")) + (setq beg (point) + end (or (message-goto-body) beg))) ;; Delete the headers from the displayed articles. (set-buffer gnus-article-copy) - (delete-region (goto-char (point-min)) - (or (message-goto-body) (point-max))) + (let ((mail-header-separator "")) + (delete-region (goto-char (point-min)) + (or (message-goto-body) (point-max)))) ;; Insert the original article headers. (insert-buffer-substring gnus-original-article-buffer beg end) ;; Decode charsets. diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index 7e372f4..c513e7e 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -6554,10 +6554,6 @@ previous group instead." (let ((current-group gnus-newsgroup-name) (current-buffer (current-buffer)) entered) - ;; First we semi-exit this group to update Xrefs and all variables. - ;; We can't do a real exit, because the window conf must remain - ;; the same in case the user is prompted for info, and we don't - ;; want the window conf to change before that... (gnus-summary-exit t) (while (not entered) ;; Then we find what group we are supposed to enter. @@ -6583,10 +6579,18 @@ previous group instead." (let ((unreads (gnus-group-group-unread))) (if (and (or (eq t unreads) (and unreads (not (zerop unreads)))) - (gnus-summary-read-group - target-group nil no-article - (and (buffer-name current-buffer) current-buffer) - nil backward)) + (progn + ;; Now we semi-exit this group to update Xrefs + ;; and all variables. We can't do a real exit, + ;; because the window conf must remain the same + ;; in case the user is prompted for info, and we + ;; don't want the window conf to change before + ;; that... + (gnus-summary-exit t) + (gnus-summary-read-group + target-group nil no-article + (and (buffer-name current-buffer) current-buffer) + nil backward))) (setq entered t) (setq current-group target-group target-group nil))))))) diff --git a/lisp/mail-source.el b/lisp/mail-source.el index f598463..314aab7 100644 --- a/lisp/mail-source.el +++ b/lisp/mail-source.el @@ -467,7 +467,12 @@ Return the number of files that were found." (error (unless (yes-or-no-p (format "Mail source %s error (%s). Continue? " - source + (if (memq ':password source) + (let ((s (copy-sequence source))) + (setcar (cdr (memq ':password s)) + "********") + s) + source) (cadr err))) (error "Cannot get new mail")) 0))))))))) diff --git a/lisp/rfc2047.el b/lisp/rfc2047.el index 452be13..39b8d30 100644 --- a/lisp/rfc2047.el +++ b/lisp/rfc2047.el @@ -27,7 +27,9 @@ ;;; Code: -(eval-when-compile (require 'cl)) +(eval-when-compile + (require 'cl) + (defvar message-posting-charset)) (require 'qp) (require 'mm-util) @@ -65,8 +67,8 @@ The values can be: (iso-8859-4 . Q) (iso-8859-5 . B) (koi8-r . B) - (iso-8859-7 . Q) - (iso-8859-8 . Q) + (iso-8859-7 . B) + (iso-8859-8 . B) (iso-8859-9 . Q) (iso-8859-14 . Q) (iso-8859-15 . Q) @@ -81,7 +83,8 @@ The values can be: (iso-2022-jp-2 . B) (iso-2022-int-1 . B)) "Alist of MIME charsets to RFC2047 encodings. -Valid encodings are nil, `Q' and `B'.") +Valid encodings are nil, `Q' and `B'. These indicate binary (no) encoding, +quoted-printable and base64 respectively.") (defvar rfc2047-encoding-function-alist '((Q . rfc2047-q-encode-region) -- 1.7.10.4