procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix handling of folder "+/" in MH-E

Browse source 
* lisp/mh-e/mh-utils.el (mh-sub-folders): Fix handling of "+/".
* test/lisp/mh-e/mh-utils-tests.el
(mh-folder-completion-function-08-plus-slash)
(mh-folder-completion-function-09-plus-slash-tmp):
Fix errors made importing tests from mh-unit.el; remove declaration
that these tests are expected to fail.
This commit is contained in:
Mike Kupfer 2021-11-15 22:03:54 -08:00 • committed by Stephen Gildea
parent cb0aa89bcf
commit d89d5e0f94
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lisp/mh-e/mh-utils.el
View file

@ -531,7 +531,12 @@ results of the actual folders call.
If optional argument ADD-TRAILING-SLASH-FLAG is non-nil then a
slash is added to each of the sub-folder names that may have
nested folders within them."
(let* ((folder (mh-normalize-folder-name folder nil nil t))
;; In most cases we want to remove a trailing slash. We keep the
;; slash for "+/", because it refers to folders in the system root
;; directory, whereas "+" refers to the user's top-level folders.
(let* ((folder (mh-normalize-folder-name folder nil
(string= folder "+/")
t))
(match (gethash folder mh-sub-folders-cache 'no-result))
(sub-folders (cond ((eq match 'no-result)
(setf (gethash folder mh-sub-folders-cache)

6
test/lisp/mh-e/mh-utils-tests.el
View file

@ -437,8 +437,7 @@ and the `should' macro requires idempotent evaluation anyway."
(ert-deftest mh-folder-completion-function-08-plus-slash ()
"Test `mh-folder-completion-function' with `+/'."
:expected-result :failed ;to be fixed in a patch by mkupfer
(mh-test-folder-completion-1 "+/" "+/" "tmp/" nil)
(mh-test-folder-completion-1 "+/" "+/" "tmp/" t)
;; case "bb"
(with-mh-test-env
(should (equal nil
@ -447,8 +446,7 @@ and the `should' macro requires idempotent evaluation anyway."
(ert-deftest mh-folder-completion-function-09-plus-slash-tmp ()
"Test `mh-folder-completion-function' with `+/tmp'."
:expected-result :failed ;to be fixed in a patch by mkupfer
(mh-test-folder-completion-1 "+/tmp" "+/tmp" "tmp/" t))
(mh-test-folder-completion-1 "+/tmp" "+/tmp/" "tmp/" t))
(ert-deftest mh-folder-completion-function-10-plus-slash-abs-folder ()
"Test `mh-folder-completion-function' with `+/abso-folder'."