From: teranisi Date: Thu, 24 Oct 2002 13:55:59 +0000 (+0000) Subject: Synch up with main trunk. X-Git-Tag: elmo-mark-restart~104 X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d22d84ca4e3933dbd1319dbfd351b486aa3d063;p=elisp%2Fwanderlust.git Synch up with main trunk. --- diff --git a/INSTALL b/INSTALL index bf6353e..d370b7f 100644 --- a/INSTALL +++ b/INSTALL @@ -34,24 +34,24 @@ Select MIME Module (a) XEmacs 21.1 or later - APEL 10.3, FLIM 1.14.3, SEMI 1.14.3 + APEL 10.4, FLIM 1.14.4, SEMI 1.14.4 Installation as a XEmacs package, If possible. (b) Emacs 20.4 or later - APEL 10.3, FLIM 1.14.3, SEMI 1.14.3 + APEL 10.4, FLIM 1.14.4, SEMI 1.14.4 (c) Emacs 20.1 to 20.3 - APEL 10.3, CLIME 1.14.3, SEMI 1.14.3 + APEL 10.4, CLIME 1.14.5, SEMI 1.14.4 Use CLIME instead of FLIM. FLIM does not support Emacs 20.3 or earlier. (d) Emacs 19.34 (Mule 2.3) - APEL 10.3, CLIME 1.14.3, SEMI 1.14.3 + APEL 10.4, CLIME 1.14.5, SEMI 1.14.4 Mule based on Emacs 19.34 can also run SEMI. See the following web page to get more information (in Japanese). @@ -77,8 +77,8 @@ Install MIME Module latest versions should work. For example, the following combinations are confirmed to work: - APEL 10.3, SLIM 1.14.7, SEMI 1.14.3 - APEL 10.3, CLIME 1.14.3, EMIKO 1.14.1 + APEL 10.4, SLIM 1.14.9, SEMI 1.14.4 + APEL 10.4, CLIME 1.14.5, EMIKO 1.14.1 You have to re-install Wanderlust if you upgraded APEL, FLIM, or SEMI. diff --git a/INSTALL.ja b/INSTALL.ja index 2efe7f1..6fe544e 100644 --- a/INSTALL.ja +++ b/INSTALL.ja @@ -33,23 +33,23 @@ MIME用モジュールの選択 (a) XEmacs 21.1 以降 - APEL 10.3, FLIM 1.14.3, SEMI 1.14.3 + APEL 10.4, FLIM 1.14.4, SEMI 1.14.4 可能ならば XEmacs のパッケージとしてインストールすることをお勧めします。 (b) Emacs 20.4 以降 - APEL 10.3, FLIM 1.14.3, SEMI 1.14.3 + APEL 10.4, FLIM 1.14.4, SEMI 1.14.4 (c) Emacs 20.1～20.3 - APEL 10.3, CLIME 1.14.3, SEMI 1.14.3 + APEL 10.3, CLIME 1.14.5, SEMI 1.14.4 FLIM が動きませんので、代わりに CLIME をインストールしてください。 (d) Emacs 19.34 (Mule 2.3) - APEL 10.3, CLIME 1.14.3, SEMI 1.14.3 + APEL 10.3, CLIME 1.14.5, SEMI 1.14.4 Emacs 19.34 ベースの Mule では SEMI を動作させることが可能です。下記のページが参考になります。 @@ -79,8 +79,8 @@ MIME用モジュールのインストール例えば、以下の組合せの動作が確認されています。 - APEL 10.3, SLIM 1.14.7, SEMI 1.14.3 - APEL 10.3, CLIME 1.14.3, EMIKO 1.14.1 + APEL 10.4, SLIM 1.14.9, SEMI 1.14.4 + APEL 10.4, CLIME 1.14.5, EMIKO 1.14.1 APEL, FLIM, SEMI のバージョンアップを行った場合は、Wanderlust をインストールし直してください。 diff --git a/NEWS b/NEWS index f05ea91..2daad3b 100644 --- a/NEWS +++ b/NEWS @@ -42,6 +42,13 @@ Wanderlust NEWS -- User-visible changes in Wanderlust. ** You can send encapsulated blind carbon copies. Its default field name is "Ecc:". +** C-c C-y (Draft) can cite region of the message. + It affects if transient-mark-mode (Emacs) or zmacs-regions (XEmacs) is + Non-nil and the region is active. + +** You can delete a part from multipart message. + It is binded as "D" in message buffer. + ** You can easily configure server settings to post news article. Set wl-nntp-posting-config-alist appropriately. See info for an example. diff --git a/NEWS.ja b/NEWS.ja index 99efa99..712c824 100644 --- a/NEWS.ja +++ b/NEWS.ja @@ -44,6 +44,13 @@ Wanderlust NEWS (日本語版) -- User-visible changes in Wanderlust. ** カプセル化 Blind Carbon Copy を送れるようになりました。デフォルトのフィールド名は "Ecc:" です。 +** ドラフトの C-c C-y でリージョンを引用できるようになりました。 + transient-mark-mode (Emacs) もしくは zmacs-regions (XEmacs) + が Non-nil で、リージョンが有効のときに作用します。 + +** マルチパートのメッセージからパートを削除できるようになりました。 + メッセージバッファで "D" にバインドされています。 + ** ニュース記事を投稿するサーバを簡単に設定できるようになりました。 info の例に習って wl-nntp-posting-config-alist を設定して下さい。 diff --git a/doc/TODO b/doc/TODO index f51a770..a25feb2 100644 --- a/doc/TODO +++ b/doc/TODO @@ -16,4 +16,5 @@ ** organize optional setting for pipe folders to download messages at once when one checks new messages ** support for rfc2192, rfc2193, rfc2221 (managing imap referral) +** improve folder name completion for complex ones (multi,filter,pipe) ** putting codes in order diff --git a/doc/TODO.ja b/doc/TODO.ja index 312b77f..f47a14d 100644 --- a/doc/TODO.ja +++ b/doc/TODO.ja @@ -17,4 +17,5 @@ ** パイプフォルダに、新規メールチェック時にダウンロードまでやってしまうオプションを設ける ** rfc2192, rfc2193, rfc2221 (imap referral の処理) への対応 +** フォルダ名の補完をうまくやる(マルチ、フィルタ、パイプフォルダ) ** コードの整理 diff --git a/doc/wl-ja.texi b/doc/wl-ja.texi index 09e9926..877178e 100644 --- a/doc/wl-ja.texi +++ b/doc/wl-ja.texi @@ -4741,6 +4741,12 @@ Non-nil で、@samp{To:}, @samp{Cc:} が変数 @code{wl-subscribed 初期設定は @code{nil}。メール送信時の SMTP サーバ名です。 +@item wl-smtp-posting-port +@vindex wl-smtp-posting-port +初期設定は @code{nil}。 +メール送信時の SMTP ポート番号です。 +@code{nil} ならデフォルトの SMTP ポート番号(25)を使います。 + @item wl-smtp-posting-user @vindex wl-smtp-posting-user 初期設定は @code{nil}。 diff --git a/doc/wl.texi b/doc/wl.texi index 3d134d0..61e9cc1 100644 --- a/doc/wl.texi +++ b/doc/wl.texi @@ -530,7 +530,7 @@ This means it enables you to run Wanderlust as a default mail composer of Emacsen. It is effective only when your Emacs can define @code{mail-user-agent}. -@xref{Mail Methods, , ,emacs-ja, The Emacs Editor}. +@xref{Mail Methods, , ,emacs, The Emacs Editor}. @lisp @group @@ -4795,6 +4795,12 @@ or @samp{Cc:} field, do not insert @samp{Bcc:} or @samp{Fcc:} field. The initial setting is @code{nil}. This is the SMTP server name for mail transmission. +@item wl-smtp-posting-port +@vindex wl-smtp-posting-port +The initial setting is @code{nil}. +This is the SMTP port number for mail transmission. +If @code{nil}, default SMTP port number (25) is used. + @item wl-smtp-posting-user @vindex wl-smtp-posting-user The initial setting is @code{nil}. diff --git a/wl/ChangeLog b/wl/ChangeLog index 7993c63..84d61f2 100644 --- a/wl/ChangeLog +++ b/wl/ChangeLog @@ -1,3 +1,40 @@ +2002-10-24 Yuuichi Teranishi + + * wl-draft.el (wl-draft-highlight-and-recenter): Restore + buffer-modified status (Thanks to + Tomotaka SUWA ). + +2002-10-22 Yuuichi Teranishi + + * wl-util.el (wl-region-exists-p): New function. + + * wl-mime.el (wl-draft-yank-current-message-entity): Use it; + Remove defvars for byte-compile warnings. + +2002-10-22 Hiroya Murata + + * wl-mime.el (toplevel): Fixed last change; use defvar instead of + defvar-maybe. Removed unused bind. + +2002-10-21 Yoichi NAKAYAMA + + * wl-draft.el (wl-draft-forward): If wl-draft-use-frame, select + summary buffer window before creating new frame. + (wl-draft-reply): Ditto. + +2002-10-21 Hiroya Murata + + * wl-mime.el (toplevel): Avoid byte-compile warnings. + +2002-10-21 Yoichi NAKAYAMA + + * wl-mime.el (wl-draft-yank-current-message-entity): Fix logic. + +2002-10-18 Hiroya Murata + + * wl-mime.el (wl-message-delete-current-part): Use `delete-region' + instead of `kill-region'. + 2002-10-18 Yuuichi Teranishi * wl-highlight.el (wl-highlight-summary-answered-face): New face. diff --git a/wl/wl-draft.el b/wl/wl-draft.el index 8621bbe..c427022 100644 --- a/wl/wl-draft.el +++ b/wl/wl-draft.el @@ -298,6 +298,9 @@ e.g. references (wl-delete-duplicates references) references (when references (mapconcat 'identity references "\n\t")))) + (and wl-draft-use-frame + (get-buffer-window summary-buf) + (select-window (get-buffer-window summary-buf))) (wl-draft (list (cons 'To "") (cons 'Subject (concat wl-forward-subject-prefix original-subject)) @@ -464,6 +467,9 @@ Reply to author if WITH-ARG is non-nil." references (wl-delete-duplicates references) references (if references (mapconcat 'identity references "\n\t"))) + (and wl-draft-use-frame + (get-buffer-window summary-buf) + (select-window (get-buffer-window summary-buf))) (wl-draft (list (cons 'To to) (cons 'Cc cc) (cons 'Newsgroups newsgroups) @@ -671,31 +677,20 @@ Reply to author if WITH-ARG is non-nil." (defun wl-default-draft-cite () (let ((mail-yank-ignored-headers "[^:]+:") (mail-yank-prefix "> ") - (summary-buf wl-current-summary-buffer) - (message-buf (get-buffer (wl-current-message-buffer))) - from date cite-title num entity) - (if (and summary-buf - (buffer-live-p summary-buf) - message-buf - (buffer-live-p message-buf)) - (progn - (with-current-buffer summary-buf - (let ((elmo-mime-charset wl-summary-buffer-mime-charset)) - (setq num (save-excursion - (set-buffer message-buf) - wl-message-buffer-cur-number)) - (setq entity (elmo-msgdb-overview-get-entity - num (wl-summary-buffer-msgdb))) - (setq date (elmo-msgdb-overview-entity-get-date entity)) - (setq from (elmo-msgdb-overview-entity-get-from entity)))) - (setq cite-title (format "At %s,\n%s wrote:" - (or date "some time ago") - (if wl-default-draft-cite-decorate-author - (funcall wl-summary-from-function - (or from "you")) - (or from "you")))))) - (and cite-title - (insert cite-title "\n")) + date from cite-title) + (save-restriction + (if (< (mark t) (point)) + (exchange-point-and-mark)) + (narrow-to-region (point)(point-max)) + (setq date (std11-field-body "date") + from (std11-field-body "from"))) + (when (or date from) + (insert (format "At %s,\n%s wrote:\n" + (or date "some time ago") + (if wl-default-draft-cite-decorate-author + (funcall wl-summary-from-function + (or from "you")) + (or from "you"))))) (mail-indent-citation))) (defvar wl-draft-buffer nil "Draft buffer to yank content") @@ -712,6 +707,7 @@ Reply to author if WITH-ARG is non-nil." (if arg (let (buf mail-reply-buffer) (elmo-set-work-buf + (insert "\n") (yank) (setq buf (current-buffer))) (setq mail-reply-buffer buf) @@ -2311,11 +2307,13 @@ Automatically applied in draft sending time." (defun wl-draft-highlight-and-recenter (&optional n) (interactive "P") - (if wl-highlight-body-too - (let ((beg (point-min)) - (end (point-max))) - (put-text-property beg end 'face nil) - (wl-highlight-message beg end t))) + (when wl-highlight-body-too + (let ((modified (buffer-modified-p))) + (unwind-protect + (progn + (put-text-property (point-min) (point-max) 'face nil) + (wl-highlight-message (point-min) (point-max) t)) + (set-buffer-modified-p modified)))) (recenter n)) ;;;; user-agent support by Sen Nagata diff --git a/wl/wl-mime.el b/wl/wl-mime.el index 9d0c402..19e2fc0 100644 --- a/wl/wl-mime.el +++ b/wl/wl-mime.el @@ -34,14 +34,6 @@ (require 'mime-play) (require 'elmo) -(eval-when-compile - (defalias-maybe 'Meadow-version 'ignore)) - -(defvar xemacs-betaname) -(defvar xemacs-codename) -(defvar enable-multibyte-characters) -(defvar mule-version) - ;;; Draft (defalias 'wl-draft-editor-mode 'mime-edit-mode) @@ -68,11 +60,9 @@ has Non-nil value\)" (set-buffer (wl-current-message-buffer)) (save-restriction (widen) - (if (or (and wl-on-xemacs - zmacs-regions zmacs-region-active-p) - (and transient-mark-mode mark-active)) - (wl-mime-preview-follow-current-region) - (mime-preview-follow-current-entity))))))) + (if (wl-region-exists-p) + (wl-mime-preview-follow-current-region) + (mime-preview-follow-current-entity))))))) ;; modified mime-preview-follow-current-entity from mime-view.el (defun wl-mime-preview-follow-current-region () @@ -280,7 +270,7 @@ It calls following-method selected from variable (wl-mime-node-id-to-string node-id)))) (with-temp-buffer (insert-buffer orig-buf) - (kill-region header-start body-end) + (delete-region header-start body-end) (goto-char header-start) (insert "Content-Type: text/plain; charset=US-ASCII\n\n") (insert "** This part has been removed by Wanderlust **\n\n") diff --git a/wl/wl-util.el b/wl/wl-util.el index 259235a..0230b97 100644 --- a/wl/wl-util.el +++ b/wl/wl-util.el @@ -899,6 +899,12 @@ is enclosed by at least one regexp grouping construct." (defalias 'wl-expand-newtext 'elmo-expand-newtext) +(defun wl-region-exists-p () + "Return non-nil if a region exists on current buffer." + (static-if (featurep 'xemacs) + (and zmacs-regions zmacs-region-active-p) + (and transient-mark-mode mark-active))) + (defvar wl-line-string) (defun wl-line-parse-format (format spec-alist) "Make a formatter from FORMAT and SPEC-ALIST."