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

[Tatsuya Kinoshita]

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

> なお、さらにmew-from関数内で、mew-config-alistがnilでもmew-nameが
> 効くよう、変更する必要があります。

b124へのパッチを作りました。

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

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

diff -cr mew/mew-config.el mew-tats20010529/mew-config.el
*** mew/mew-config.el	Tue May 29 18:58:27 2001
--- mew-tats20010529/mew-config.el	Tue May 29 23:36:42 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/mew-vars.el mew-tats20010529/mew-vars.el
*** mew/mew-vars.el	Tue May 29 18:58:28 2001
--- mew-tats20010529/mew-vars.el	Tue May 29 23:39:19 2001
***************
*** 320,326 ****
  ;;; 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
--- 320,326 ----
  ;;; Mail Addresses
  ;;;
  
! (defcustom mew-name nil
    "*Friendly name of e-mail address. 
  i.e. \"Friendly name <user at example.com>\"."
    :group 'mew-basic
***************
*** 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)))