diff options
| author | Eric Abrahamsen <eric@ericabrahamsen.net> | 2022-11-26 12:12:50 -0800 |
|---|---|---|
| committer | Eric Abrahamsen <eric@ericabrahamsen.net> | 2022-11-26 12:15:45 -0800 |
| commit | eb713a8fccc7f0512cfdbd5c520d4c856746a968 (patch) | |
| tree | 466406e5d5a17ee6a27ced6353d3b6749ba5459e | |
| parent | b27e8f26284770162cc9e9d95d4d273902d35927 (diff) | |
| download | emacs-eb713a8fccc7f0512cfdbd5c520d4c856746a968.tar.gz | |
Remove mentions of create-directory nnmaildir setting
* lisp/gnus/nnmaildir.el (nnmaildir-open-server): The
'create-directory server parameter should have been removed entirely,
and supplanted by 'target-prefix. Remove check for old parameter.
* doc/misc/gnus.texi (Maildir): Delete mention from manual.
| -rw-r--r-- | doc/misc/gnus.texi | 3 | ||||
| -rw-r--r-- | lisp/gnus/nnmaildir.el | 21 |
2 files changed, 7 insertions, 17 deletions
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index b0fef2b5b66..10f7bd94f7e 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -16808,8 +16808,7 @@ value is @code{nil}. Do @emph{not} use the same maildir both in @code{mail-sources} and as an @code{nnmaildir} group. The results might happen to be useful, but that would be by chance, not by design, and the results might be -different in the future. If your split rules create new groups, -remember to supply a @code{create-directory} server parameter. +different in the future. @end table @node nnmaildir Group Parameters diff --git a/lisp/gnus/nnmaildir.el b/lisp/gnus/nnmaildir.el index 4d1ecbf8642..faa288934d1 100644 --- a/lisp/gnus/nnmaildir.el +++ b/lisp/gnus/nnmaildir.el @@ -670,7 +670,7 @@ This variable is set by `nnmaildir-request-article'.") (defun nnmaildir-open-server (server-string &optional defs) (let ((server (alist-get server-string nnmaildir--servers nil nil #'equal)) - dir size x) + dir size x prefix) (catch 'return (if server (and (nnmaildir--srv-groups server) @@ -710,20 +710,11 @@ This variable is set by `nnmaildir-request-article'.") (car x) (setf (nnmaildir--srv-gnm server) t) (require 'nnmail)) - (setq x (assq 'target-prefix defs)) - (if x - (progn - (setq x (cadr x) - x (eval x t)) ;FIXME: Why `eval'? - (setf (nnmaildir--srv-target-prefix server) x)) - (setq x (assq 'create-directory defs)) - (if x - (progn - (setq x (cadr x) - x (eval x t) ;FIXME: Why `eval'? - x (file-name-as-directory x)) - (setf (nnmaildir--srv-target-prefix server) x)) - (setf (nnmaildir--srv-target-prefix server) ""))) + (setf prefix (cl-second (assq 'target-prefix defs)) + (nnmaildir--srv-target-prefix server) + (if prefix + (eval prefix t) + "")) (setf (nnmaildir--srv-groups server) (gnus-make-hashtable size)) (setq nnmaildir--cur-server server) |