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

Merge pull request #2336 from tsdh/fix-cl-case-usages 

Fix wrong cl-case usages where emacs 29 errors on byte-compilation now
This commit is contained in:
Dirk-Jan C. Binnema 2022-09-14 23:02:24 +03:00 committed by GitHub
parent 7f0497638c 2dd5d9cfa1
commit 87018e6257
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
mu4e/mu4e-headers.el
View File

@ -379,14 +379,14 @@ into a string."
(lambda (cell) (lambda (cell)
(if mu4e-use-fancy-chars (cdr cell) (car cell))))) (if mu4e-use-fancy-chars (cdr cell) (car cell)))))
(cl-case type (cl-case type
('child (funcall get-prefix mu4e-headers-thread-child-prefix)) (child (funcall get-prefix mu4e-headers-thread-child-prefix))
('first-child (funcall get-prefix mu4e-headers-thread-first-child-prefix)) (first-child (funcall get-prefix mu4e-headers-thread-first-child-prefix))
('last-child (funcall get-prefix mu4e-headers-thread-last-child-prefix)) (last-child (funcall get-prefix mu4e-headers-thread-last-child-prefix))
('connection (funcall get-prefix mu4e-headers-thread-connection-prefix)) (connection (funcall get-prefix mu4e-headers-thread-connection-prefix))
('blank (funcall get-prefix mu4e-headers-thread-blank-prefix)) (blank (funcall get-prefix mu4e-headers-thread-blank-prefix))
('orphan (funcall get-prefix mu4e-headers-thread-orphan-prefix)) (orphan (funcall get-prefix mu4e-headers-thread-orphan-prefix))
('single-orphan (funcall get-prefix mu4e-headers-thread-single-orphan-prefix)) (single-orphan (funcall get-prefix mu4e-headers-thread-single-orphan-prefix))
('duplicate (funcall get-prefix mu4e-headers-thread-duplicate-prefix)) (duplicate (funcall get-prefix mu4e-headers-thread-duplicate-prefix))
(t "?")))) (t "?"))))
@ -1552,9 +1552,12 @@ user)."
(if (eq sortfield mu4e-headers-sort-field) (if (eq sortfield mu4e-headers-sort-field)
(if (eq mu4e-headers-sort-direction 'ascending) (if (eq mu4e-headers-sort-direction 'ascending)
'descending 'ascending) 'descending 'ascending)
'descending)) 'descending)))
(mu4e-read-option "Direction: " ;; FIXME: This has been here for years but cl-case doesn't allow
'(("ascending" . 'ascending) ("descending" . 'descending)))))) ;; further clauses after t or otherwise.
;; (mu4e-read-option "Direction: " '(("ascending" . 'ascending)
;; ("descending" . 'descending)))
))
(setq (setq
mu4e-headers-sort-field sortfield mu4e-headers-sort-field sortfield
mu4e-headers-sort-direction dir) mu4e-headers-sort-direction dir)