Revision: miles@gnu.org--gnu-2005/gnus--devo--0--patch-133

Merge from gnus--rel--5.10

Patches applied:

 * emacs--cvs-trunk--0  (patch 336, 339, 345, 348, 350-351)

   - Merge from gnus--rel--5.10
   - Update from CVS

 * gnus--rel--5.10  (patch 80)

   - Merge from emacs--cvs-trunk--0

2005-06-04  Luc Teirlinck  <teirllm@auburn.edu>

   * lisp/gnus-art.el (article-update-date-lapsed): Use `save-match-data'.

2005-06-04  Lute Kamstra  <lute@gnu.org>

   * lisp/nnfolder.el (nnfolder-read-folder): Make sure that undo
   information is never recorded.

2005-06-03  Stefan Monnier  <monnier@iro.umontreal.ca>

   * lisp/gnus-art.el (gnus-emphasis-alist): Disable the strikethru thingy.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 73630b3..35b2475 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,9 +1,22 @@
+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-apop): Run md5 in the binary mode.
 
-       * 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  Simon Josefsson  <jas@extundo.com>
 
@@ -33,8 +46,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
@@ -204,7 +217,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.
 
        * hashcash.el (hashcash): New custom group.
@@ -226,7 +239,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.
@@ -418,11 +431,11 @@
        * nnimap.el (nnimap-date-days-ago): Add defvars in order to
        silence the byte compiler inside the defun
 
-       * 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'.
 

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 0460a3e..7896898 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -373,7 +373,13 @@ advertisements.  For example:
                      (or (nth 4 spec) 3)
                      (intern (format "gnus-emphasis-%s" (nth 2 spec)))))
              types))
-     '(("\\(\\s-\\|^\\)\\(_\\(\\(\\w\\|_[^_]\\)+\\)_\\)\\(\\s-\\|[?!.,;]\\)"
+     '(;; 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.
 Each item looks like this:
@@ -3073,20 +3079,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/nnfolder.el b/lisp/nnfolder.el
index b86a26b..f51edb1 100644 (file)
--- a/lisp/nnfolder.el
+++ b/lisp/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