[Mew-dist 17576] Re: auto-detect CT by X-Mailer (test).

[Tatsuya Kinoshita]

In message "[Mew-dist 17573] Re: auto-detect CT by X-Mailer (test)."
Tatsuya Kinoshita <tats at example.com> wrote:

> > なお、さらにmew-from関数内で、mew-config-alistがnilでもmew-nameが
> > 効くよう、変更する必要があります。
> 
> b124へのパッチを作りました。

defcustomのtypeを変更、さらに、mew-config-alistのキー項目を補足して、
パッチを作りなおしました。

-- 
木下達也
-------------- next part --------------

 This patch is written by Tatsuya Kinoshita.  Copyright is disclaimed.

diff -cr mew-1.95b124/info/mew.texi mew-1.95b124-tats20010530/info/mew.texi
*** mew-1.95b124/info/mew.texi	Tue May 29 19:19:14 2001
--- mew-1.95b124-tats20010530/info/mew.texi	Wed May 30 02:30:36 2001
***************
*** 7312,7318 ****
  "smtp-auth", "smtp-auth-list", "pop-server", "pop-port",
  "pop-ssh-server", "pop-user", "pop-auth", "pop-size", "pop-body-lines",
  "pop-delete", "mailbox-type", "mbox-command", "mbox-command-arg",
! "inbox-folder"
  @end example
  
  @ifset jp
--- 7312,7319 ----
  "smtp-auth", "smtp-auth-list", "pop-server", "pop-port",
  "pop-ssh-server", "pop-user", "pop-auth", "pop-size", "pop-body-lines",
  "pop-delete", "mailbox-type", "mbox-command", "mbox-command-arg",
! "inbox-folder", "queue-folder", "nntp-server", "signature-file",
! "content-type"
  @end example
  
  @ifset jp
diff -cr mew-1.95b124/mew-config.el mew-1.95b124-tats20010530/mew-config.el
*** mew-1.95b124/mew-config.el	Tue May 29 12:21:31 2001
--- mew-1.95b124-tats20010530/mew-config.el	Wed May 30 02:13:36 2001
***************
*** 86,92 ****
  ;;;
  
  (defun mew-name (&optional case)
!   (mew-cfent-value case "name" mew-name))
  
  (defun mew-user (&optional case)
    (mew-cfent-value case "user" mew-user))
--- 86,92 ----
  ;;;
  
  (defun mew-name (&optional case)
!   (mew-cfent-value case "name" (or mew-name (user-full-name))))
  
  (defun mew-user (&optional case)
    (mew-cfent-value case "user" mew-user))
***************
*** 99,105 ****
  
  ;; mew-from is really strange to maintain backword compatibility.
  (defun mew-from (&optional case)
!   (or (if mew-config-alist
  	  (let ((name (mew-name case))
  		(addr (mew-mail-address case)))
  	    (if (and name (string-match "[^ \t]" name))
--- 99,105 ----
  
  ;; mew-from is really strange to maintain backword compatibility.
  (defun mew-from (&optional case)
!   (or (if (or mew-config-alist mew-name)
  	  (let ((name (mew-name case))
  		(addr (mew-mail-address case)))
  	    (if (and name (string-match "[^ \t]" name))
diff -cr mew-1.95b124/mew-vars.el mew-1.95b124-tats20010530/mew-vars.el
*** mew-1.95b124/mew-vars.el	Tue May 29 12:21:32 2001
--- mew-1.95b124-tats20010530/mew-vars.el	Wed May 30 02:22:52 2001
***************
*** 320,330 ****
  ;;; Mail Addresses
  ;;;
  
! (defcustom mew-name (user-full-name)
    "*Friendly name of e-mail address. 
  i.e. \"Friendly name <user at example.com>\"."
    :group 'mew-basic
!   :type 'string)
  
  (defcustom mew-user (user-login-name)
    "*User part of e-mail address."
--- 320,330 ----
  ;;; Mail Addresses
  ;;;
  
! (defcustom mew-name nil
    "*Friendly name of e-mail address. 
  i.e. \"Friendly name <user at example.com>\"."
    :group 'mew-basic
!   :type '(choice string (const nil)))
  
  (defcustom mew-user (user-login-name)
    "*User part of e-mail address."
***************
*** 1147,1161 ****
    :group 'mew-draft
    :type '(choice string (const nil)))
  
! (defcustom mew-from nil
!   "*A value inserted into From: field in Draft mode if *non-nil*.
  See also 'mew-config-alist'."
    :group 'mew-draft
    :type '(choice string (const nil)))
  
! (defcustom mew-organization nil
!   "*A value inserted into Organization: field in Draft mode if *non-nil*.
! See also 'mew-config-alist'."
    :group 'mew-draft
    :type '(choice string (const nil)))
  
--- 1147,1162 ----
    :group 'mew-draft
    :type '(choice string (const nil)))
  
! (defcustom mew-organization nil
!   "*A value inserted into Organization: field in Draft mode if *non-nil*.
  See also 'mew-config-alist'."
    :group 'mew-draft
    :type '(choice string (const nil)))
  
! (defcustom mew-from nil
!   "*A value inserted into From: field in Draft mode if *non-nil*.
! For backward-compatibility. See also 'mew-name', 'mew-user', and
! 'mew-mail-domain'."
    :group 'mew-draft
    :type '(choice string (const nil)))
  
diff -cr mew-1.95b124/mew-vars2.el mew-1.95b124-tats20010530/mew-vars2.el
*** mew-1.95b124/mew-vars2.el	Tue May 29 12:21:32 2001
--- mew-1.95b124-tats20010530/mew-vars2.el	Wed May 30 02:30:29 2001
***************
*** 851,857 ****
  \"pop-size\", \"pop-body-lines\", \"pop-delete\", 
  \"inbox-folder\", \"queue-folder\",
  \"mailbox-type\", \"mbox-command\", \"mbox-command-arg\", 
! \"nntp-server\", \"signature-file\" .
  
  from = name <user at example.com>
  message-id = *random*.user at example.com
--- 851,857 ----
  \"pop-size\", \"pop-body-lines\", \"pop-delete\", 
  \"inbox-folder\", \"queue-folder\",
  \"mailbox-type\", \"mbox-command\", \"mbox-command-arg\", 
! \"nntp-server\", \"signature-file\", \"content-type\" .
  
  from = name <user at example.com>
  message-id = *random*.user at example.com