From 07c2feeeee23a067a6eae9b77ba70a80eb6594a3 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Mon, 6 Jun 2005 05:58:44 +0000 Subject: [PATCH] Synch to No Gnus 200506060511. --- lisp/ChangeLog | 31 ++++++++++++++++++++++--------- lisp/gnus-art.el | 43 +++++++++++++++++++++++++------------------ lisp/nnfolder.el | 2 +- 3 files changed, 48 insertions(+), 28 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d01f200..5e58a07 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,9 +1,22 @@ +2005-06-04 Luc Teirlinck + + * gnus-art.el (article-update-date-lapsed): Use `save-match-data'. + +2005-06-04 Lute Kamstra + + * nnfolder.el (nnfolder-read-folder): Make sure that undo + information is never recorded. + +2005-06-03 Stefan Monnier + + * gnus-art.el (gnus-emphasis-alist): Disable the strikethru thingy. + 2005-06-02 Katsumi Yamaoka * 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 @@ -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 358b562..91435bd 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -405,7 +405,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: @@ -3213,23 +3219,24 @@ 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 (or (and (eq major-mode 'mime-view-mode) - (eq (mime-preview-original-major-mode) - 'gnus-original-article-mode)) - (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 (or (and (eq major-mode 'mime-view-mode) + (eq (mime-preview-original-major-mode) + 'gnus-original-article-mode)) + (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 69cd67b..7c277e1 100644 --- a/lisp/nnfolder.el +++ b/lisp/nnfolder.el @@ -876,6 +876,7 @@ deleted. Point is left where the deleted region was." nnfolder-file-coding-system)) (nnheader-find-file-noselect file t))))) (set-buffer-multibyte t) ;; 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. @@ -902,7 +903,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 -- 1.7.10.4