From 583d2fa169260abcff5d865ac5d4a2283b1eacf2 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Sun, 23 Feb 2003 09:36:43 +0000 Subject: [PATCH] Synch to Oort Gnus. --- lisp/ChangeLog | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ lisp/gnus-agent.el | 5 ++++- lisp/gnus-art.el | 39 +++++++++++++++++++-------------------- lisp/gnus-draft.el | 1 + lisp/gnus-start.el | 12 ++++++++++-- lisp/gnus-sum.el | 11 ++++------- lisp/gnus.el | 4 ++++ lisp/message.el | 3 +++ texi/ChangeLog | 8 ++++++++ texi/gnus-ja.texi | 9 +++++++++ texi/gnus.texi | 9 +++++++++ 11 files changed, 119 insertions(+), 30 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f77d660..be3b1b2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,53 @@ +2003-02-23 Jesper Harder + + * gnus-art.el (gnus-mime-button-commands): Add ellipsis. + (gnus-mime-button-menu): Define MIME popup menu with easy-menu to + display key bindings. + (gnus-mime-button-menu): Rewrite. + +2003-02-23 Lars Magne Ingebrigtsen + + * gnus-art.el (gnus-button-url-regexp): Removed `. + +2003-02-23 Max Froumentin + + * gnus-art.el (gnus-button-url-regexp): Remove `, enter '. + +2003-02-23 Lars Magne Ingebrigtsen + + * gnus-art.el (gnus-mime-action-on-part): Require a match + interactively. + + * gnus-start.el (gnus-save-newsrc-file): Use + gnus-backup-startup-file. + (gnus-backup-startup-file): New variable. + +2003-02-22 Lars Magne Ingebrigtsen + + * gnus.el (gnus-summary-buffer-name): Moved function here. + + * gnus-draft.el (defun): Remove debug. + +2003-02-22 Jesper Harder + + * gnus-sum.el (gnus-summary-refer-article): Skip method if we + can't open server. + +2003-02-22 Lars Magne Ingebrigtsen + + * gnus-draft.el (defun): Configure posting styles. + + * gnus-start.el (gnus-get-unread-articles-in-group): Make sure + the entry for the group exists before we alter it. + 2003-02-22 Kai Gro,A_(Bjohann + * message.el (message-mode): MML tags separate paragraphs. Small + change from David S Goldberg . + + * gnus-agent.el (gnus-agent-get-undownloaded-list): Sort + `gnus-newsgroup-headers'. + * gnus-art.el (gnus-article-refer-article): Grok more message id formats. From Karl Pfl,Ad(Bsterer . diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el index 513de03..c6a616d 100644 --- a/lisp/gnus-agent.el +++ b/lisp/gnus-agent.el @@ -771,7 +771,10 @@ article's mark is toggled." (let ((gnus-command-method (gnus-find-method-for-group gnus-newsgroup-name))) (when (set (make-local-variable 'gnus-newsgroup-agentized) (gnus-agent-method-p gnus-command-method)) (let* ((alist (gnus-agent-load-alist gnus-newsgroup-name)) - (headers gnus-newsgroup-headers) + (headers (sort + gnus-newsgroup-headers + (lambda (a b) + (< (mail-header-number a) (mail-header-number b))))) (undownloaded (list nil)) (tail-undownloaded undownloaded) (unfetched (list nil)) diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index ab53611..b311518 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -4074,7 +4074,7 @@ General format specifiers can also be used. See Info node (gnus-mime-view-part-externally "e" "View Externally") (gnus-mime-print-part "p" "Print") (gnus-mime-pipe-part "|" "Pipe To Command...") - (gnus-mime-action-on-part "." "Take action on the part"))) + (gnus-mime-action-on-part "." "Take action on the part..."))) (defun gnus-article-mime-part-status () (with-current-buffer gnus-article-buffer @@ -4099,21 +4099,20 @@ General format specifiers can also be used. See Info node (define-key map (cadr c) (car c))) map)) -(defun gnus-mime-button-menu (event) - "Construct a context-sensitive menu of MIME commands." - (interactive "e") - (save-window-excursion - (let ((pos (event-start event))) - (select-window (posn-window pos)) - (goto-char (posn-point pos)) - (gnus-article-check-buffer) - (let ((response (x-popup-menu - t `("MIME Part" - ("" ,@(mapcar (lambda (c) - (cons (caddr c) (car c))) - gnus-mime-button-commands)))))) - (if response - (call-interactively response)))))) +(easy-menu-define gnus-mime-button-menu gnus-mime-button-map "MIME button menu." + `("MIME Part" + ,@(mapcar (lambda (c) + (vector (caddr c) (car c) :enable t)) gnus-mime-button-commands))) + +(defun gnus-mime-button-menu (event prefix) + "Construct a context-sensitive menu of MIME commands." + (interactive "e\nP") + (save-window-excursion + (let ((pos (event-start event))) + (select-window (posn-window pos)) + (goto-char (posn-point pos)) + (gnus-article-check-buffer) + (popup-menu gnus-mime-button-menu nil prefix)))) (defun gnus-mime-view-all-parts (&optional handles) "View all the MIME parts." @@ -4430,9 +4429,9 @@ If no internal viewer is available, use an external viewer." (defun gnus-mime-action-on-part (&optional action) "Do something with the MIME attachment at \(point\)." (interactive - (list (completing-read "Action: " gnus-mime-action-alist))) + (list (completing-read "Action: " gnus-mime-action-alist nil t))) (gnus-article-check-buffer) - (let ((action-pair (assoc action gnus-mime-action-alist))) + (let ((action-pair (assoc action gnus-mime-action-alistq))) (if action-pair (funcall (cdr action-pair))))) @@ -5884,8 +5883,8 @@ after replacing with the original article." (defcustom gnus-button-url-regexp (if (string-match "[[:digit:]]" "1") ;; support POSIX? - "\\b\\(\\(www\\.\\|\\(s?https?\\|ftp\\|file\\|gopher\\|news\\|telnet\\|wais\\|mailto\\|info\\):\\)\\(//[-a-z0-9_.]+:[0-9]*\\)?[-a-z0-9_=!?#$@~`%&*+\\/:;.,[:word:]]+[-a-z0-9_=#$@~`%&*+\\/[:word:]]\\)" - "\\b\\(\\(www\\.\\|\\(s?https?\\|ftp\\|file\\|gopher\\|news\\|telnet\\|wais\\|mailto\\|info\\):\\)\\(//[-a-z0-9_.]+:[0-9]*\\)?\\([-a-z0-9_=!?#$@~`%&*+\\/:;.,]\\|\\w\\)+\\([-a-z0-9_=#$@~`%&*+\\/]\\|\\w\\)\\)") + "\\b\\(\\(www\\.\\|\\(s?https?\\|ftp\\|file\\|gopher\\|news\\|telnet\\|wais\\|mailto\\|info\\):\\)\\(//[-a-z0-9_.]+:[0-9]*\\)?[-a-z0-9_=!?#$@~%&*+\\/:;.,[:word:]]+[-a-z0-9_=#$@~%&*+\\/[:word:]]\\)" + "\\b\\(\\(www\\.\\|\\(s?https?\\|ftp\\|file\\|gopher\\|news\\|telnet\\|wais\\|mailto\\|info\\):\\)\\(//[-a-z0-9_.]+:[0-9]*\\)?\\([-a-z0-9_=!?#$@~%&*+\\/:;.,]\\|\\w\\)+\\([-a-z0-9_=#$@~%&*+\\/]\\|\\w\\)\\)") "Regular expression that matches URLs." :group 'gnus-article-buttons :type 'regexp) diff --git a/lisp/gnus-draft.el b/lisp/gnus-draft.el index 55b2fe8..265b4e3 100644 --- a/lisp/gnus-draft.el +++ b/lisp/gnus-draft.el @@ -248,6 +248,7 @@ (ignore-errors (setq ga (car (read-from-string ga))))) (setq gnus-newsgroup-name (if (equal (car ga) "") nil (car ga))) + (gnus-configure-posting-styles) (setq gnus-message-group-art (cons gnus-newsgroup-name (cadr ga))) (setq message-post-method `(lambda (arg) diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el index d007b35..657c0be 100644 --- a/lisp/gnus-start.el +++ b/lisp/gnus-start.el @@ -49,6 +49,13 @@ :group 'gnus-start :type '(choice directory (const nil))) +(defcustom gnus-backup-startup-file 'never + "Whether to create backup files. +This variable takes the same values as the `version-control' +variable." + :group 'gnus-start + :type 'boolean) + (defcustom gnus-init-file (nnheader-concat gnus-home-directory ".gnus") "Your Gnus Emacs-Lisp startup file name. If a file with the `.el' or `.elc' suffixes exists, it will be read instead." @@ -1578,7 +1585,8 @@ newsgroup." (setq range (cdr range))) (setq num (max 0 (- (cdr active) num))))) ;; Set the number of unread articles. - (when info + (when (and info + (gnus-gethash (gnus-info-group info) gnus-newsrc-hashtb)) (setcar (gnus-gethash (gnus-info-group info) gnus-newsrc-hashtb) num)) num))) @@ -2611,7 +2619,7 @@ If FORCE is non-nil, the .newsrc file is read." ;; Save .newsrc.eld. (set-buffer (gnus-get-buffer-create " *Gnus-newsrc*")) (make-local-variable 'version-control) - (setq version-control 'never) + (setq version-control gnus-backup-startup-file) (setq buffer-file-name (concat gnus-current-startup-file ".eld")) (setq default-directory (file-name-directory buffer-file-name)) diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index 636f4a7..6b8ac41 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -3027,10 +3027,6 @@ display only a single character." (point) (current-buffer)))))) -(defun gnus-summary-buffer-name (group) - "Return the summary buffer name of GROUP." - (concat "*Summary " (gnus-group-decoded-name group) "*")) - (defun gnus-summary-setup-buffer (group) "Initialize summary buffer." (let ((buffer (gnus-summary-buffer-name group)) @@ -8039,9 +8035,10 @@ of what's specified by the `gnus-refer-thread-limit' variable." ;; We fetch the article. (catch 'found (dolist (gnus-override-method (gnus-refer-article-methods)) - (gnus-check-server gnus-override-method) - ;; Fetch the header, and display the article. - (when (setq number (gnus-summary-insert-subject message-id)) + (when (and (gnus-check-server gnus-override-method) + ;; Fetch the header, + (setq number (gnus-summary-insert-subject message-id))) + ;; and display the article. (gnus-summary-select-article nil nil nil number) (throw 'found t))) (gnus-message 3 "Couldn't fetch article %s" message-id))))))) diff --git a/lisp/gnus.el b/lisp/gnus.el index 098634f..46c13dd 100644 --- a/lisp/gnus.el +++ b/lisp/gnus.el @@ -3237,6 +3237,10 @@ native." (substring group 0 (match-end 0)) "")) +(defun gnus-summary-buffer-name (group) + "Return the summary buffer name of GROUP." + (concat "*Summary " (gnus-group-decoded-name group) "*")) + (defun gnus-group-method (group) "Return the server or method used for selecting GROUP. You should probably use `gnus-find-method-for-group' instead." diff --git a/lisp/message.el b/lisp/message.el index e41148e..9a56341 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -2514,6 +2514,9 @@ M-RET `message-newline-and-reformat' (break the line and reformat)." (setq message-parameter-alist (copy-sequence message-startup-parameter-alist)) (message-setup-fill-variables) + (set (make-local-variable 'paragraph-separate) + (concat paragraph-separate + "\\|<#!*/?\\(multipart\\|part\\|external\\|mml\\|secure\\)")) ;; Allow using comment commands to add/remove quoting. (set (make-local-variable 'comment-start) message-yank-prefix) (if (featurep 'xemacs) diff --git a/texi/ChangeLog b/texi/ChangeLog index 8638cd8..0c08433 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,11 @@ +2003-02-23 Lars Magne Ingebrigtsen + + * gnus.texi (Startup Files): Addition. + +2003-02-22 Lars Magne Ingebrigtsen + + * gnus.texi (Mail Source Specifiers): Addition. + 2003-02-22 Jesper Harder * emacs-mime.texi (Files and Directories): New node. diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi index bc79e2c..a33e080 100644 --- a/texi/gnus-ja.texi +++ b/texi/gnus-ja.texi @@ -1582,9 +1582,14 @@ gnus $B$,$I$N%0%k!<%W$,?7$7$$$+$N5-O?$r;}$C$F$$$J$$$3$H$K$J$j$^$9$N$G!"?7(B $B$&!#(B @vindex gnus-startup-file +@vindex gnus-backup-startup-file +@vindex version-control $BJQ?t(B @code{gnus-startup-file} $B$O5/F0%U%!%$%k$,$I$3$K$"$k$+$r;XDj$7$^$9!#(B $B=i4|CM$O(B @file{~/.newsrc} $B$G!"$=$l$,$I$N$h$&$J$b$N$G$"$l!"KvHx(B $B$K(B @samp{.eld} $B$r$D$1$?$b$N$,(B gnus (El Dingo) $B$N5/F0%U%!%$%k$K$J$j$^$9!#(B +$B$3$N%U%!%$%k$N%P!<%8%g%s@)8f$r$7$?$$$H$-(B +$B$O(B @code{gnus-backup-startup-file} $B$r%;%C%H$7$F2<$5$$!#$=$l(B +$B$O(B @code{version-control} $BJQ?t$HF1$8CM$rA0$G$9!#=i4|CM$O(B @code{MAIL} $B4D6-JQ?t$NCM(B $B$+(B @code{rmail-spool-directory} $B$NCM(B ($BIaDL(B $B$O(B @file{usr-mail/spool/user-name} $B$N$h$&$J$b$N(B) $B$G$9!#(B + +@item :prescript +@itemx :postscript +$B%a!<%k$r