From e280352de533701d890643bcc083667f2ad0331b Mon Sep 17 00:00:00 2001 From: ShengHuo ZHU Date: Fri, 7 Sep 2001 06:43:39 +0000 Subject: [PATCH] 2001-09-07 Raja R Harinath MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * nnml.el (nnml-filenames-are-evil): New variable. (nnml-article-to-file-alist): Rename to ... (nnml-current-group-article-to-file-alist): ... this. Respect `nnml-filenames-are-evil'. (nnml-active-number): Update. (nnml-update-file-alist): Update. (nnml-request-article): Use nnheader-article-to-file-alist. (nnml-request-rename-group): Likewise. 2001-09-06 Katsumi Yamaoka * gnus-sum.el (gnus-summary-insert-line): Fix. 2001-09-06 Bj,Av(Brn Torkelsson * gnus-sum.el: Bind g-s-t-s to "W g". * gnus-sum.el (gnus-summary-make-menu-bar): Add g-s-t-s. * gnus-sum.el (gnus-summary-toggle-smiley): New function. Toggles display of graphical smilies. 2001-09-07 02:00:00 ShengHuo ZHU * gnus-start.el (gnus-setup-news): A typo. From Bill White . --- lisp/ChangeLog | 27 +++++++++++++++++++++++++++ lisp/gnus-start.el | 16 ++++++++-------- lisp/gnus-sum.el | 17 ++++++++++++++--- lisp/nnml.el | 25 +++++++++++++++++-------- 4 files changed, 66 insertions(+), 19 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 94384ff24..374039c01 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,30 @@ +2001-09-07 Raja R Harinath + + * nnml.el (nnml-filenames-are-evil): New variable. + (nnml-article-to-file-alist): Rename to ... + (nnml-current-group-article-to-file-alist): ... this. + Respect `nnml-filenames-are-evil'. + (nnml-active-number): Update. + (nnml-update-file-alist): Update. + (nnml-request-article): Use nnheader-article-to-file-alist. + (nnml-request-rename-group): Likewise. + +2001-09-06 Katsumi Yamaoka + + * gnus-sum.el (gnus-summary-insert-line): Fix. + +2001-09-06 Bj,Av(Brn Torkelsson + + * gnus-sum.el: Bind g-s-t-s to "W g". + * gnus-sum.el (gnus-summary-make-menu-bar): Add g-s-t-s. + * gnus-sum.el (gnus-summary-toggle-smiley): New function. Toggles + display of graphical smilies. + +2001-09-07 02:00:00 ShengHuo ZHU + + * gnus-start.el (gnus-setup-news): A typo. + From Bill White . + 2001-09-06 Simon Josefsson * gnus-sum.el (gnus-summary-insert-line): Insert forwarded, recent diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el index 757d3515f..063acff85 100644 --- a/lisp/gnus-start.el +++ b/lisp/gnus-start.el @@ -902,14 +902,14 @@ If LEVEL is non-nil, the news will be set up at level LEVEL." (when gnus-message-archive-method (unless (assoc "archive" gnus-server-alist) (push `("archive" - (nnfolder - "archive" - (nnfolder-directory - ,(nnheader-concat message-directory "archive")) - (nnfolder-active-file - ,(nnheader-concat message-directory "archive/active")) - (nnfolder-get-new-mail nil) - (nnfolder-inhibit-expiry t))) + nnfolder + "archive" + (nnfolder-directory + ,(nnheader-concat message-directory "archive")) + (nnfolder-active-file + ,(nnheader-concat message-directory "archive/active")) + (nnfolder-get-new-mail nil) + (nnfolder-inhibit-expiry t)) gnus-server-alist))) ;; If we don't read the complete active file, we fill in the diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index e16d33c22..16e816513 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -1700,6 +1700,7 @@ increase the score of each group you read." "l" gnus-summary-stop-page-breaking "r" gnus-summary-caesar-message "t" gnus-summary-toggle-header + "g" gnus-summary-toggle-smiley "v" gnus-summary-verbose-headers "a" gnus-article-strip-headers-in-body ;; mnemonic: wash archive "p" gnus-article-verify-x-pgp-sig @@ -1894,6 +1895,7 @@ increase the score of each group you read." ["Stop page breaking" gnus-summary-stop-page-breaking t] ["Verbose header" gnus-summary-verbose-headers t] ["Toggle header" gnus-summary-toggle-header t] + ["Toggle smiley" gnus-summary-toggle-smiley t] ["Html" gnus-article-wash-html t] ["Verify X-PGP-Sig" gnus-article-verify-x-pgp-sig t] ["HZ" gnus-article-decode-HZ t]) @@ -2945,6 +2947,7 @@ buffer that was in action when the last article was fetched." ? ;Whitespace (if (< gnus-tmp-score gnus-summary-default-score) gnus-score-below-mark gnus-score-over-mark))) + (gnus-tmp-number (mail-header-number gnus-tmp-header)) (gnus-tmp-replied (cond (gnus-tmp-process gnus-process-mark) ((memq gnus-tmp-current gnus-newsgroup-cached) @@ -2954,9 +2957,9 @@ buffer that was in action when the last article was fetched." gnus-forwarded-mark) ((memq gnus-tmp-current gnus-newsgroup-saved) gnus-saved-mark) - ((memq number gnus-newsgroup-recent) + ((memq gnus-tmp-number gnus-newsgroup-recent) gnus-recent-mark) - ((memq number gnus-newsgroup-unseen) + ((memq gnus-tmp-number gnus-newsgroup-unseen) gnus-unseen-mark) (t gnus-no-mark))) (gnus-tmp-from (mail-header-from gnus-tmp-header)) @@ -2972,7 +2975,6 @@ buffer that was in action when the last article was fetched." (1+ (match-beginning 0)) (1- (match-end 0)))) (t gnus-tmp-from))) (gnus-tmp-subject (mail-header-subject gnus-tmp-header)) - (gnus-tmp-number (mail-header-number gnus-tmp-header)) (gnus-tmp-opening-bracket (if gnus-tmp-dummy ?\< ?\[)) (gnus-tmp-closing-bracket (if gnus-tmp-dummy ?\> ?\])) (buffer-read-only nil)) @@ -8602,6 +8604,15 @@ groups." (execute-kbd-macro (concat (this-command-keys) key)) (gnus-article-edit-done)) + +(defun gnus-summary-toggle-smiley (&optional arg) + "Toggle the display of smilies as small graphical icons." + (interactive "P") + (save-excursion + (set-buffer gnus-article-buffer) + (gnus-smiley-display arg) + )) + ;;; Respooling (defun gnus-summary-respool-query (&optional silent trace) diff --git a/lisp/nnml.el b/lisp/nnml.el index 97fab81d7..ffc38ebec 100644 --- a/lisp/nnml.el +++ b/lisp/nnml.el @@ -84,6 +84,13 @@ marks file will be regenerated properly by Gnus. This variable is a virtual server slot. See the Gnus manual for details.") +(defvoo nnml-filenames-are-evil t + "If non-nil, Gnus will not assume that the articles file name +is the same as the article number listed in the nov database. This +variable should be set if any of the files are compressed. + +This variable is a virtual server slot. See the Gnus manual for details.") + (defvoo nnml-prepare-save-mail-hook nil "Hook run narrowed to an article before saving. @@ -200,7 +207,7 @@ This variable is a virtual server slot. See the Gnus manual for details.") (when (and (setq group-num (nnml-find-group-number id)) (cdr (assq (cdr group-num) - (nnml-article-to-file-alist + (nnheader-article-to-file-alist (setq gpath (nnmail-group-pathname (car group-num) @@ -478,7 +485,7 @@ This variable is a virtual server slot. See the Gnus manual for details.") ;; We move the articles file by file instead of renaming ;; the directory -- there may be subgroups in this group. ;; One might be more clever, I guess. - (let ((files (nnml-article-to-file-alist old-dir))) + (let ((files (nnheader-article-to-file-alist old-dir))) (while files (rename-file (concat old-dir (cdar files)) @@ -672,7 +679,7 @@ This variable is a virtual server slot. See the Gnus manual for details.") (unless nnml-article-file-alist (setq nnml-article-file-alist (sort - (nnml-article-to-file-alist nnml-current-directory) + (nnml-current-group-article-to-file-alist) 'car-less-than-car))) (setq active (if nnml-article-file-alist @@ -867,7 +874,7 @@ This variable is a virtual server slot. See the Gnus manual for details.") (when (or (not nnml-article-file-alist) force) (setq nnml-article-file-alist - (nnml-article-to-file-alist nnml-current-directory)))) + (nnml-current-group-article-to-file-alist)))) (defun nnml-directory-articles (dir) "Return a list of all article files in a directory. @@ -891,10 +898,12 @@ Use the nov database for that directory if available." (forward-line 1)) list)))) -(defun nnml-article-to-file-alist (dir) - "Return an alist of article/file pairs in DIR. -Use the nov database for that directory if available." - (if (or gnus-nov-is-evil nnml-nov-is-evil +(defun nnml-current-group-article-to-file-alist () + "Return an alist of article/file pairs in the current group. +Use the nov database for the current group if available." + (if (or gnus-nov-is-evil + nnml-nov-is-evil + nnml-filenames-are-evil (not (file-exists-p (expand-file-name nnml-nov-file-name nnml-current-directory)))) -- 2.34.1