From feaa59000e5cd814c98e4d814d383a569d4cf804 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Mon, 4 Feb 2002 23:08:52 +0000 Subject: [PATCH] Synch with Oort Gnus. --- lisp/ChangeLog | 33 +++++++++++++++++++++++++++++++++ lisp/binhex.el | 4 ++-- lisp/gnus-art.el | 14 +++++++------- lisp/gnus-msg.el | 5 ++++- lisp/message.el | 2 ++ lisp/mm-url.el | 21 +++++++++++++++------ lisp/nnfolder.el | 3 ++- lisp/nnml.el | 3 ++- lisp/rfc2047.el | 1 + 9 files changed, 68 insertions(+), 18 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 564ee7b..51858fa 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,36 @@ +2002-02-04 ShengHuo ZHU + + * mm-url.el (mm-url-load-url): New function. + (mm-url-insert-file-contents): Use it. + + * gnus-msg.el (gnus-summary-mail-forward): Use gnus-article-charset. + + * message.el (message-forward-make-body): Correctly copy + forward-buffer. + + * rfc2047.el (rfc2047-decode-region): Don't decode us-ascii characters. + +2002-02-04 Simon Josefsson + + * gnus-art.el (gnus-article-followup-with-original): Mark with + force, prevent errors when following up from article buffer. + (gnus-article-reply-with-original): Ditto. + + * binhex.el (binhex-decoder-switches): Fix doc. From + Pavel@Janik.cz (Pavel Jan,Bm(Bk). + +2002-02-04 ShengHuo ZHU + + * gnus-art.el (gnus-treatment-function-alist): Move hide-citation, + highlight-citation after emphasize. + +2002-02-04 Simon Josefsson + + * nnfolder.el (nnfolder-open-marks): + + * nnml.el (nnml-open-marks): Message when done. From David + Edmondson . + 2002-02-03 ShengHuo ZHU * imap.el (imap-anonymous-auth): Fix typo. diff --git a/lisp/binhex.el b/lisp/binhex.el index 678b73f..8cdd747 100644 --- a/lisp/binhex.el +++ b/lisp/binhex.el @@ -1,5 +1,5 @@ ;;; binhex.el --- elisp native binhex decode -;; Copyright (c) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. +;; Copyright (c) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. ;; Author: Shenghuo Zhu ;; Keywords: binhex news @@ -43,7 +43,7 @@ input and write the converted data to its standard output." :group 'gnus-extract) (defcustom binhex-decoder-switches '("-d") - "*List of command line flags passed to the command named by binhex-decoder-program." + "*List of command line flags passed to the command `binhex-decoder-program'." :group 'gnus-extract :type '(repeat string)) diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index 8d8b323..41a2e88 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -1325,8 +1325,6 @@ It is a string, such as \"PGP\". If nil, ask user." (gnus-treat-hide-headers gnus-article-maybe-hide-headers) (gnus-treat-hide-boring-headers gnus-article-hide-boring-headers) (gnus-treat-hide-signature gnus-article-hide-signature) - (gnus-treat-hide-citation gnus-article-hide-citation) - (gnus-treat-hide-citation-maybe gnus-article-hide-citation-maybe) (gnus-treat-strip-list-identifiers gnus-article-hide-list-identifiers) (gnus-treat-leading-whitespace gnus-article-remove-leading-whitespace) (gnus-treat-strip-pgp gnus-article-hide-pgp) @@ -1335,7 +1333,6 @@ It is a string, such as \"PGP\". If nil, ask user." (gnus-treat-mail-picon gnus-treat-mail-picon) (gnus-treat-newsgroups-picon gnus-treat-newsgroups-picon) (gnus-treat-highlight-headers gnus-article-highlight-headers) - (gnus-treat-highlight-citation gnus-article-highlight-citation) (gnus-treat-highlight-signature gnus-article-highlight-signature) (gnus-treat-strip-trailing-blank-lines gnus-article-remove-trailing-blank-lines) @@ -1354,6 +1351,9 @@ It is a string, such as \"PGP\". If nil, ask user." (gnus-treat-display-smileys gnus-treat-smiley) (gnus-treat-capitalize-sentences gnus-article-capitalize-sentences) (gnus-treat-emphasize gnus-article-emphasize) + (gnus-treat-hide-citation gnus-article-hide-citation) + (gnus-treat-hide-citation-maybe gnus-article-hide-citation-maybe) + (gnus-treat-highlight-citation gnus-article-highlight-citation) (gnus-treat-body-boundary gnus-article-treat-body-boundary) (gnus-treat-play-sounds gnus-earcon-display))) @@ -5174,9 +5174,9 @@ The text in the region will be yanked. If the region isn't active, the entire article will be yanked." (interactive "P") (let ((article (cdr gnus-article-current)) cont) - (if (not (mark)) + (if (not (mark t)) (gnus-summary-reply (list (list article)) wide) - (setq cont (buffer-substring (point) (mark))) + (setq cont (buffer-substring (point) (mark t))) ;; Deactivate active regions. (when (and (boundp 'transient-mark-mode) transient-mark-mode) @@ -5191,9 +5191,9 @@ the entire article will be yanked." (interactive) (let ((article (cdr gnus-article-current)) cont) - (if (not (mark)) + (if (not (mark t)) (gnus-summary-followup (list (list article))) - (setq cont (buffer-substring (point) (mark))) + (setq cont (buffer-substring (point) (mark t))) ;; Deactivate active regions. (when (and (boundp 'transient-mark-mode) transient-mark-mode) diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el index 9dc4f01..130c814 100644 --- a/lisp/gnus-msg.el +++ b/lisp/gnus-msg.el @@ -1150,7 +1150,10 @@ The original article will be yanked." (defun gnus-summary-mail-forward (&optional full-headers post) "Forward the current message(s) to another user. If process marks exist, forward all marked messages; -If FULL-HEADERS (the prefix), include full headers when forwarding." +If FULL-HEADERS (the prefix), include full headers when forwarding. + +Note that this function definition for T-gnus is totally different +from the original Gnus." (interactive "P") (if (null (cdr (gnus-summary-work-articles nil))) (gnus-setup-message 'forward diff --git a/lisp/message.el b/lisp/message.el index 17ee1d6..4918d96 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -5723,6 +5723,8 @@ Optional NEWS will use news to forward instead of mail." (defun message-forward-make-body (forward-buffer) ;; Put point where we want it before inserting the forwarded ;; message. + ;; Note that this function definition for T-gnus is totally different + ;; from the original Gnus." (if message-forward-before-signature (message-goto-body) (goto-char (point-max))) diff --git a/lisp/mm-url.el b/lisp/mm-url.el index 74b4858..80d8789 100644 --- a/lisp/mm-url.el +++ b/lisp/mm-url.el @@ -34,8 +34,7 @@ (require 'mm-util) (eval-and-compile - (autoload 'exec-installed-p "path-util") - (autoload 'url-insert-file-contents "url-handlers")) + (autoload 'exec-installed-p "path-util")) (defgroup mm-url nil "A wrapper of url package and external url command for Gnus." @@ -43,7 +42,7 @@ (defcustom mm-url-use-external (not (condition-case nil - (require 'url-handlers) + (require 'url) (error nil))) "*If not-nil, use external grab program `mm-url-program'." :type 'boolean @@ -76,6 +75,9 @@ :type '(repeat string) :group 'mm-url) + +;;; Internal variables + ;; Stolen from w3. (defvar mm-url-html-entities '( @@ -249,12 +251,19 @@ "A list of characters that are _NOT_ reserved in the URL spec. This is taken from RFC 2396.") +(defun mm-url-load-url () + "Load `url-insert-file-contents'." + (condition-case () + (require 'url-handlers) + (error nil)) + (require 'url)) + (defun mm-url-insert-file-contents (url) (if mm-url-use-external (if (string-match "^file:/+" url) (insert-file-contents (substring url (1- (match-end 0)))) (mm-url-insert-file-contents-external url)) - (require 'url-handlers) + (mm-url-load-url) (let ((name buffer-file-name)) (prog1 (url-insert-file-contents url) @@ -347,7 +356,7 @@ spaces. Die Die Die." (defun mm-url-fetch-form (url pairs) "Fetch a form from URL with PAIRS as the data using the POST method." - (require 'url-handlers) + (mm-url-load-url) (let ((url-request-data (mm-url-encode-www-form-urlencoded pairs)) (url-request-method "POST") (url-request-extra-headers @@ -357,7 +366,7 @@ spaces. Die Die Die." t) (defun mm-url-fetch-simple (url content) - (require 'url-handlers) + (mm-url-load-url) (let ((url-request-data content) (url-request-method "POST") (url-request-extra-headers diff --git a/lisp/nnfolder.el b/lisp/nnfolder.el index eaef42d..617335c 100644 --- a/lisp/nnfolder.el +++ b/lisp/nnfolder.el @@ -1235,7 +1235,8 @@ This command does not work if you use short group names." (push (cons 'read (gnus-info-read info)) nnfolder-marks) (dolist (el gnus-article-unpropagated-mark-lists) (setq nnfolder-marks (gnus-remassoc el nnfolder-marks))) - (nnfolder-save-marks group server))))) + (nnfolder-save-marks group server) + (nnheader-message 7 "Bootstrapping marks for %s...done" group))))) (provide 'nnfolder) diff --git a/lisp/nnml.el b/lisp/nnml.el index 425b206..486da76 100644 --- a/lisp/nnml.el +++ b/lisp/nnml.el @@ -1018,7 +1018,8 @@ Use the nov database for the current group if available." (push (cons 'read (gnus-info-read info)) nnml-marks) (dolist (el gnus-article-unpropagated-mark-lists) (setq nnml-marks (gnus-remassoc el nnml-marks))) - (nnml-save-marks group server))))) + (nnml-save-marks group server) + (nnheader-message 7 "Bootstrapping marks for %s...done" group))))) (provide 'nnml) diff --git a/lisp/rfc2047.el b/lisp/rfc2047.el index 7814864..2d4a87a 100644 --- a/lisp/rfc2047.el +++ b/lisp/rfc2047.el @@ -522,6 +522,7 @@ The buffer may be narrowed." (delete-region (match-beginning 0) (match-end 0))))) (when (and (mm-multibyte-p) mail-parse-charset + (not (eq mail-parse-charset 'us-ascii)) (not (eq mail-parse-charset 'gnus-decoded))) (mm-decode-coding-region b e mail-parse-charset)) (setq b (point))) -- 1.7.10.4