From 4363bb134166f8c6777bcf9e62a648a2bfd1fe5d Mon Sep 17 00:00:00 2001 From: yamaoka Date: Sat, 22 Mar 2003 02:02:19 +0000 Subject: [PATCH] Synch to Oort Gnus 200303220052. --- lisp/ChangeLog | 10 ++++++++++ lisp/gnus-art.el | 44 +++++++++++++++++++++++++------------------- texi/ChangeLog | 4 ++++ texi/gnus.texi | 2 +- 4 files changed, 40 insertions(+), 20 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3fa5e44..c1d6786 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,13 @@ +2003-03-21 Simon Josefsson + + * gnus-art.el (article-decode-group-name): Replace Newsgroups and + Followup-To data inline. + +2003-03-21 Jesper Harder + + * gnus-art.el (gnus-treat-display-xface): Don't enable if + icontopbm isn't available. + 2003-03-21 Kevin Greiner * gnus-int.el (gnus-open-server): Catch errors in backend's diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index 1f76669..4ffb284 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -1193,13 +1193,15 @@ See Info node `(gnus)Customizing Articles' for details." (defcustom gnus-treat-display-xface (and (not noninteractive) - (or (and (fboundp 'image-type-available-p) + (or (memq gnus-article-x-face-command + '(x-face-decode-message-header + x-face-mule-gnus-article-display-x-face)) + (and (fboundp 'image-type-available-p) (image-type-available-p 'xbm) - (string-match "^0x" (shell-command-to-string "uncompface"))) + (string-match "^0x" (shell-command-to-string "uncompface")) + (executable-find "icontopbm")) (and (featurep 'xemacs) - (featurep 'xface)) - (eq 'x-face-mule-gnus-article-display-x-face - gnus-article-x-face-command)) + (featurep 'xface))) 'head) "Display X-Face headers. Valid values are nil, t, `head', `last', an integer or a predicate. @@ -2249,20 +2251,24 @@ If PROMPT (the prefix), prompt for a coding system to use." (when (and (or gnus-group-name-charset-method-alist gnus-group-name-charset-group-alist) (gnus-buffer-live-p gnus-original-article-buffer)) - (when (nnmail-fetch-field "Newsgroups") - (nnheader-replace-header "Newsgroups" - (gnus-decode-newsgroups - (with-current-buffer - gnus-original-article-buffer - (nnmail-fetch-field "Newsgroups")) - gnus-newsgroup-name method))) - (when (nnmail-fetch-field "Followup-To") - (nnheader-replace-header "Followup-To" - (gnus-decode-newsgroups - (with-current-buffer - gnus-original-article-buffer - (nnmail-fetch-field "Followup-To")) - gnus-newsgroup-name method)))))) + (save-restriction + (goto-char (point-min)) + (article-narrow-to-head) + (while (re-search-forward (concat "^\\(Newsgroups\\|Followup-To\\): " + "\\(\\(.\\|\n[\t ]\\)*\\)\n[^\t ]") + nil t) + (replace-match (save-match-data + (gnus-decode-newsgroups + ;; XXX how to use data in this buffer? + (with-current-buffer gnus-original-article-buffer + (goto-char (point-min)) + (re-search-forward + (concat "^\\(Newsgroups\\|Followup-To\\): " + "\\(\\(.\\|\n[\t ]\\)*\\)\n[^\t ]") + nil t) + (match-string 2)) + gnus-newsgroup-name method)) + t t nil 2)))))) (autoload 'idna-to-unicode "idna") diff --git a/texi/ChangeLog b/texi/ChangeLog index 8020268..eeab814 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,7 @@ +2003-03-22 Simon Josefsson + + * gnus.texi (Troubleshooting): Fix typo. + 2003-03-19 Simon Josefsson * gnus.texi (Misc Article): Add. diff --git a/texi/gnus.texi b/texi/gnus.texi index 2f1ea2c..66a4ae4 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -24784,7 +24784,7 @@ evaluate expressions using @kbd{M-:} or inspect variables using @cindex slow Sometimes, a problem do not directly generate a elisp error but manifests itself by causing Gnus to be very slow. In these cases, you -can use @kbd{M-x toggle-debug-on-quit} and press @kbd{C-j} when things are +can use @kbd{M-x toggle-debug-on-quit} and press @kbd{C-g} when things are slow, and then try to analyze the backtrace (repeating the procedure helps isolating the real problem areas). A fancier approach is to use the elisp profiler, ELP. The profiler is (or should be) fully -- 1.7.10.4