[PATCH] Workaround broken check for old-style notmuch-fcc-dirs

2010-11-24 Thread Carl Worth
This check actually makes a new-style setting not work.
---
 emacs/notmuch-maildir-fcc.el |8 
 1 files changed, 4 insertions(+), 4 deletions(-)

I don't intend this commit for the central repository. Better would be
a new test case for a new-style notmuch-fcc-dirs setting, then a fix
to make the code below work as intended (rather than being commented
out).

diff --git a/emacs/notmuch-maildir-fcc.el b/emacs/notmuch-maildir-fcc.el
index e5e0549..54d5528 100644
--- a/emacs/notmuch-maildir-fcc.el
+++ b/emacs/notmuch-maildir-fcc.el
@@ -87,10 +87,10 @@ will NOT be removed or replaced."
  ((stringp notmuch-fcc-dirs)
   notmuch-fcc-dirs)
 
- ((and (listp notmuch-fcc-dirs)
-   (= 1 (length (car notmuch-fcc-dirs
-  ;; Old style - no longer works.
-  (error "Invalid `notmuch-fcc-dirs' setting (old style)"))
+;((and (listp notmuch-fcc-dirs)
+;  (= 1 (length (car notmuch-fcc-dirs
+; ;; Old style - no longer works.
+; (error "Invalid `notmuch-fcc-dirs' setting (old style)"))
 
  ((listp notmuch-fcc-dirs)
   (let* ((from (message-fetch-field "From"))
-- 
1.7.2.3

___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch


[PATCH] Workaround broken check for old-style notmuch-fcc-dirs

2010-11-24 Thread Carl Worth
This check actually makes a new-style setting not work.
---
 emacs/notmuch-maildir-fcc.el |8 
 1 files changed, 4 insertions(+), 4 deletions(-)

I don't intend this commit for the central repository. Better would be
a new test case for a new-style notmuch-fcc-dirs setting, then a fix
to make the code below work as intended (rather than being commented
out).

diff --git a/emacs/notmuch-maildir-fcc.el b/emacs/notmuch-maildir-fcc.el
index e5e0549..54d5528 100644
--- a/emacs/notmuch-maildir-fcc.el
+++ b/emacs/notmuch-maildir-fcc.el
@@ -87,10 +87,10 @@ will NOT be removed or replaced."
  ((stringp notmuch-fcc-dirs)
   notmuch-fcc-dirs)

- ((and (listp notmuch-fcc-dirs)
-   (= 1 (length (car notmuch-fcc-dirs
-  ;; Old style - no longer works.
-  (error "Invalid `notmuch-fcc-dirs' setting (old style)"))
+;((and (listp notmuch-fcc-dirs)
+;  (= 1 (length (car notmuch-fcc-dirs
+; ;; Old style - no longer works.
+; (error "Invalid `notmuch-fcc-dirs' setting (old style)"))

  ((listp notmuch-fcc-dirs)
   (let* ((from (message-fetch-field "From"))
-- 
1.7.2.3