From: morioka Date: Thu, 2 Jul 1998 09:36:15 +0000 (+0000) Subject: Merge gnus-6_7. X-Git-Tag: gnus-6_7_8~3 X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=a7b138a4c3d17eba86ac7487710dc9c00460a3da;p=elisp%2Fgnus.git- Merge gnus-6_7. --- diff --git a/lisp/gnus-salt.el b/lisp/gnus-salt.el index 0dbf148..c8280b2 100644 --- a/lisp/gnus-salt.el +++ b/lisp/gnus-salt.el @@ -58,7 +58,7 @@ :group 'gnus-summary-pick) (defcustom gnus-summary-pick-line-format - "-5P %U\%R\%z\%I\%(%[%4L: %-20,20n%]%) %s\n" + "%-5P %U\%R\%z\%I\%(%[%4L: %-20,20n%]%) %s\n" "*The format specification of the lines in pick buffers. It accepts the same format specs that `gnus-summary-line-format' does." :type 'string @@ -87,7 +87,6 @@ It accepts the same format specs that `gnus-summary-line-format' does." "E" gnus-uu-mark-by-regexp "b" gnus-uu-mark-buffer "B" gnus-uu-unmark-buffer - gnus-mouse-2 gnus-pick-mouse-pick "X" gnus-pick-start-reading )) diff --git a/lisp/gnus-spec.el b/lisp/gnus-spec.el index 4f3a103..23215fb 100644 --- a/lisp/gnus-spec.el +++ b/lisp/gnus-spec.el @@ -239,8 +239,7 @@ (defun gnus-face-face-function (form type) `(gnus-add-text-properties (point) (progn ,@form (point)) - (list 'gnus-face t - 'face ',(symbol-value (intern (format "gnus-face-%d" type)))))) + '(gnus-face t face ,(symbol-value (intern (format "gnus-face-%d" type)))))) (defun gnus-tilde-max-form (el max-width) "Return a form that limits EL to MAX-WIDTH." diff --git a/lisp/gnus-topic.el b/lisp/gnus-topic.el index 1f404ba..6880f63 100644 --- a/lisp/gnus-topic.el +++ b/lisp/gnus-topic.el @@ -1267,7 +1267,7 @@ If COPYP, copy the groups instead." (read-string (format "Rename %s to: " topic))))) ;; Check whether the new name exists. (when (gnus-topic-find-topology new-name) - (error "Topic '%s' already exists")) + (error "Topic '%s' already exists" new-name)) ;; "nil" is an invalid name, for reasons I'd rather not go ;; into here. Trust me. (when (equal new-name "nil") @@ -1281,7 +1281,8 @@ If COPYP, copy the groups instead." (setcar entry new-name)) (forward-line -1) (gnus-dribble-touch) - (gnus-group-list-groups))) + (gnus-group-list-groups) + (forward-line 1))) (defun gnus-topic-indent (&optional unindent) "Indent a topic -- make it a sub-topic of the previous topic. diff --git a/lisp/gnus.el b/lisp/gnus.el index f87290f..f7e0495 100644 --- a/lisp/gnus.el +++ b/lisp/gnus.el @@ -250,11 +250,11 @@ is restarted, and sometimes reloaded." :link '(custom-manual "(gnus)Exiting Gnus") :group 'gnus) -(defconst gnus-version-number "6.7.7" +(defconst gnus-version-number "6.7.8" "Version number for this version of gnus.") (defconst gnus-version - (format "Semi-gnus %s (based on Gnus 5.6.21; for SEMI 1.8)" + (format "Semi-gnus %s (based on Gnus 5.6.22; for SEMI 1.8/FLIM 1.7)" gnus-version-number) "Version string for this version of gnus.") diff --git a/lisp/nndoc.el b/lisp/nndoc.el index 0092ac0..c32f50f 100644 --- a/lisp/nndoc.el +++ b/lisp/nndoc.el @@ -30,6 +30,7 @@ (require 'message) (require 'nnmail) (require 'nnoo) +(require 'gnus-util) (eval-when-compile (require 'cl)) (nnoo-declare nndoc) diff --git a/lisp/pop3-fma.el b/lisp/pop3-fma.el index ddb1ef6..aa1a97f 100644 --- a/lisp/pop3-fma.el +++ b/lisp/pop3-fma.el @@ -3,7 +3,7 @@ ;; Yasuo Okabe ;; Author: Tatsuya Ichikawa ;; Yasuo OKABE -;; Version: 0.20 +;; Version: 0.21 ;; Keywords: mail , gnus , pop3 ;; ;; SPECIAL THANKS @@ -84,15 +84,14 @@ :group 'mail :group 'news) -(defconst pop3-fma-version-number "0.20") +(defconst pop3-fma-version-number "0.21") (defconst pop3-fma-codename ;; "Feel the wind" ; 0.10 ;; "My home town" ; 0.11 ;; "On the road" ; 0.12 ;; "Rock'n Roll city" ; 0.13 - "Money" ; 0.20 -;; "Midnight blue train" ; 0.xx -;; "Still 19" ; 0.xx +;; "Money" ; 0.20 + "Still 19" ; 0.21 ;; "J boy" ; 0.xx ;; "Blood line" ; 0.xx ;; "Star ring" ; 0.xx @@ -103,7 +102,7 @@ pop3-fma-codename)) (defcustom pop3-fma-spool-file-alist nil - "*Spoolfile to get mail using pop3 protocol. + "*Spool file to get mail using pop3 protocol. You should specify this variable like '( \"po:user1@mailhost1\" @@ -112,6 +111,11 @@ You should specify this variable like :group 'pop3-fma :type 'alist) +(defcustom pop3-fma-local-spool-file-alist nil + "*List of Local spool file to get mail." + :group 'pop3-fma + :type 'alist) + (defcustom pop3-fma-movemail-type 'lisp "*Type of movemail program. Lisp means `nnmail-movemail-program' is lisp function. @@ -139,6 +143,7 @@ Please do not set this valiable non-nil if you do not use Meadow.") (defvar passwd nil) (defvar str nil) (defvar pop3-fma-movemail-options pop3-fma-movemail-arguments) +(defvar spool nil) (defun pop3-fma-init-message-hook () (add-hook 'message-send-hook 'pop3-fma-message-add-header)) @@ -156,34 +161,44 @@ Please do not set this valiable non-nil if you do not use Meadow.") ;; (defun pop3-fma-movemail (inbox crashbox) "Function to move mail from INBOX on a pop3 server to file CRASHBOX." - (let ((pop3-maildrop - (substring inbox (match-end (string-match "^po:" inbox)) - (- (match-end (string-match "^.*@" inbox)) 1))) - (pop3-mailhost - (substring inbox (match-end (string-match "^.*@" inbox))))) - (let ((pop3-password - (pop3-fma-read-passwd pop3-mailhost))) - (message "Checking new mail user %s at %s..." pop3-maildrop pop3-mailhost) - (if (and (eq system-type 'windows-nt) - (eq pop3-fma-movemail-type 'exe)) - (progn - (setenv "MAILHOST" pop3-mailhost) - (if (and (not (memq pop3-password pop3-fma-movemail-arguments)) - (not (memq (concat "po:" pop3-maildrop) pop3-fma-movemail-arguments))) + (if (string-match "^po:" inbox) + (progn + (let ((pop3-maildrop + (substring inbox (match-end (string-match "^po:" inbox)) + (- (match-end (string-match "^.*@" inbox)) 1))) + (pop3-mailhost + (substring inbox (match-end (string-match "^.*@" inbox))))) + (let ((pop3-password + (pop3-fma-read-passwd pop3-mailhost))) + (message "Checking new mail user %s at %s..." pop3-maildrop pop3-mailhost) + (if (and (eq system-type 'windows-nt) + (eq pop3-fma-movemail-type 'exe)) (progn - (setq pop3-fma-movemail-arguments nil) - (setq pop3-fma-movemail-arguments - (append pop3-fma-movemail-options - (list - (concat "po:" pop3-maildrop) - crashbox - pop3-password))))) - (apply 'call-process (concat - exec-directory - pop3-fma-movemail-program) - nil nil nil - pop3-fma-movemail-arguments)) - (pop3-movemail crashbox))))) + (setenv "MAILHOST" pop3-mailhost) + (if (and (not (memq pop3-password pop3-fma-movemail-arguments)) + (not (memq (concat "po:" pop3-maildrop) pop3-fma-movemail-arguments))) + (progn + (setq pop3-fma-movemail-arguments nil) + (setq pop3-fma-movemail-arguments + (append pop3-fma-movemail-options + (list + (concat "po:" pop3-maildrop) + crashbox + pop3-password))))) + (apply 'call-process (concat + exec-directory + pop3-fma-movemail-program) + nil nil nil + pop3-fma-movemail-arguments)) + (pop3-movemail crashbox))))) + (message "Checking new mail at %s ... " inbox) + (call-process (concat exec-directory pop3-fma-movemail-program) + nil + nil + nil + inbox + crashbox) + (message "Checking new mail at %s ... done." inbox))) ;; ;; (defun pop3-fma-read-passwd (mailhost) @@ -223,7 +238,10 @@ Please do not set this valiable non-nil if you do not use Meadow.") (call-interactively 'pop3-fma-store-password))) pop3-fma-spool-file-alist) (setq nnmail-movemail-program 'pop3-fma-movemail) - (setq nnmail-spool-file pop3-fma-spool-file-alist)) +;; (setq nnmail-spool-file pop3-fma-spool-file-alist)) + (setq nnmail-spool-file (append + pop3-fma-local-spool-file-alist + pop3-fma-spool-file-alist))) ;; (defun pop3-fma-read-noecho (prompt &optional stars) "Read a single line of text from user without echoing, and return it.