Re: [PATCH] emacs: Improve the definition and use of `notmuch-fcc-dirs'.

[Carl Worth]

On Mon,  8 Nov 2010 15:01:25 +, David Edmondson  wrote:
> Re-work the declaration and definition of `notmuch-fcc-dirs'. The
> variable now allows three types of values:

Thanks. This is pushed now.

> ---
> 
> Fix runtime cl use.

Hopefully I stalled long enough to get the latest version of this
one. ;-)

-Carl

-- 
carl.d.wo...@intel.com


pgpiPfNv5ls2B.pgp
Description: PGP signature
___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch

[PATCH] emacs: Improve the definition and use of `notmuch-fcc-dirs'.

[Carl Worth]

On Mon,  8 Nov 2010 15:01:25 +, David Edmondson  wrote:
> Re-work the declaration and definition of `notmuch-fcc-dirs'. The
> variable now allows three types of values:

Thanks. This is pushed now.

> ---
> 
> Fix runtime cl use.

Hopefully I stalled long enough to get the latest version of this
one. ;-)

-Carl

-- 
carl.d.worth at intel.com
-- next part --
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: 

[PATCH] emacs: Improve the definition and use of `notmuch-fcc-dirs'.

[David Edmondson]

Re-work the declaration and definition of `notmuch-fcc-dirs'. The
variable now allows three types of values:

- nil: no Fcc header is added,

- a string: the value of `notmuch-fcc-dirs' is the name of the
  folder to use,

- a list: the folder is chosen based on the From address of the
  current message using a list of regular expressions and
  corresponding folders:

 ((\"Sebastian at SSpaeth.de\" . \"privat\")
  (\"spaetz at sspaeth.de\" . \"OUTBOX.OSS\")
  (\".*\" . \"defaultinbox\"))

  If none of the regular expressions match the From address, no
  Fcc header will be added.
---

Fix runtime cl use.

 emacs/notmuch-maildir-fcc.el |  140 --
 1 files changed, 81 insertions(+), 59 deletions(-)

diff --git a/emacs/notmuch-maildir-fcc.el b/emacs/notmuch-maildir-fcc.el
index 693d8d4..e5e0549 100644
--- a/emacs/notmuch-maildir-fcc.el
+++ b/emacs/notmuch-maildir-fcc.el
@@ -16,6 +16,7 @@
 ;; To use this as the fcc handler for message-mode,
 ;; customize the notmuch-fcc-dirs variable

+(eval-when-compile (require 'cl))
 (require 'message)

 (require 'notmuch-lib)
@@ -23,41 +24,40 @@
 (defvar notmuch-maildir-fcc-count 0)

 (defcustom notmuch-fcc-dirs "sent"
- "Determines the maildir directory to save outgoing mails in.
+ "Determines the maildir directory in which to save outgoing mail.

- If set to non-nil, this will cause message mode to file your
- mail in the specified directory (fcc).
+Three types of values are permitted:

- It is either a string if you only need one fcc directory or a
- list if they depend on your From address (see example).
+- nil: no Fcc header is added,

- In the former case it is a string such as \"INBOX.Sent\".
+- a string: the value of `notmuch-fcc-dirs' is the name of the
+  folder to use,

- In the fancy setup, where you want different outboxes depending
- on your From address, you supply a list like this:
+- a list: the folder is chosen based on the From address of the
+  current message using a list of regular expressions and
+  corresponding folders:

- ((\"defaultinbox\")
-  (\"Sebastian Spaeth \" . \"privat\")
-  (\"Sebastian Spaeth \" . \"OUTBOX.OSS\")
- )
+ ((\"Sebastian at SSpaeth.de\" . \"privat\")
+  (\"spaetz at sspaeth.de\" . \"OUTBOX.OSS\")
+  (\".*\" . \"defaultinbox\"))

- The outbox that matches a key (case insensitive) will be
- used. The first entry is used as a default fallback when nothing
- else matches.
+  If none of the regular expressions match the From address, no
+  Fcc header will be added.

- In all cases, a relative FCC directory will be understood to
- specify a directory within the notmuch mail store, (as set by
- the database.path option in the notmuch configuration file).
+In all cases, a relative FCC directory will be understood to
+specify a directory within the notmuch mail store, (as set by
+the database.path option in the notmuch configuration file).

- You will be prompted to create the directory if it does not exist yet when 
- sending a mail.
-
- This function will not modify the headers if there is a FCC
- header, but will check that the target directory exists."
+You will be prompted to create the directory if it does not exist
+yet when sending a mail."

  :require 'notmuch-fcc-initialization
  :group 'notmuch
-)
+ :type '(choice
+(const :tag "No FCC header" nil)
+(string :tag "A single folder")
+(repeat :tag "A folder based on the From header"
+(cons regexp (string :tag "Folder")

 (defun notmuch-fcc-initialization ()
   "If notmuch-fcc-directories is set,
@@ -67,44 +67,66 @@
 (setq message-fcc-handler-function
   '(lambda (destdir)
  (notmuch-maildir-fcc-write-buffer-to-maildir destdir t)))
-;;add a hook to actually insert the Fcc header when sending
+;; add a hook to actually insert the Fcc header when sending
 (add-hook 'message-header-setup-hook 'notmuch-fcc-header-setup))

 (defun notmuch-fcc-header-setup ()
-  "Adds an appropriate fcc header to the current mail buffer
-
-   Can be added to message-send-hook and will set the FCC header
-   based on the values of notmuch-fcc-directories (see the
-   variable customization there for examples). It uses the first
-   entry as default fallback if no From address matches."
-  ;; only do something if notmuch-fcc-dirs is set
-  (when notmuch-fcc-dirs
-(let (subdir)
-  (if (stringp notmuch-fcc-dirs)
-  ;; notmuch-fcc-dirs is a string, just use it as subdir
-  (setq subdir notmuch-fcc-dirs)
-;; else: it's a list of alists (("sent") ("name1" . "sent1"))
-(setq subdir (cdr (assoc-string (message-fetch-field "from") 
notmuch-fcc-dirs t)))
- ;; if we found no hit, use the first entry as default fallback
- (unless subdir (setq subdir (car (car notmuch-fcc-dirs)
-
-  ;; if there is no fcc header yet, add ours
-  (unless (message-fetch-field "fcc")
-(message-add-header (concat "Fcc

[PATCH] emacs: Improve the definition and use of `notmuch-fcc-dirs'.

[David Edmondson]

On Fri,  5 Nov 2010 08:31:45 +, David Edmondson  wrote:
> +(require 'cl-seq)

Ouch. This (a) doesn't work and (b) breaks the 'no cl at runtime'
rule. I'll fix it and resubmit.

dme.
-- 
David Edmondson, http://dme.org

[PATCH] emacs: Improve the definition and use of `notmuch-fcc-dirs'.

[David Edmondson]

Re-work the declaration and definition of `notmuch-fcc-dirs'. The
variable now allows three types of values:

- nil: no Fcc header is added,

- a string: the value of `notmuch-fcc-dirs' is the name of the
  folder to use,

- a list: the folder is chosen based on the From address of the
  current message using a list of regular expressions and
  corresponding folders:

 ((\"sebast...@sspaeth.de\" . \"privat\")
  (\"spa...@sspaeth.de\" . \"OUTBOX.OSS\")
  (\".*\" . \"defaultinbox\"))

  If none of the regular expressions match the From address, no
  Fcc header will be added.
---

Fix runtime cl use.

 emacs/notmuch-maildir-fcc.el |  140 --
 1 files changed, 81 insertions(+), 59 deletions(-)

diff --git a/emacs/notmuch-maildir-fcc.el b/emacs/notmuch-maildir-fcc.el
index 693d8d4..e5e0549 100644
--- a/emacs/notmuch-maildir-fcc.el
+++ b/emacs/notmuch-maildir-fcc.el
@@ -16,6 +16,7 @@
 ;; To use this as the fcc handler for message-mode,
 ;; customize the notmuch-fcc-dirs variable
 
+(eval-when-compile (require 'cl))
 (require 'message)
 
 (require 'notmuch-lib)
@@ -23,41 +24,40 @@
 (defvar notmuch-maildir-fcc-count 0)
 
 (defcustom notmuch-fcc-dirs "sent"
- "Determines the maildir directory to save outgoing mails in.
+ "Determines the maildir directory in which to save outgoing mail.
 
- If set to non-nil, this will cause message mode to file your
- mail in the specified directory (fcc).
+Three types of values are permitted:
 
- It is either a string if you only need one fcc directory or a
- list if they depend on your From address (see example).
+- nil: no Fcc header is added,
 
- In the former case it is a string such as \"INBOX.Sent\".
+- a string: the value of `notmuch-fcc-dirs' is the name of the
+  folder to use,
 
- In the fancy setup, where you want different outboxes depending
- on your From address, you supply a list like this:
+- a list: the folder is chosen based on the From address of the
+  current message using a list of regular expressions and
+  corresponding folders:
 
- ((\"defaultinbox\")
-  (\"Sebastian Spaeth \" . \"privat\")
-  (\"Sebastian Spaeth \" . \"OUTBOX.OSS\")
- )
+ ((\"sebast...@sspaeth.de\" . \"privat\")
+  (\"spa...@sspaeth.de\" . \"OUTBOX.OSS\")
+  (\".*\" . \"defaultinbox\"))
 
- The outbox that matches a key (case insensitive) will be
- used. The first entry is used as a default fallback when nothing
- else matches.
+  If none of the regular expressions match the From address, no
+  Fcc header will be added.
 
- In all cases, a relative FCC directory will be understood to
- specify a directory within the notmuch mail store, (as set by
- the database.path option in the notmuch configuration file).
+In all cases, a relative FCC directory will be understood to
+specify a directory within the notmuch mail store, (as set by
+the database.path option in the notmuch configuration file).
 
- You will be prompted to create the directory if it does not exist yet when 
- sending a mail.
-
- This function will not modify the headers if there is a FCC
- header, but will check that the target directory exists."
+You will be prompted to create the directory if it does not exist
+yet when sending a mail."
 
  :require 'notmuch-fcc-initialization
  :group 'notmuch
-)
+ :type '(choice
+(const :tag "No FCC header" nil)
+(string :tag "A single folder")
+(repeat :tag "A folder based on the From header"
+(cons regexp (string :tag "Folder")
 
 (defun notmuch-fcc-initialization ()
   "If notmuch-fcc-directories is set,
@@ -67,44 +67,66 @@
 (setq message-fcc-handler-function
   '(lambda (destdir)
  (notmuch-maildir-fcc-write-buffer-to-maildir destdir t)))
-;;add a hook to actually insert the Fcc header when sending
+;; add a hook to actually insert the Fcc header when sending
 (add-hook 'message-header-setup-hook 'notmuch-fcc-header-setup))
 
 (defun notmuch-fcc-header-setup ()
-  "Adds an appropriate fcc header to the current mail buffer
-
-   Can be added to message-send-hook and will set the FCC header
-   based on the values of notmuch-fcc-directories (see the
-   variable customization there for examples). It uses the first
-   entry as default fallback if no From address matches."
-  ;; only do something if notmuch-fcc-dirs is set
-  (when notmuch-fcc-dirs
-(let (subdir)
-  (if (stringp notmuch-fcc-dirs)
-  ;; notmuch-fcc-dirs is a string, just use it as subdir
-  (setq subdir notmuch-fcc-dirs)
-;; else: it's a list of alists (("sent") ("name1" . "sent1"))
-(setq subdir (cdr (assoc-string (message-fetch-field "from") 
notmuch-fcc-dirs t)))
- ;; if we found no hit, use the first entry as default fallback
- (unless subdir (setq subdir (car (car notmuch-fcc-dirs)
-
-  ;; if there is no fcc header yet, add ours
-  (unless (message-fetch-field "fcc")
-(message-add-header (concat "F

Re: [PATCH] emacs: Improve the definition and use of `notmuch-fcc-dirs'.

[David Edmondson]

On Fri,  5 Nov 2010 08:31:45 +, David Edmondson  wrote:
> +(require 'cl-seq)

Ouch. This (a) doesn't work and (b) breaks the 'no cl at runtime'
rule. I'll fix it and resubmit.

dme.
-- 
David Edmondson, http://dme.org
___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch

RFC: [PATCH] emacs: Improve the definition and use of `notmuch-fcc-dirs'.

[David Edmondson]

On Thu, 04 Nov 2010 18:03:11 -0500, Rob Browning  
wrote:
> If you're going to go that far, you might want to allow a function (or
> form) too (a-la gnus).

Please, feel free. I'm a bcc-kinda-guy myself.

[PATCH] emacs: Improve the definition and use of `notmuch-fcc-dirs'.

[David Edmondson]

Re-work the declaration and definition of `notmuch-fcc-dirs'. The
variable now allows three types of values:

- nil: no Fcc header is added,

- a string: the value of `notmuch-fcc-dirs' is the name of the
  folder to use,

- a list: the folder is chosen based on the From address of the
  current message using a list of regular expressions and
  corresponding folders:

 ((\"Sebastian at SSpaeth.de\" . \"privat\")
  (\"spaetz at sspaeth.de\" . \"OUTBOX.OSS\")
  (\".*\" . \"defaultinbox\"))

  If none of the regular expressions match the From address, no
  Fcc header will be added.
---

Fix the detection of old style settings.

 emacs/notmuch-maildir-fcc.el |  138 --
 1 files changed, 79 insertions(+), 59 deletions(-)

diff --git a/emacs/notmuch-maildir-fcc.el b/emacs/notmuch-maildir-fcc.el
index 693d8d4..8a93d24 100644
--- a/emacs/notmuch-maildir-fcc.el
+++ b/emacs/notmuch-maildir-fcc.el
@@ -16,6 +16,7 @@
 ;; To use this as the fcc handler for message-mode,
 ;; customize the notmuch-fcc-dirs variable

+(require 'cl-seq)
 (require 'message)

 (require 'notmuch-lib)
@@ -23,41 +24,40 @@
 (defvar notmuch-maildir-fcc-count 0)

 (defcustom notmuch-fcc-dirs "sent"
- "Determines the maildir directory to save outgoing mails in.
+ "Determines the maildir directory in which to save outgoing mail.

- If set to non-nil, this will cause message mode to file your
- mail in the specified directory (fcc).
+Three types of values are permitted:

- It is either a string if you only need one fcc directory or a
- list if they depend on your From address (see example).
+- nil: no Fcc header is added,

- In the former case it is a string such as \"INBOX.Sent\".
+- a string: the value of `notmuch-fcc-dirs' is the name of the
+  folder to use,

- In the fancy setup, where you want different outboxes depending
- on your From address, you supply a list like this:
+- a list: the folder is chosen based on the From address of the
+  current message using a list of regular expressions and
+  corresponding folders:

- ((\"defaultinbox\")
-  (\"Sebastian Spaeth \" . \"privat\")
-  (\"Sebastian Spaeth \" . \"OUTBOX.OSS\")
- )
+ ((\"Sebastian at SSpaeth.de\" . \"privat\")
+  (\"spaetz at sspaeth.de\" . \"OUTBOX.OSS\")
+  (\".*\" . \"defaultinbox\"))

- The outbox that matches a key (case insensitive) will be
- used. The first entry is used as a default fallback when nothing
- else matches.
+  If none of the regular expressions match the From address, no
+  Fcc header will be added.

- In all cases, a relative FCC directory will be understood to
- specify a directory within the notmuch mail store, (as set by
- the database.path option in the notmuch configuration file).
+In all cases, a relative FCC directory will be understood to
+specify a directory within the notmuch mail store, (as set by
+the database.path option in the notmuch configuration file).

- You will be prompted to create the directory if it does not exist yet when 
- sending a mail.
-
- This function will not modify the headers if there is a FCC
- header, but will check that the target directory exists."
+You will be prompted to create the directory if it does not exist
+yet when sending a mail."

  :require 'notmuch-fcc-initialization
  :group 'notmuch
-)
+ :type '(choice
+(const :tag "No FCC header" nil)
+(string :tag "A single folder")
+(repeat :tag "A folder based on the From header"
+(cons regexp (string :tag "Folder")

 (defun notmuch-fcc-initialization ()
   "If notmuch-fcc-directories is set,
@@ -67,44 +67,64 @@
 (setq message-fcc-handler-function
   '(lambda (destdir)
  (notmuch-maildir-fcc-write-buffer-to-maildir destdir t)))
-;;add a hook to actually insert the Fcc header when sending
+;; add a hook to actually insert the Fcc header when sending
 (add-hook 'message-header-setup-hook 'notmuch-fcc-header-setup))

 (defun notmuch-fcc-header-setup ()
-  "Adds an appropriate fcc header to the current mail buffer
-
-   Can be added to message-send-hook and will set the FCC header
-   based on the values of notmuch-fcc-directories (see the
-   variable customization there for examples). It uses the first
-   entry as default fallback if no From address matches."
-  ;; only do something if notmuch-fcc-dirs is set
-  (when notmuch-fcc-dirs
-(let (subdir)
-  (if (stringp notmuch-fcc-dirs)
-  ;; notmuch-fcc-dirs is a string, just use it as subdir
-  (setq subdir notmuch-fcc-dirs)
-;; else: it's a list of alists (("sent") ("name1" . "sent1"))
-(setq subdir (cdr (assoc-string (message-fetch-field "from") 
notmuch-fcc-dirs t)))
- ;; if we found no hit, use the first entry as default fallback
- (unless subdir (setq subdir (car (car notmuch-fcc-dirs)
-
-  ;; if there is no fcc header yet, add ours
-  (unless (message-fetch-field "fcc")
-(message-add-header (concat

Re: RFC: [PATCH] emacs: Improve the definition and use of `notmuch-fcc-dirs'.

[David Edmondson]

On Thu, 04 Nov 2010 18:03:11 -0500, Rob Browning  wrote:
> If you're going to go that far, you might want to allow a function (or
> form) too (a-la gnus).

Please, feel free. I'm a bcc-kinda-guy myself.
___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch

[PATCH] emacs: Improve the definition and use of `notmuch-fcc-dirs'.

[David Edmondson]

Re-work the declaration and definition of `notmuch-fcc-dirs'. The
variable now allows three types of values:

- nil: no Fcc header is added,

- a string: the value of `notmuch-fcc-dirs' is the name of the
  folder to use,

- a list: the folder is chosen based on the From address of the
  current message using a list of regular expressions and
  corresponding folders:

 ((\"sebast...@sspaeth.de\" . \"privat\")
  (\"spa...@sspaeth.de\" . \"OUTBOX.OSS\")
  (\".*\" . \"defaultinbox\"))

  If none of the regular expressions match the From address, no
  Fcc header will be added.
---

Fix the detection of old style settings.

 emacs/notmuch-maildir-fcc.el |  138 --
 1 files changed, 79 insertions(+), 59 deletions(-)

diff --git a/emacs/notmuch-maildir-fcc.el b/emacs/notmuch-maildir-fcc.el
index 693d8d4..8a93d24 100644
--- a/emacs/notmuch-maildir-fcc.el
+++ b/emacs/notmuch-maildir-fcc.el
@@ -16,6 +16,7 @@
 ;; To use this as the fcc handler for message-mode,
 ;; customize the notmuch-fcc-dirs variable
 
+(require 'cl-seq)
 (require 'message)
 
 (require 'notmuch-lib)
@@ -23,41 +24,40 @@
 (defvar notmuch-maildir-fcc-count 0)
 
 (defcustom notmuch-fcc-dirs "sent"
- "Determines the maildir directory to save outgoing mails in.
+ "Determines the maildir directory in which to save outgoing mail.
 
- If set to non-nil, this will cause message mode to file your
- mail in the specified directory (fcc).
+Three types of values are permitted:
 
- It is either a string if you only need one fcc directory or a
- list if they depend on your From address (see example).
+- nil: no Fcc header is added,
 
- In the former case it is a string such as \"INBOX.Sent\".
+- a string: the value of `notmuch-fcc-dirs' is the name of the
+  folder to use,
 
- In the fancy setup, where you want different outboxes depending
- on your From address, you supply a list like this:
+- a list: the folder is chosen based on the From address of the
+  current message using a list of regular expressions and
+  corresponding folders:
 
- ((\"defaultinbox\")
-  (\"Sebastian Spaeth \" . \"privat\")
-  (\"Sebastian Spaeth \" . \"OUTBOX.OSS\")
- )
+ ((\"sebast...@sspaeth.de\" . \"privat\")
+  (\"spa...@sspaeth.de\" . \"OUTBOX.OSS\")
+  (\".*\" . \"defaultinbox\"))
 
- The outbox that matches a key (case insensitive) will be
- used. The first entry is used as a default fallback when nothing
- else matches.
+  If none of the regular expressions match the From address, no
+  Fcc header will be added.
 
- In all cases, a relative FCC directory will be understood to
- specify a directory within the notmuch mail store, (as set by
- the database.path option in the notmuch configuration file).
+In all cases, a relative FCC directory will be understood to
+specify a directory within the notmuch mail store, (as set by
+the database.path option in the notmuch configuration file).
 
- You will be prompted to create the directory if it does not exist yet when 
- sending a mail.
-
- This function will not modify the headers if there is a FCC
- header, but will check that the target directory exists."
+You will be prompted to create the directory if it does not exist
+yet when sending a mail."
 
  :require 'notmuch-fcc-initialization
  :group 'notmuch
-)
+ :type '(choice
+(const :tag "No FCC header" nil)
+(string :tag "A single folder")
+(repeat :tag "A folder based on the From header"
+(cons regexp (string :tag "Folder")
 
 (defun notmuch-fcc-initialization ()
   "If notmuch-fcc-directories is set,
@@ -67,44 +67,64 @@
 (setq message-fcc-handler-function
   '(lambda (destdir)
  (notmuch-maildir-fcc-write-buffer-to-maildir destdir t)))
-;;add a hook to actually insert the Fcc header when sending
+;; add a hook to actually insert the Fcc header when sending
 (add-hook 'message-header-setup-hook 'notmuch-fcc-header-setup))
 
 (defun notmuch-fcc-header-setup ()
-  "Adds an appropriate fcc header to the current mail buffer
-
-   Can be added to message-send-hook and will set the FCC header
-   based on the values of notmuch-fcc-directories (see the
-   variable customization there for examples). It uses the first
-   entry as default fallback if no From address matches."
-  ;; only do something if notmuch-fcc-dirs is set
-  (when notmuch-fcc-dirs
-(let (subdir)
-  (if (stringp notmuch-fcc-dirs)
-  ;; notmuch-fcc-dirs is a string, just use it as subdir
-  (setq subdir notmuch-fcc-dirs)
-;; else: it's a list of alists (("sent") ("name1" . "sent1"))
-(setq subdir (cdr (assoc-string (message-fetch-field "from") 
notmuch-fcc-dirs t)))
- ;; if we found no hit, use the first entry as default fallback
- (unless subdir (setq subdir (car (car notmuch-fcc-dirs)
-
-  ;; if there is no fcc header yet, add ours
-  (unless (message-fetch-field "fcc")
-(message-add-header (conc

RFC: [PATCH] emacs: Improve the definition and use of `notmuch-fcc-dirs'.

[David Edmondson]

Re-work the declaration and definition of `notmuch-fcc-dirs'. The
variable now allows three types of values:

- nil: no Fcc header is added,

- a string: the value of `notmuch-fcc-dirs' is the name of the
  folder to use,

- a list: the folder is chosen based on the From address of the
  current message using a list of regular expressions and
  corresponding folders:

 ((\"Sebastian at SSpaeth.de\" . \"privat\")
  (\"spaetz at sspaeth.de\" . \"OUTBOX.OSS\")
  (\".*\" . \"defaultinbox\"))

  If none of the regular expressions match the From address, no
  Fcc header will be added.
---

After wanting to be able to set `notmuch-fcc-dirs' to `nil' using
custom, I got sucked in.

This will be a user visible change, but apparently only for "special"
users.

 emacs/notmuch-maildir-fcc.el |  137 --
 1 files changed, 78 insertions(+), 59 deletions(-)

diff --git a/emacs/notmuch-maildir-fcc.el b/emacs/notmuch-maildir-fcc.el
index 693d8d4..4543b8d 100644
--- a/emacs/notmuch-maildir-fcc.el
+++ b/emacs/notmuch-maildir-fcc.el
@@ -16,6 +16,7 @@
 ;; To use this as the fcc handler for message-mode,
 ;; customize the notmuch-fcc-dirs variable

+(require 'cl-seq)
 (require 'message)

 (require 'notmuch-lib)
@@ -23,41 +24,40 @@
 (defvar notmuch-maildir-fcc-count 0)

 (defcustom notmuch-fcc-dirs "sent"
- "Determines the maildir directory to save outgoing mails in.
+ "Determines the maildir directory in which to save outgoing mail.

- If set to non-nil, this will cause message mode to file your
- mail in the specified directory (fcc).
+Three types of values are permitted:

- It is either a string if you only need one fcc directory or a
- list if they depend on your From address (see example).
+- nil: no Fcc header is added,

- In the former case it is a string such as \"INBOX.Sent\".
+- a string: the value of `notmuch-fcc-dirs' is the name of the
+  folder to use,

- In the fancy setup, where you want different outboxes depending
- on your From address, you supply a list like this:
+- a list: the folder is chosen based on the From address of the
+  current message using a list of regular expressions and
+  corresponding folders:

- ((\"defaultinbox\")
-  (\"Sebastian Spaeth \" . \"privat\")
-  (\"Sebastian Spaeth \" . \"OUTBOX.OSS\")
- )
+ ((\"Sebastian at SSpaeth.de\" . \"privat\")
+  (\"spaetz at sspaeth.de\" . \"OUTBOX.OSS\")
+  (\".*\" . \"defaultinbox\"))

- The outbox that matches a key (case insensitive) will be
- used. The first entry is used as a default fallback when nothing
- else matches.
+  If none of the regular expressions match the From address, no
+  Fcc header will be added.

- In all cases, a relative FCC directory will be understood to
- specify a directory within the notmuch mail store, (as set by
- the database.path option in the notmuch configuration file).
+In all cases, a relative FCC directory will be understood to
+specify a directory within the notmuch mail store, (as set by
+the database.path option in the notmuch configuration file).

- You will be prompted to create the directory if it does not exist yet when 
- sending a mail.
-
- This function will not modify the headers if there is a FCC
- header, but will check that the target directory exists."
+You will be prompted to create the directory if it does not exist
+yet when sending a mail."

  :require 'notmuch-fcc-initialization
  :group 'notmuch
-)
+ :type '(choice
+(const :tag "No FCC header" nil)
+(string :tag "A single folder")
+(repeat :tag "A folder based on the From header"
+(cons regexp (string :tag "Folder")

 (defun notmuch-fcc-initialization ()
   "If notmuch-fcc-directories is set,
@@ -67,44 +67,63 @@
 (setq message-fcc-handler-function
   '(lambda (destdir)
  (notmuch-maildir-fcc-write-buffer-to-maildir destdir t)))
-;;add a hook to actually insert the Fcc header when sending
+;; add a hook to actually insert the Fcc header when sending
 (add-hook 'message-header-setup-hook 'notmuch-fcc-header-setup))

 (defun notmuch-fcc-header-setup ()
-  "Adds an appropriate fcc header to the current mail buffer
-
-   Can be added to message-send-hook and will set the FCC header
-   based on the values of notmuch-fcc-directories (see the
-   variable customization there for examples). It uses the first
-   entry as default fallback if no From address matches."
-  ;; only do something if notmuch-fcc-dirs is set
-  (when notmuch-fcc-dirs
-(let (subdir)
-  (if (stringp notmuch-fcc-dirs)
-  ;; notmuch-fcc-dirs is a string, just use it as subdir
-  (setq subdir notmuch-fcc-dirs)
-;; else: it's a list of alists (("sent") ("name1" . "sent1"))
-(setq subdir (cdr (assoc-string (message-fetch-field "from") 
notmuch-fcc-dirs t)))
- ;; if we found no hit, use the first entry as default fallback
- (unless subdir (setq subdir (car (car notmuch-fcc-d

RFC: [PATCH] emacs: Improve the definition and use of `notmuch-fcc-dirs'.

[Rob Browning]

David Edmondson  writes:

> After wanting to be able to set `notmuch-fcc-dirs' to `nil' using
> custom, I got sucked in.

If you're going to go that far, you might want to allow a function (or
form) too (a-la gnus).  As an example, that can be handy when you want
to file mail based on the year:

  (setq gnus-message-archive-group
'((list (concat "all-" (format-time-string "%Y")

That tells gnus that the archive group should be "all-".

(Section 5.5 in "info gnus" has all the gory details if you want to see
 what's been done there.)

-- 
Rob Browning
rlb @defaultvalue.org and @debian.org
GPG as of 2002-11-03 14DD 432F AE39 534D B592 F9A0 25C8 D377 8C7E 73A4

Re: RFC: [PATCH] emacs: Improve the definition and use of `notmuch-fcc-dirs'.

[Rob Browning]

David Edmondson  writes:

> After wanting to be able to set `notmuch-fcc-dirs' to `nil' using
> custom, I got sucked in.

If you're going to go that far, you might want to allow a function (or
form) too (a-la gnus).  As an example, that can be handy when you want
to file mail based on the year:

  (setq gnus-message-archive-group
'((list (concat "all-" (format-time-string "%Y")

That tells gnus that the archive group should be "all-".

(Section 5.5 in "info gnus" has all the gory details if you want to see
 what's been done there.)

-- 
Rob Browning
rlb @defaultvalue.org and @debian.org
GPG as of 2002-11-03 14DD 432F AE39 534D B592 F9A0 25C8 D377 8C7E 73A4
___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch

RFC: [PATCH] emacs: Improve the definition and use of `notmuch-fcc-dirs'.

[David Edmondson]

Re-work the declaration and definition of `notmuch-fcc-dirs'. The
variable now allows three types of values:

- nil: no Fcc header is added,

- a string: the value of `notmuch-fcc-dirs' is the name of the
  folder to use,

- a list: the folder is chosen based on the From address of the
  current message using a list of regular expressions and
  corresponding folders:

 ((\"sebast...@sspaeth.de\" . \"privat\")
  (\"spa...@sspaeth.de\" . \"OUTBOX.OSS\")
  (\".*\" . \"defaultinbox\"))

  If none of the regular expressions match the From address, no
  Fcc header will be added.
---

After wanting to be able to set `notmuch-fcc-dirs' to `nil' using
custom, I got sucked in.

This will be a user visible change, but apparently only for "special"
users.

 emacs/notmuch-maildir-fcc.el |  137 --
 1 files changed, 78 insertions(+), 59 deletions(-)

diff --git a/emacs/notmuch-maildir-fcc.el b/emacs/notmuch-maildir-fcc.el
index 693d8d4..4543b8d 100644
--- a/emacs/notmuch-maildir-fcc.el
+++ b/emacs/notmuch-maildir-fcc.el
@@ -16,6 +16,7 @@
 ;; To use this as the fcc handler for message-mode,
 ;; customize the notmuch-fcc-dirs variable
 
+(require 'cl-seq)
 (require 'message)
 
 (require 'notmuch-lib)
@@ -23,41 +24,40 @@
 (defvar notmuch-maildir-fcc-count 0)
 
 (defcustom notmuch-fcc-dirs "sent"
- "Determines the maildir directory to save outgoing mails in.
+ "Determines the maildir directory in which to save outgoing mail.
 
- If set to non-nil, this will cause message mode to file your
- mail in the specified directory (fcc).
+Three types of values are permitted:
 
- It is either a string if you only need one fcc directory or a
- list if they depend on your From address (see example).
+- nil: no Fcc header is added,
 
- In the former case it is a string such as \"INBOX.Sent\".
+- a string: the value of `notmuch-fcc-dirs' is the name of the
+  folder to use,
 
- In the fancy setup, where you want different outboxes depending
- on your From address, you supply a list like this:
+- a list: the folder is chosen based on the From address of the
+  current message using a list of regular expressions and
+  corresponding folders:
 
- ((\"defaultinbox\")
-  (\"Sebastian Spaeth \" . \"privat\")
-  (\"Sebastian Spaeth \" . \"OUTBOX.OSS\")
- )
+ ((\"sebast...@sspaeth.de\" . \"privat\")
+  (\"spa...@sspaeth.de\" . \"OUTBOX.OSS\")
+  (\".*\" . \"defaultinbox\"))
 
- The outbox that matches a key (case insensitive) will be
- used. The first entry is used as a default fallback when nothing
- else matches.
+  If none of the regular expressions match the From address, no
+  Fcc header will be added.
 
- In all cases, a relative FCC directory will be understood to
- specify a directory within the notmuch mail store, (as set by
- the database.path option in the notmuch configuration file).
+In all cases, a relative FCC directory will be understood to
+specify a directory within the notmuch mail store, (as set by
+the database.path option in the notmuch configuration file).
 
- You will be prompted to create the directory if it does not exist yet when 
- sending a mail.
-
- This function will not modify the headers if there is a FCC
- header, but will check that the target directory exists."
+You will be prompted to create the directory if it does not exist
+yet when sending a mail."
 
  :require 'notmuch-fcc-initialization
  :group 'notmuch
-)
+ :type '(choice
+(const :tag "No FCC header" nil)
+(string :tag "A single folder")
+(repeat :tag "A folder based on the From header"
+(cons regexp (string :tag "Folder")
 
 (defun notmuch-fcc-initialization ()
   "If notmuch-fcc-directories is set,
@@ -67,44 +67,63 @@
 (setq message-fcc-handler-function
   '(lambda (destdir)
  (notmuch-maildir-fcc-write-buffer-to-maildir destdir t)))
-;;add a hook to actually insert the Fcc header when sending
+;; add a hook to actually insert the Fcc header when sending
 (add-hook 'message-header-setup-hook 'notmuch-fcc-header-setup))
 
 (defun notmuch-fcc-header-setup ()
-  "Adds an appropriate fcc header to the current mail buffer
-
-   Can be added to message-send-hook and will set the FCC header
-   based on the values of notmuch-fcc-directories (see the
-   variable customization there for examples). It uses the first
-   entry as default fallback if no From address matches."
-  ;; only do something if notmuch-fcc-dirs is set
-  (when notmuch-fcc-dirs
-(let (subdir)
-  (if (stringp notmuch-fcc-dirs)
-  ;; notmuch-fcc-dirs is a string, just use it as subdir
-  (setq subdir notmuch-fcc-dirs)
-;; else: it's a list of alists (("sent") ("name1" . "sent1"))
-(setq subdir (cdr (assoc-string (message-fetch-field "from") 
notmuch-fcc-dirs t)))
- ;; if we found no hit, use the first entry as default fallback
- (unless subdir (setq subdir (car (car notmuch-fcc