From: teranisi Date: Tue, 20 Feb 2001 03:38:17 +0000 (+0000) Subject: Synch up with main trunk and so on. X-Git-Tag: wl-2_8-root^2~35 X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=e6081bf8243079e4b0aeb23f99cd894cbb9a202f;p=elisp%2Fwanderlust.git Synch up with main trunk and so on. --- diff --git a/doc/texinfo.tex b/doc/texinfo.tex index 3279528..5b405a6 100644 --- a/doc/texinfo.tex +++ b/doc/texinfo.tex @@ -3,7 +3,7 @@ % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2001-01-12.11} +\def\texinfoversion{2001-02-02.17} % % Copyright (C) 1985, 86, 88, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 2000 % Free Software Foundation, Inc. @@ -2908,16 +2908,17 @@ width0pt\relax} \fi % Now the real index entry with the fonts. \toks0 = {#2}% % - % If third (subentry) arg is present, add it to the index - % string. And include a space. + % If the third (subentry) arg is present, add it to the index + % line to write. \ifx\thirdarg\emptymacro \else - \toks0 = \expandafter{\the\toks0 \space #3}% + \toks0 = \expandafter{\the\toks0{#3}}% \fi % - % Set up the complete index entry, with both the sort key - % and the original text, including any font commands. We write - % three arguments to \entry to the .?? file, texindex reduces to - % two when writing the .??s sorted result. + % Set up the complete index entry, with both the sort key and + % the original text, including any font commands. We write + % three arguments to \entry to the .?? file (four in the + % subentry case), texindex reduces to two when writing the .??s + % sorted result. \edef\temp{% \write\csname#1indfile\endcsname{% \realbackslash entry{\indexsorttmp}{\folio}{\the\toks0}}% @@ -3139,11 +3140,18 @@ width0pt\relax} \fi \def\primary #1{\line{#1\hfil}} \newskip\secondaryindent \secondaryindent=0.5cm - -\def\secondary #1#2{ -{\parfillskip=0in \parskip=0in -\hangindent =1in \hangafter=1 -\noindent\hskip\secondaryindent\hbox{#1}\indexdotfill #2\par +\def\secondary#1#2{{% + \parfillskip=0in + \parskip=0in + \hangindent=1in + \hangafter=1 + \noindent\hskip\secondaryindent\hbox{#1}\indexdotfill + \ifpdf + \pdfgettoks#2.\ \the\toksA % The page number ends the paragraph. + \else + #2 + \fi + \par }} % Define two-column mode, which we use to typeset indexes. diff --git a/doc/wl-ja.texi b/doc/wl-ja.texi index 3ce5f45..a1d391e 100644 --- a/doc/wl-ja.texi +++ b/doc/wl-ja.texi @@ -277,7 +277,7 @@ APEL, FLIM, SEMI $B$N=g$K%$%s%9%H!<%k$7$F$/$@$5$$!#(B $B?d>)$5$l$k(B APEL, FLIM, SEMI $B$N%P!<%8%g%s$NAH9g$;$O!"0J2<$NDL$j$G$9!#(B @itemize @minus -@item APEL 10.2, FLIM 1.13.2, SEMI 1.13.7 +@item APEL 10.3, FLIM 1.14.2, SEMI 1.14.3 @end itemize $B$=$NB>!"(BFLIM, SEMI $B$K$O$$$m$$$m$JJQ7A%P!<%8%g%s$,B8:_$7$^$9$,!"(B @@ -4235,6 +4235,11 @@ Non-nil $B$J$i<+F0E*$KAw?.$7$^$9(B ($B$$$A$*$&(B @code{y-or-n-p} $B$G3NG'$7 Non-nil $B$J$i!"<+J,08$F$N%a!<%k$KJV?.$9$k>l9g!">o$K(B @samp{To:}, @samp{Cc:} $B$+$i<+J,$N%a!<%k%"%I%l%9$r:o=|$7$^$9!#(B +@item wl-draft-delete-myself-from-bcc-fcc +@vindex wl-draft-delete-myself-from-bcc-fcc +Non-nil $B$G!"(B@samp{To:}, @samp{Cc:} $B$,(B $BJQ?t(B @code{wl-subscribed-mailing-list} $B$K(B +$B4^$^$l$F$$$k>l9g!"(B@samp{Bcc:} , @samp{FCC:} $B$r$D$1$^$;$s!%(B + @item wl-smtp-posting-server @vindex wl-smtp-posting-server $B=i4|@_Dj$O(B @code{nil}$B!#(B @@ -6172,6 +6177,10 @@ face $B$N@_Dj$O(B @file{.emacs} $B$K=q$/$3$H$O$G$-$J$$$N$G(B @file{~/.wl} $ @node Draft for Reply, Thread Format, Advanced Settings, Advanced Settings @subsection $BJV;vMQ%I%i%U%H(B +@vindex wl-draft-reply-with-argument-list +@vindex wl-draft-reply-without-argument-list +@vindex wl-draft-reply-myself-with-argument-list +@vindex wl-draft-reply-myself-without-argument-list $B%a!<%j%s%0%j%9%H$N5-;v$KJV;v$r=q$/$H$-$O!"%5%^%j%b!<%I$G(B @kbd{a} $B$r2!$7(B $B$?$@$1$G855-;v$N(B @samp{Reply-To:} $B$K$"$k%"%I%l%9$r(B @samp{To:} $B$KMQ0U$7$F(B diff --git a/doc/wl.texi b/doc/wl.texi index 8597c97..5f123b7 100644 --- a/doc/wl.texi +++ b/doc/wl.texi @@ -250,7 +250,7 @@ install-package}.) Recommended combination of APEL, FLIM and SEMI are following: @itemize @minus -@item APEL 10.2, FLIM 1.13.2 and SEMI 1.13.7 +@item APEL 10.3, FLIM 1.14.2 and SEMI 1.14.3 @end itemize You can also use many other FLIM/SEMI variants. Combination of the @@ -4267,6 +4267,11 @@ All headers that match this regexp will be deleted when resending a message. If non-nil, always removes your own address from @samp{To:} and @samp{Cc:} when you are replying to the mail addressed to you. +@item wl-draft-delete-myself-from-bcc-fcc +@vindex wl-draft-delete-myself-from-bcc-fcc +If any of @code{wl-subscribed-mailing-list} are contained in @samp{To:} +or @samp{Cc:} field, do not insert @samp{Bcc:} or @samp{FCC:} field. + @item wl-smtp-posting-server @vindex wl-smtp-posting-server The initial setting is @code{nil}. @@ -6240,6 +6245,10 @@ Check mail arrival in this period. @node Draft for Reply, Thread Format, Advanced Settings, Advanced Settings @subsection Draft for Replay +@vindex wl-draft-reply-with-argument-list +@vindex wl-draft-reply-without-argument-list +@vindex wl-draft-reply-myself-with-argument-list +@vindex wl-draft-reply-myself-without-argument-list If you want, when you replying to articles in mailing lists, the address in Reply-To field of the original message to be prepared to To field of diff --git a/elmo/ChangeLog b/elmo/ChangeLog index ec4cce3..5f1bf1d 100644 --- a/elmo/ChangeLog +++ b/elmo/ChangeLog @@ -1,5 +1,37 @@ 2001-02-20 Yuuichi Teranishi + * Luna-fy Kenichi OKADA's following changes. + * elmo.el (elmo-folder-list-messages-internal): Added optional argument + `nohide'. + (elmo-folder-synchronize): Changed meaning of argument `ignore-msgdb'. + +2000-02-20 Kenichi OKADA + + * elmo-imap4.el (elmo-imap4-list-folder): Added 'uid' + +2000-02-19 Kenichi OKADA + + * elmo2.el (elmo-list-folder): Added optional argument `nohide'. + * elmo-imap4.el (elmo-imap4-list-folder): Added optional argument `nohide'. + * elmo-pop3.el (elmo-pop3-list-folder): Ditto. + * elmo-nntp.el (elmo-nntp-list-folder): Ditto. + * elmo-localdir.el (elmo-localdir-list-folder): Ditto. + * elmo-localnews.el (elmo-localnews-list-folder): Ditto. + * elmo-archive.el (elmo-archive-list-folder): Ditto. + * elmo-filter.el (elmo-filter-list-folder): Ditto. + * elmo-internal.el (elmo-internal-list-folder): Ditto. + * elmo-pipe.el (elmo-pipe-list-folder): Ditto. + * elmo-multi.el (elmo-multi-list-folder): Ditto. + * elmo-maildir.el (elmo-maildir-list-folder): Ditto. + * elmo-dop.el (elmo-dop-list-folder): Ditto. + +2000-02-17 Kenichi OKADA + + * elmo-msgdb.el (elmo-msgdb-max-of-killed): New function. + * elmo-imap4.el (elmo-imap4-list-folder): Use killed-list. + +2001-02-20 Yuuichi Teranishi + * elmo.el (elmo-folder-process-crosspost): New generic method. (elmo-folder-writable-p): Ditto. (elmo-folder-message-appendable-p): Eliminated. @@ -144,6 +176,10 @@ * elmo-cache.el: Rewrite. +2000-02-17 Kenichi OKADA + + * elmo-pop3.el (elmo-network-authenticate-session): Bind `sasl-mechanisms' + 2000-12-08 Yuuichi Teranishi * elmo-vars.el (elmo): New group. diff --git a/elmo/elmo-archive.el b/elmo/elmo-archive.el index 07760d9..99afe7a 100644 --- a/elmo/elmo-archive.el +++ b/elmo/elmo-archive.el @@ -317,7 +317,8 @@ TYPE specifies the archiver's symbol." (elmo-living-messages numbers killed)))) (luna-define-method elmo-folder-list-messages-internal ((folder - elmo-archive-folder)) + elmo-archive-folder) + &optional nohide) (elmo-archive-list-folder-subr folder)) (luna-define-method elmo-folder-status ((folder elmo-archive-folder)) diff --git a/elmo/elmo-dop.el b/elmo/elmo-dop.el index 64b7dbe..89f4503 100644 --- a/elmo/elmo-dop.el +++ b/elmo/elmo-dop.el @@ -290,32 +290,41 @@ even an operation concerns the unplugged folder." (save-match-data (elmo-dop-queue-append folder "prefetch-msgs" msgs))) -(defun elmo-dop-list-messages (folder) - (let* ((path (elmo-msgdb-expand-path folder)) - (number-alist (elmo-msgdb-number-load path)) - (number-list (mapcar 'car number-alist)) - (append-list (elmo-dop-append-list-load folder)) - (append-num (length append-list)) - alreadies - killed - max-num - (i 0)) - (setq killed (elmo-dop-list-deleted folder number-alist)) - (while append-list - (if (rassoc (car append-list) number-alist) - (setq alreadies (append alreadies - (list (car append-list))))) - (setq append-list (cdr append-list))) - (setq append-num (- append-num (length alreadies))) - (setq max-num - (or (nth (max (- (length number-list) 1) 0) - number-list) 0)) - (while (< i append-num) - (setq number-list - (append number-list - (list (+ max-num i 1)))) - (setq i (+ 1 i))) - (elmo-living-messages number-list killed))) +(defun elmo-dop-list-folder (folder &optional nohide) + (if (or (memq (elmo-folder-get-type folder) + '(imap4 nntp pop3 filter pipe)) + (and (elmo-multi-p folder) (not (elmo-folder-local-p folder)))) + (if elmo-enable-disconnected-operation + (let* ((path (elmo-msgdb-expand-path folder)) + (number-alist (elmo-msgdb-number-load path)) + (number-list (mapcar 'car number-alist)) + (append-list (elmo-dop-append-list-load folder)) + (append-num (length append-list)) + (killed (and elmo-use-killed-list + (elmo-msgdb-killed-list-load path))) + alreadies + max-num + (i 0)) + (setq killed (nconc (elmo-dop-list-deleted folder number-alist) + killed)) + (while append-list + (if (rassoc (car append-list) number-alist) + (setq alreadies (append alreadies + (list (car append-list))))) + (setq append-list (cdr append-list))) + (setq append-num (- append-num (length alreadies))) + (setq max-num + (or (nth (max (- (length number-list) 1) 0) + number-list) 0)) + (while (< i append-num) + (setq number-list + (append number-list + (list (+ max-num i 1)))) + (setq i (+ 1 i))) + (elmo-living-messages number-list killed)) + (error "Unplugged")) + ;; not imap4 folder...list folder + (elmo-call-func folder "list-folder"))) (defun elmo-dop-count-appended (folder) (length (elmo-dop-append-list-load folder))) diff --git a/elmo/elmo-filter.el b/elmo/elmo-filter.el index 0f321ad..9f161c4 100644 --- a/elmo/elmo-filter.el +++ b/elmo/elmo-filter.el @@ -109,7 +109,7 @@ (elmo-filter-folder-target-internal folder) numbers)) (luna-define-method elmo-folder-list-messages-internal - ((folder elmo-filter-folder)) + ((folder elmo-filter-folder) &optional nohide) (elmo-folder-search (elmo-filter-folder-target-internal folder) (elmo-filter-folder-condition-internal folder))) diff --git a/elmo/elmo-imap4.el b/elmo/elmo-imap4.el index 7bcfb0b..fbe723a 100644 --- a/elmo/elmo-imap4.el +++ b/elmo/elmo-imap4.el @@ -1846,8 +1846,15 @@ Return nil if no complete line has arrived." (elmo-imap4-response-value status 'messages))))) (luna-define-method elmo-folder-list-messages-plugged ((folder - elmo-imap4-folder)) - (elmo-imap4-list folder "all")) + elmo-imap4-folder) + &optional nohide) + (elmo-imap4-list folder + (let ((max (elmo-msgdb-max-of-killed + (elmo-folder-killed-list-internal folder)))) + (if (or nohide + (null (eq max 0))) + (format "uid %d:*" (1+ max)) + "all")))) (luna-define-method elmo-folder-list-unreads-plugged ((folder elmo-imap4-folder)) diff --git a/elmo/elmo-localdir.el b/elmo/elmo-localdir.el index f391dc8..15ced51 100644 --- a/elmo/elmo-localdir.el +++ b/elmo/elmo-localdir.el @@ -277,7 +277,7 @@ (buffer-string)))) (luna-define-method elmo-folder-list-messages-internal - ((folder elmo-localdir-folder)) + ((folder elmo-localdir-folder) &optional nohide) (elmo-localdir-list-subr folder)) (luna-define-method elmo-folder-status ((folder elmo-localdir-folder)) diff --git a/elmo/elmo-map.el b/elmo/elmo-map.el index e04ab2c..612e79c 100644 --- a/elmo/elmo-map.el +++ b/elmo/elmo-map.el @@ -237,7 +237,7 @@ (elmo-map-folder-list-message-locations folder))) (luna-define-method elmo-folder-list-messages-internal - ((folder elmo-map-folder)) + ((folder elmo-map-folder) &optional nohide) (mapcar 'car (elmo-map-folder-location-alist-internal folder))) (luna-define-method elmo-folder-unmark-important ((folder elmo-map-folder) diff --git a/elmo/elmo-msgdb.el b/elmo/elmo-msgdb.el index 9fc5e8f..c2a0e77 100644 --- a/elmo/elmo-msgdb.el +++ b/elmo/elmo-msgdb.el @@ -515,6 +515,20 @@ content of MSGDB is changed." (setq killed (cdr killed))) ret-val)) +(defun elmo-msgdb-max-of-killed (killed-list) + (let ((klist killed-list) + (max 0) + k) + (while (car klist) + (if (< max + (setq k + (if (consp (car klist)) + (cdar klist) + (car klist)))) + (setq max k)) + (setq klist (cdr klist))) + max)) + (defun elmo-living-messages (messages killed-list) (if killed-list (delq nil diff --git a/elmo/elmo-multi.el b/elmo/elmo-multi.el index fd8e6ad..0633392 100644 --- a/elmo/elmo-multi.el +++ b/elmo/elmo-multi.el @@ -418,7 +418,7 @@ all-importants)) (luna-define-method elmo-folder-list-messages-internal - ((folder elmo-multi-folder)) + ((folder elmo-multi-folder) &optional nohide) (let* ((flds (elmo-multi-folder-children-internal folder)) (cur-number 0) numbers) diff --git a/elmo/elmo-net.el b/elmo/elmo-net.el index b6d8593..6e49166 100644 --- a/elmo/elmo-net.el +++ b/elmo/elmo-net.el @@ -328,12 +328,12 @@ Returns a process object. if making session failed, returns nil." (error "Unplugged"))) (luna-define-method elmo-folder-list-messages-internal - ((folder elmo-net-folder)) - (elmo-net-folder-list-messages-internal folder)) + ((folder elmo-net-folder) &optional nohide) + (elmo-net-folder-list-messages-internal folder nohide)) -(defun elmo-net-folder-list-messages-internal (folder) +(defun elmo-net-folder-list-messages-internal (folder nohide) (if (elmo-folder-plugged-p folder) - (elmo-folder-send folder 'elmo-folder-list-messages-plugged) + (elmo-folder-send folder 'elmo-folder-list-messages-plugged nohide) (elmo-folder-send folder 'elmo-folder-list-messages-unplugged))) (luna-define-method elmo-folder-list-messages-plugged diff --git a/elmo/elmo-nntp.el b/elmo/elmo-nntp.el index 48f985c..3e9b69f 100644 --- a/elmo/elmo-nntp.el +++ b/elmo/elmo-nntp.el @@ -561,7 +561,8 @@ Don't cache if nil.") (read (current-buffer))))) (luna-define-method elmo-folder-list-messages-internal ((folder - elmo-nntp-folder)) + elmo-nntp-folder) + &optional nohide) (let ((session (elmo-nntp-get-session folder)) (group (elmo-nntp-folder-group-internal folder)) response numbers use-listgroup) diff --git a/elmo/elmo-pipe.el b/elmo/elmo-pipe.el index db4544d..3e63b39 100644 --- a/elmo/elmo-pipe.el +++ b/elmo/elmo-pipe.el @@ -115,9 +115,9 @@ (elmo-folder-close-internal(elmo-pipe-folder-dst-internal folder))) (luna-define-method elmo-folder-list-messages-internal - ((folder elmo-pipe-folder)) + ((folder elmo-pipe-folder) &optional nohide) (elmo-folder-list-messages-internal (elmo-pipe-folder-dst-internal - folder))) + folder) nohide)) (luna-define-method elmo-folder-list-unreads-internal ((folder elmo-pipe-folder) unread-marks &optional mark-alist) diff --git a/elmo/elmo-pop3.el b/elmo/elmo-pop3.el index d52f853..7ab3f6f 100644 --- a/elmo/elmo-pop3.el +++ b/elmo/elmo-pop3.el @@ -70,6 +70,7 @@ This is taken precedence over `elmo-network-stream-type-alist'.") "(Internal switch for using UIDL on POP3).") (defvar elmo-pop3-exists-exactly t) +(defvar sasl-mechanism-alist) ;;; ELMO POP3 folder (eval-and-compile @@ -296,6 +297,7 @@ This is taken precedence over `elmo-network-stream-type-alist'.") (auth (elmo-network-session-auth-internal session)) (auth (mapcar '(lambda (mechanism) (upcase (symbol-name mechanism))) (if (listp auth) auth (list auth)))) + sasl-mechanisms client name step response mechanism sasl-read-passphrase) (or (and (string= "USER" (car auth)) @@ -303,6 +305,8 @@ This is taken precedence over `elmo-network-stream-type-alist'.") (and (string= "APOP" (car auth)) (elmo-pop3-auth-apop session)) (progn + (require 'sasl) + (setq sasl-mechanisms (mapcar 'car sasl-mechanism-alist)) (setq mechanism (sasl-find-mechanism auth)) (unless mechanism (signal 'elmo-authenticate-error '(elmo-pop3-auth-no-mechanisms))) @@ -327,7 +331,7 @@ This is taken precedence over `elmo-network-stream-type-alist'.") process (concat "AUTH " name (and (sasl-step-data step) - (concat + (concat " " (elmo-base64-encode-string (sasl-step-data step) 'no-line-break))))) ;) @@ -536,7 +540,7 @@ This is taken precedence over `elmo-network-stream-type-alist'.") (elmo-pop3-list-by-list folder))) (luna-define-method elmo-folder-list-messages-internal - ((folder elmo-pop3-folder)) + ((folder elmo-pop3-folder) &optional nohide) (elmo-pop3-folder-list-messages folder)) (luna-define-method elmo-folder-status ((folder elmo-pop3-folder)) diff --git a/elmo/elmo.el b/elmo/elmo.el index 644f403..10fb1ba 100644 --- a/elmo/elmo.el +++ b/elmo/elmo.el @@ -182,9 +182,10 @@ Return value is a cons cell of NEWS and MESSAGES.") (luna-define-generic elmo-folder-status (folder) "Returns a cons cell of (MAX-NUMBER . MESSAGES) in the FOLDER.") -(defun elmo-folder-list-messages (folder) - "Return a list of message numbers contained in FOLDER." - (let ((list (elmo-folder-list-messages-internal folder)) +(defun elmo-folder-list-messages (folder &optional visible-only) + "Return a list of message numbers contained in FOLDER. +If optional VISIBLE-ONLY is non-nil, killed messages are not listed." + (let ((list (elmo-folder-list-messages-internal folder visible-only)) (killed (elmo-folder-killed-list-internal folder)) numbers) (setq numbers @@ -227,7 +228,8 @@ IMPORTANT-MARK is the important mark." (car x)))) (elmo-msgdb-get-mark-alist (elmo-folder-msgdb folder))))))) -(luna-define-generic elmo-folder-list-messages-internal (folder) +(luna-define-generic elmo-folder-list-messages-internal (folder &optional + visible-only) ;; Return a list of message numbers contained in FOLDER. ;; Return t if the message list is not available. ) @@ -1030,7 +1032,8 @@ NEW-MARK, UNREAD-CACHED-MARK, READ-UNCACHED-MARK, and IMPORTANT-MARK are mark strings for new messages, unread but cached messages, read but not cached messages, and important messages. If optional IGNORE-MSGDB is non-nil, current msgdb is thrown away except -read mark status. +read mark status. If IGNORE-MSGDB is 'visible-only, only visible messages +are thrown away and synchronized. Return a list of \(NEW-MSGDB DELETE-LIST CROSSED\) @@ -1057,7 +1060,8 @@ CROSSED is cross-posted message number." (concat important-mark read-uncached-mark)) seen-list)) ;; Make killed list as nil. - (elmo-folder-set-killed-list-internal folder nil) + (unless (eq ignore-msgdb 'visible-only) + (elmo-folder-set-killed-list-internal folder nil)) (elmo-folder-set-msgdb-internal folder (elmo-msgdb-clear)))) (elmo-folder-check folder) @@ -1066,7 +1070,9 @@ CROSSED is cross-posted message number." (message "Checking folder diff...") ;; TODO: killed list is loaded in elmo-folder-open and ;; list-messages use internal killed-list-folder. - (setq diff (elmo-list-diff (elmo-folder-list-messages folder) + (setq diff (elmo-list-diff (elmo-folder-list-messages + folder + (eq 'visible-only ignore-msgdb)) (unless ignore-msgdb (sort (mapcar 'car diff --git a/utils/ptexinfmt.el b/utils/ptexinfmt.el index a577d38..e98956e 100644 --- a/utils/ptexinfmt.el +++ b/utils/ptexinfmt.el @@ -3,7 +3,7 @@ ;; Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, ;; 1994, 1995, 1996, 1997 Free Software Foundation, Inc. ;; Copyright (C) 1999 Yoshiki Hayashi -;; Copyright (C) 2000 TAKAHASHI Kaoru +;; Copyright (C) 2000, 2001 TAKAHASHI Kaoru ;; Author: TAKAHASHI Kaoru ;; Yoshiki Hayashi @@ -38,8 +38,6 @@ (require 'poe) (require 'broken) -(provide 'ptexinfmt) - ;;; Broken (defvar ptexinfmt-disable-broken-notice-flag t "If non-nil disable notice, when call `broken-facility'. @@ -487,7 +485,8 @@ otherwise, insert URL-TITLE followed by URL in parentheses." ;; @image{FILENAME, [WIDTH], [HEIGHT]} (put 'image 'texinfo-format 'texinfo-format-image) (defun-maybe texinfo-format-image () - (let ((args (texinfo-format-parse-args)) ; parse FILENAME? + ;; I don't know makeinfo parse FILENAME. + (let ((args (texinfo-format-parse-args)) filename) (when (null (nth 0 args)) (error "Invalid image command")) @@ -758,4 +757,6 @@ This command is executed when texinfmt sees @item inside @multitable." (texinfo-sort-region opoint (point)) (shell-command-on-region opoint (point) "sort -fd" 1)))) +(provide 'ptexinfmt) + ;;; ptexinfmt.el ends here diff --git a/wl/ChangeLog b/wl/ChangeLog index 4932900..8c0579c 100644 --- a/wl/ChangeLog +++ b/wl/ChangeLog @@ -1,3 +1,8 @@ +2000-02-20 Yuuichi Teranishi + + * wl-summary.el (wl-summary-sync): Rename 'all-shown' to `all-visible'. + (wl-summary-input-range): Ditto. + 2001-02-20 Yuuichi Teranishi * wl-summary.el (wl-summary-edit-addresses): Use @@ -77,7 +82,43 @@ * wl-summary.el (wl-summary-save-view): Renamed from `wl-summary-save-status'. -2001-01-23 Yuuichi Teranishi +2000-02-20 Kenichi OKADA + + * wl-summary.el (wl-summary-sync): Added 'all-shown' + +2000-02-20 Kenichi OKADA + + * wl-summary.el (wl-summary-input-range): Added `all-shown' + +2000-02-19 Kenichi OKADA + + * wl-summary.el (wl-summary-sync-update3): Bind 'nohide as t if sync-all. + +2001-02-19 OKAZAKI Tetsurou + + * wl-highlight.el (wl-highlight-summary-line-string): Use + `zerop' instead of `= 0'. + (wl-highlight-summary): Use `zerop' instead of `eq 0'. + + * wl-template.el (wl-template-next): Use `=' instead of `eq' + for comparing numbers. + (wl-template-prev): Use `zerop' instead of `eq 0'. + + * wl-draft.el (wl-draft-insert-current-message): Use + `with-current-buffer' instead of `save-excursion'. + Use `zerop' instead of `eq 0'. + +2001-02-17 Kenichi OKADA + + * wl-draft.el (wl-draft-insert-ccs): New function. + (wl-draft): Use `wl-draft-insert-ccs' for Bcc and FCC. + * wl-vars.el (wl-draft-delete-myself-from-bcc-fcc): New variable. + +2001-02-15 Yuuichi Teranishi + + * wl-summary.el (wl-cache-prefetch-message): Fixed last change. + +2001-02-14 Yuuichi Teranishi * wl-expire.el (wl-expire-refile): Don't call elmo-msgdb-add-msgs-to-seen-list; diff --git a/wl/wl-draft.el b/wl/wl-draft.el index 62cd8b7..415e40b 100644 --- a/wl/wl-draft.el +++ b/wl/wl-draft.el @@ -546,9 +546,8 @@ Reply to author if WITH-ARG is non-nil." (with-current-buffer wl-draft-buffer-cur-summary-buffer (with-current-buffer wl-message-buffer (setq mail-reply-buffer (wl-message-get-original-buffer)))) - (if (eq 0 - (save-excursion - (set-buffer mail-reply-buffer) + (if (zerop + (with-current-buffer mail-reply-buffer (buffer-size))) (error "No current message") (wl-draft-yank-from-mail-reply-buffer @@ -1346,10 +1345,9 @@ If optional argument is non-nil, current draft buffer is killed" (setq wl-draft-buffer-file-name file-name) (if mail-default-reply-to (insert "Reply-To: " mail-default-reply-to "\n")) - (if (or wl-bcc mail-self-blind) - (insert "Bcc: " (or wl-bcc (user-login-name)) "\n")) - (if wl-fcc - (insert "FCC: " (if (functionp wl-fcc) (funcall wl-fcc) wl-fcc) "\n")) + (wl-draft-insert-ccs "Bcc: " (or wl-bcc + (and mail-self-blind (user-login-name)))) + (wl-draft-insert-ccs "FCC: " wl-fcc) (if wl-organization (insert "Organization: " wl-organization "\n")) (and wl-auto-insert-x-face @@ -1365,7 +1363,7 @@ If optional argument is non-nil, current draft buffer is killed" (when content-type (insert "Content-type: " content-type "\n")) (when content-transfer-encoding - (insert "Content-Transfer-encoding: " content-transfer-encoding "\n")) + (insert "Content-Transfer-Encoding: " content-transfer-encoding "\n")) (if (or content-type content-transfer-encoding) (insert "\n")) (and body (insert body)) @@ -1411,6 +1409,21 @@ If optional argument is non-nil, current draft buffer is killed" wl-summary-buffer-name))) buf-name)) +(defsubst wl-draft-insert-ccs (str cc) + (let ((field + (if (functionp cc) + (funcall cc) + cc))) + (if (and field + (null (and wl-draft-delete-myself-from-bcc-fcc + (elmo-list-member + (mapcar 'wl-address-header-extract-address + (append + (wl-parse-addresses (std11-field-body "To")) + (wl-parse-addresses (std11-field-body "Cc")))) + (mapcar 'downcase wl-subscribed-mailing-list))))) + (insert str field "\n")))) + (defun wl-draft-elmo-nntp-send () (let ((elmo-nntp-post-pre-hook wl-news-send-pre-hook) (elmo-default-nntp-user diff --git a/wl/wl-highlight.el b/wl/wl-highlight.el index c818ff7..4be1ac9 100644 --- a/wl/wl-highlight.el +++ b/wl/wl-highlight.el @@ -820,7 +820,7 @@ (setq fsymbol 'wl-highlight-summary-low-read-face)) ((string= temp-mark "+") (setq fsymbol 'wl-highlight-summary-high-read-face)) - (t (if (= 0 (length indent)) + (t (if (zerop (length indent)) (setq fsymbol 'wl-highlight-summary-thread-top-face) (setq fsymbol 'wl-highlight-summary-normal-face)))) (put-text-property 0 (length line) 'face fsymbol line)) @@ -1012,7 +1012,7 @@ interpreted as cited text.)" (when (> lines elmo-display-progress-threshold) (setq i (+ i 1)) (setq percent (/ (* i 100) lines)) - (if (or (eq (% percent 5) 0) (= i lines)) + (if (or (zerop (% percent 5)) (= i lines)) (elmo-display-progress 'wl-highlight-summary "Highlighting..." percent))) diff --git a/wl/wl-summary.el b/wl/wl-summary.el index 4408757..d24c7ed 100644 --- a/wl/wl-summary.el +++ b/wl/wl-summary.el @@ -1093,7 +1093,9 @@ Entering Folder mode calls the value of `wl-summary-mode-hook'." 'force-update nil nil t)) (t (wl-summary-sync-update unset-cursor - (string= range "all")))))) + (cond ((string= range "all") 'all) + ((string= range "all-visible") + 'visible-only))))))) (defvar wl-summary-edit-addresses-candidate-fields ;; First element becomes default. @@ -4423,7 +4425,7 @@ If ARG, exit virtual folder." "returns update or all or rescan." ;; for the case when parts are expanded in the bottom of the folder (let ((input-range-list '("update" "all" "rescan" "first:" "last:" - "rescan-noscore")) + "no-sync" "rescan-noscore" "all-visible")) (default (or (wl-get-assoc-list-value wl-folder-sync-range-alist folder) diff --git a/wl/wl-template.el b/wl/wl-template.el index 9874ce6..ca8a42d 100644 --- a/wl/wl-template.el +++ b/wl/wl-template.el @@ -144,15 +144,15 @@ ARG is ignored." ; ARG ignored this version (?) (defun wl-template-next () "Display next reference in other buffer." (interactive) - (if (eq wl-template-max-num - (setq wl-template-cur-num (1+ wl-template-cur-num))) + (if (= wl-template-max-num + (setq wl-template-cur-num (1+ wl-template-cur-num))) (setq wl-template-cur-num 0)) (wl-template-show)) (defun wl-template-prev () "Display previous reference in other buffer." (interactive) - (setq wl-template-cur-num (if (eq wl-template-cur-num 0) + (setq wl-template-cur-num (if (zerop wl-template-cur-num) (1- wl-template-max-num) (1- wl-template-cur-num))) (wl-template-show)) diff --git a/wl/wl-vars.el b/wl/wl-vars.el index 8e41c9b..9f39733 100644 --- a/wl/wl-vars.el +++ b/wl/wl-vars.el @@ -607,6 +607,12 @@ Default is for 'followup-to-me'." :type 'boolean :group 'wl-draft) +(defcustom wl-draft-delete-myself-from-bcc-fcc nil + "*Do not insert bcc or fcc if To and Cc fields is a member of +`wl-subscribed-mailing-list'" + :type 'boolean + :group 'wl-draft) + (defcustom wl-draft-resume-folder-window t "*Resume folder window in `wl-draft-hide'." :type 'boolean