* gnus-sum.el (gnus-summary-show-article): Doc fix.

(gnus-summary-show-article): Guess at charset if required.

* gnus-spec.el (gnus-correct-substring): Stopped one character
before we wanted.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3c86888..086049c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2001-08-20 01:34:03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * gnus-sum.el (gnus-summary-show-article): Doc fix.
+       (gnus-summary-show-article): Guess at charset if required.
+
+       * gnus-spec.el (gnus-correct-substring): Stopped one character
+       before we wanted.
+
 2001-08-19  Pavel Jan\e,Bm\e(Bk  <Pavel@Janik.cz>
 
        * earcon.el (earcon-auto-play): Remove unused option.

diff --git a/lisp/gnus-spec.el b/lisp/gnus-spec.el
index 4be7ef3..b1d11ba 100644 (file)
--- a/lisp/gnus-spec.el
+++ b/lisp/gnus-spec.el
@@ -281,7 +281,7 @@
          wstart seek)
     ;; Find the end position.
     (while (and (< seek length)
-               (< wend end))
+               (<= wend end))
       (incf wend (gnus-char-width (aref string seek)))
       (incf seek))
     (setq wend seek)

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 7e464f4..c0747f0 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -7783,15 +7783,20 @@ to save in."
   "Force re-fetching of the current article.
 If ARG (the prefix) is a number, show the article with the charset
 defined in `gnus-summary-show-article-charset-alist', or the charset
-inputed.
+input.
 If ARG (the prefix) is non-nil and not a number, show the raw article
 without any article massaging functions being run."
   (interactive "P")
   (cond
    ((numberp arg)
+    (gnus-summary-show-article t)
     (let ((gnus-newsgroup-charset
           (or (cdr (assq arg gnus-summary-show-article-charset-alist))
-              (mm-read-coding-system "Charset: ")))
+              (mm-read-coding-system
+               "View as charset: "
+               (save-excursion
+                 (set-buffer gnus-article-buffer)
+                 (detect-coding-region (point) (point-max) t)))))
          (gnus-newsgroup-ignored-charsets 'gnus-all))
       (gnus-summary-select-article nil 'force)
       (let ((deps gnus-newsgroup-dependencies)
@@ -7813,9 +7818,8 @@ without any article massaging functions being run."
         header)
        (gnus-summary-update-article-line
         (cdr gnus-article-current) header)
-       (if (gnus-summary-goto-subject (cdr gnus-article-current) nil t)
-           (gnus-summary-update-secondary-mark
-            (cdr gnus-article-current))))))
+       (when (gnus-summary-goto-subject (cdr gnus-article-current) nil t)
+         (gnus-summary-update-secondary-mark (cdr gnus-article-current))))))
    ((not arg)
     ;; Select the article the normal way.
     (gnus-summary-select-article nil 'force))