emacs
/
mu
mirror of https://github.com/djcb/mu.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Guard against nil in mu4e~guess-maildir (Fixes #472) 

Add a guard so we don't error out if string-match evaluates to nil
This commit is contained in:
djcb 2014-09-23 00:36:31 +03:00
parent ea5bbdf830
commit efb40abaa1
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mu4e/mu4e-utils.el
View File

@ -1,6 +1,6 @@
;;; mu4e-utils.el -- part of mu4e, the mu mail user agent
;;
;; Copyright (C) 2011-2012 Dirk-Jan C. Binnema
;; Copyright (C) 2011-2014 Dirk-Jan C. Binnema
;; Copyright (C) 2013 Tibor Simko
;; Author: Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
@ -154,12 +154,13 @@ see its docstring)."
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(defun mu4e~guess-maildir (path)
"Guess the maildir for some path, or nil if cannot find it."
(when (zerop (string-match mu4e-maildir path))
(replace-regexp-in-string
mu4e-maildir
""
(expand-file-name
(concat path "/../..")))))
(let ((idx (string-match mu4e-maildir path)))
(when (and idx (zerop idx))
(replace-regexp-in-string
mu4e-maildir
""
(expand-file-name
(concat path "/../.."))))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;