diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2016-11-05 12:07:24 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org> | 2016-11-05 12:07:24 +0200 |
commit | c8ae650738984896d1893bb570868f717410444d (patch) | |
tree | 1a2866f83a5a8d024cd72eb4dd1b35c01cf9816a /scheme | |
parent | af20212718728b315449ff35685772302883fc3d (diff) | |
download | mailutils-c8ae650738984896d1893bb570868f717410444d.tar.gz mailutils-c8ae650738984896d1893bb570868f717410444d.tar.bz2 |
Minor changes
Diffstat (limited to 'scheme')
-rw-r--r-- | scheme/guimb.scmi | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/scheme/guimb.scmi b/scheme/guimb.scmi index 45453cf79..8a93b09c1 100644 --- a/scheme/guimb.scmi +++ b/scheme/guimb.scmi @@ -27,6 +27,7 @@ exec ${GUILE-guile} -l $0 -c "(apply $main (list (command-line)))" "$@" (use-modules (ice-9 getopt-long) (ice-9 rdelim) + (ice-9 eval-string) (srfi srfi-1) (mailutils mailutils)) @@ -190,7 +191,7 @@ for any corresponding short options. guimb-module) (define-macro (bound? name) - `(and (module-defined? guimb-module ',name) + `(and (module-defined? (get-module) ',name) (procedure? ,name))) (define (guimb-parse-command-line cmdline) @@ -219,17 +220,12 @@ for any corresponding short options. (if (not output-mailbox-mode) (set! output-mailbox-mode (if (null? input-mailbox-names) "wr" "a"))) - (cond - (user-name - (set! output-mailbox - (mu-mailbox-open - (if (string? user-name) - (string-append "%" user-name) - "") - output-mailbox-mode))) - (output-mailbox-name - (set! output-mailbox (mu-mailbox-open output-mailbox-name - output-mailbox-mode)))) + (if (and (not output-mailbox-name) user-name) + (set! output-mailbox-name (if (string? user-name) + (string-append "%" user-name) + #f))) + (set! output-mailbox (mu-mailbox-open output-mailbox-name + output-mailbox-mode)) ; (write output-mailbox)(newline) (if source-file-name |