8 files changed, 76 insertions, 40 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 83b5e3820e6..e210b4def7c 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,10 +1,42 @@
+2005-06-14  Juanma Barranquero  <lekktu@gmail.com>
+
+        * gnus-sieve.el (gnus-sieve-article-add-rule):
+        * legacy-gnus-agent.el (gnus-agent-unlist-expire-days):
+        * spam-stat.el (spam-stat-buffer-change-to-spam)
+        (spam-stat-buffer-change-to-non-spam): Follow error conventions.
+
+        * message.el (message-is-yours-p):
+        * gnus-sum.el (gnus-auto-select-subject): Fix quoting in docstring.
+
+2005-06-14  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * mm-view.el (mm-inline-text): Withdraw the last change.
+
+2005-06-09  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * mm-view.el (mm-inline-text): Turn off adaptive-fill-mode while
+        executing enriched-decode.
+
+2005-06-04  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * gnus-art.el (article-update-date-lapsed): Use `save-match-data'.
+
+2005-06-04  Lute Kamstra  <lute@gnu.org>
+
+        * nnfolder.el (nnfolder-read-folder): Make sure that undo
+        information is never recorded.
+
+2005-06-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * gnus-art.el (gnus-emphasis-alist): Disable the strikethru thingy.
+
 2005-06-02  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * pop3.el (pop3-md5): Run md5 in the binary mode.
         (pop3-md5-program-args): New variable.
 
-        * starttls.el (starttls-set-process-query-on-exit-flag): Use
-        eval-and-compile.
+        * starttls.el (starttls-set-process-query-on-exit-flag):
+        Use eval-and-compile.
 
 2005-05-31  Katsumi Yamaoka  <yamaoka@jpl.org>
 
@@ -29,8 +61,8 @@
 
         * mml2015.el: Bind pgg-default-user-id when compiling.
 
-        * nndraft.el (nndraft-request-associate-buffer): Use
-        write-contents-functions instead of write-contents-hooks if it is
+        * nndraft.el (nndraft-request-associate-buffer):
+        Use write-contents-functions instead of write-contents-hooks if it is
         available.
 
         * nnheader.el (nnheader-find-file-noselect): Bind find-file-hook
@@ -58,7 +90,7 @@
 
 2005-05-31  Kevin Greiner  <kgreiner@xpediantsolutions.com>
 
-        * gnus-group.el (): Require gnus-sum and autoload functions to
+        * gnus-group.el: Require gnus-sum and autoload functions to
         resolve warnings when gnus-group.el compiled alone.
 
 2005-05-30  Reiner Steib  <Reiner.Steib@gmx.de>
@@ -195,7 +227,7 @@
         (gnus-summary-high-unread-face): Ditto.
         (gnus-summary-low-unread-face): Ditto.
         (gnus-summary-normal-unread-face): Ditto.
-        (gnus-summary-high-read-face, gnus-summary-low-read-face): Diito
+        (gnus-summary-high-read-face, gnus-summary-low-read-face): Ditto.
         (gnus-summary-normal-read-face, gnus-splash-face): Ditto.
 
         * message.el (message-minibuffer-local-map): Add :group.
@@ -205,7 +237,7 @@
         (sieve-manage-server-eol, sieve-manage-client-eol): Ditto.
         (sieve-manage-streams, sieve-manage-stream-alist): Ditto.
         (sieve-manage-authenticators): Ditto.
-        (sieve-manage-authenticator-alist): Ditto
+        (sieve-manage-authenticator-alist): Ditto.
         (sieve-manage-default-port): Ditto.
 
         * sieve-mode.el (sieve-control-commands-face): Add :group.
@@ -438,11 +470,11 @@
 
         * nnimap.el (nnimap-date-days-ago): Ditto.
 
-        * gnus-demon.el (parse-time-string): Added autoload.
+        * gnus-demon.el (parse-time-string): Add autoload.
 
-        * gnus-delay.el (parse-time-string): Added autoload.
+        * gnus-delay.el (parse-time-string): Add autoload.
 
-        * gnus-art.el (parse-time-string): Added autoload.
+        * gnus-art.el (parse-time-string): Add autoload.
 
         * nnultimate.el (parse-time): Require for `parse-time-string'.
 
@@ -496,14 +528,13 @@
         (rfc2047-encoded-word-regexp): Don't use shy group.
         (rfc2047-decode-region): Follow rfc2047-encoded-word-regexp change.
         (rfc2047-parse-and-decode): Ditto.
-        (rfc2047-decode): Treat the ascii coding-system as raw-text by
-        default.
+        (rfc2047-decode): Treat the ascii coding-system as raw-text by default.
 
 2005-03-25  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * rfc2047.el (rfc2047-encode-encoded-words): New variable.
         (rfc2047-field-value): Strip props.
-        (rfc2047-encode-message-header): Disabled header folding -- not
+        (rfc2047-encode-message-header): Disable header folding -- not
         all headers can be folded, and this should be done by the message
         composition mode.  Probably.  I think.
         (rfc2047-encodable-p): Say that =? needs encoding.
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 4af363c6b2e..498596dd63c 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -367,8 +367,12 @@ advertisements.  For example:
                       (or (nth 4 spec) 3)
                       (intern (format "gnus-emphasis-%s" (nth 2 spec)))))
               types))
-     '(("\\(\\s-\\|^\\)\\(-\\(\\(\\w\\|-[^-]\\)+\\)-\\)\\(\\s-\\|[?!.,;]\\)"
-        2 3 gnus-emphasis-strikethru)
+     '(;; I've never seen anyone use this strikethru convention whereas I've
+       ;; several times seen it triggered by normal text.  --Stef
+       ;; Miles suggests that this form is sometimes used but for italics,
+       ;; so maybe we should map it to `italic'.
+       ;; ("\\(\\s-\\|^\\)\\(-\\(\\(\\w\\|-[^-]\\)+\\)-\\)\\(\\s-\\|[?!.,;]\\)"
+       ;; 2 3 gnus-emphasis-strikethru)
        ("\\(\\s-\\|^\\)\\(_\\(\\(\\w\\|_[^_]\\)+\\)_\\)\\(\\s-\\|[?!.,;]\\)"
         2 3 gnus-emphasis-underline))))
   "*Alist that says how to fontify certain phrases.
@@ -3034,20 +3038,21 @@ function and want to see what the date was before converting."
 
 (defun article-update-date-lapsed ()
   "Function to be run from a timer to update the lapsed time line."
-  (let (deactivate-mark)
-    (save-excursion
-      (ignore-errors
-        (walk-windows
-         (lambda (w)
-           (set-buffer (window-buffer w))
-           (when (eq major-mode 'gnus-article-mode)
-             (let ((mark (point-marker)))
-               (goto-char (point-min))
-               (when (re-search-forward "^X-Sent:" nil t)
-                 (article-date-lapsed t))
-               (goto-char (marker-position mark))
-               (move-marker mark nil))))
-         nil 'visible)))))
+  (save-match-data
+    (let (deactivate-mark)
+      (save-excursion
+        (ignore-errors
+         (walk-windows
+          (lambda (w)
+            (set-buffer (window-buffer w))
+            (when (eq major-mode 'gnus-article-mode)
+              (let ((mark (point-marker)))
+                (goto-char (point-min))
+                (when (re-search-forward "^X-Sent:" nil t)
+                  (article-date-lapsed t))
+                (goto-char (marker-position mark))
+                (move-marker mark nil))))
+          nil 'visible))))))
 
 (defun gnus-start-date-timer (&optional n)
   "Start a timer to update the X-Sent header in the article buffers.
diff --git a/lisp/gnus/gnus-sieve.el b/lisp/gnus/gnus-sieve.el
index e7409c39df0..db9c8c91f5d 100644
--- a/lisp/gnus/gnus-sieve.el
+++ b/lisp/gnus/gnus-sieve.el
@@ -129,7 +129,7 @@ Return nil if no rule could be guessed."
     (let ((rule (gnus-sieve-guess-rule-for-article))
           (info (gnus-get-info gnus-newsgroup-name)))
       (if (null rule)
-          (error "Could not guess rule for article.")
+          (error "Could not guess rule for article")
         (gnus-info-set-params info (cons rule (gnus-info-params info)))
         (message "Added rule in group %s for article: %s" gnus-newsgroup-name
                  rule)))))
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 8d4c536229b..5447da73fde 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -320,7 +320,7 @@ This variable can either be the symbols `first' (place point on the
 first subject), `unread' (place point on the subject line of the first
 unread article), `best' (place point on the subject line of the
 higest-scored article), `unseen' (place point on the subject line of
-the first unseen article), 'unseen-or-unread' (place point on the subject
+the first unseen article), `unseen-or-unread' (place point on the subject
 line of the first unseen article or, if all article have been seen, on the
 subject line of the first unread article), or a function to be called to
 place point on some subject line."
diff --git a/lisp/gnus/legacy-gnus-agent.el b/lisp/gnus/legacy-gnus-agent.el
index 16b0cf6c89f..50675b0ba27 100644
--- a/lisp/gnus/legacy-gnus-agent.el
+++ b/lisp/gnus/legacy-gnus-agent.el
@@ -25,7 +25,7 @@ converted to the compressed format."
               ((file-directory-p member)
                (push member search-in))
               ((equal (file-name-nondirectory member) ".agentview")
-               (setq converted-something 
+               (setq converted-something
                      (or (gnus-agent-convert-agentview member)
                          converted-something))))))
 
@@ -175,7 +175,7 @@ converted to the compressed format."
                                   (t
                                    t))))))
         (kill-buffer buffer))
-      (error "Change gnus-agent-expire-days to an integer for gnus to start."))))
+      (error "Change gnus-agent-expire-days to an integer for gnus to start"))))
 
 ;; The gnus-agent-unlist-expire-days has its own conversion prompt.
 ;; Therefore, hide the default prompt.
@@ -198,8 +198,8 @@ possible that the hook was persistently saved."
 
           (when (cond ((eq (type-of func) 'compiled-function)
                        ;; Search def. of compiled function for gnus-agent-do-once string
-                       (let* (definition 
-                               print-level 
+                       (let* (definition
+                               print-level
                                print-length
                                (standard-output
                                 (lambda (char)
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index eaac4e390a9..b65eec7ec12 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -5912,9 +5912,9 @@ want to get rid of this query permanently."))
 
 (defun message-is-yours-p ()
   "Non-nil means current article is yours.
-If you have added 'cancel-messages to 'message-shoot-gnksa-feet', all articles
+If you have added 'cancel-messages to `message-shoot-gnksa-feet', all articles
 are yours except those that have Cancel-Lock header not belonging to you.
-Instead of shooting GNKSA feet, you should modify 'message-alternative-emails'
+Instead of shooting GNKSA feet, you should modify `message-alternative-emails'
 regexp to match all of yours addresses."
   ;; Canlock-logic as suggested by Per Abrahamsen
   ;; <abraham@dina.kvl.dk>
diff --git a/lisp/gnus/nnfolder.el b/lisp/gnus/nnfolder.el
index 961f124a614..20cdb3da273 100644
--- a/lisp/gnus/nnfolder.el
+++ b/lisp/gnus/nnfolder.el
@@ -875,6 +875,7 @@ deleted.  Point is left where the deleted region was."
                          nnfolder-file-coding-system))
                     (nnheader-find-file-noselect file t)))))
     (mm-enable-multibyte) ;; Use multibyte buffer for future copying.
+    (buffer-disable-undo)
     (if (equal (cadr (assoc group nnfolder-scantime-alist))
                (nth 5 (file-attributes file)))
         ;; This looks up-to-date, so we don't do any scanning.
@@ -901,7 +902,6 @@ deleted.  Point is left where the deleted region was."
               maxid start end newscantime
               novbuf articles newnum
               buffer-read-only)
-          (buffer-disable-undo)
           (setq maxid (cdr active))
 
           (unless (or gnus-nov-is-evil nnfolder-nov-is-evil
diff --git a/lisp/gnus/spam-stat.el b/lisp/gnus/spam-stat.el
index ca1cdc6ce60..6af9b2e2b3f 100644
--- a/lisp/gnus/spam-stat.el
+++ b/lisp/gnus/spam-stat.el
@@ -370,7 +370,7 @@ Use `spam-stat-ngood', `spam-stat-nbad', `spam-stat-good',
    (lambda (word count)
      (let ((entry (gethash word spam-stat)))
        (if (not entry)
-           (error "This buffer has unknown words in it.")
+           (error "This buffer has unknown words in it")
          (spam-stat-set-good entry (- (spam-stat-good entry) count))
          (spam-stat-set-bad entry (+ (spam-stat-bad entry) count))
          (spam-stat-set-score entry (spam-stat-compute-score entry))
@@ -386,7 +386,7 @@ Use `spam-stat-ngood', `spam-stat-nbad', `spam-stat-good',
    (lambda (word count)
      (let ((entry (gethash word spam-stat)))
        (if (not entry)
-           (error "This buffer has unknown words in it.")
+           (error "This buffer has unknown words in it")
          (spam-stat-set-good entry (+ (spam-stat-good entry) count))
          (spam-stat-set-bad entry (- (spam-stat-bad entry) count))
          (spam-stat-set-score entry (spam-stat-compute-score entry))