From f9a68bd1696d0cbf9bb07d9178045640cfa02dfc Mon Sep 17 00:00:00 2001 From: Felix Dietrich Date: Thu, 10 Mar 2022 03:30:59 +0100 Subject: [PATCH 02/10] =?UTF-8?q?Move=20the=20=E2=80=98if=E2=80=99=20form?= =?UTF-8?q?=20into=20the=20=E2=80=98cond=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Its condition and then-form become the first alternative of the ‘cond’. The rest of the ‘cond’ remains, in a way, the previous else-form of the ‘if’. --- lisp/net/mailcap.el | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/lisp/net/mailcap.el b/lisp/net/mailcap.el index 633d43320e..c30b9e096d 100644 --- a/lisp/net/mailcap.el +++ b/lisp/net/mailcap.el @@ -721,24 +721,24 @@ to supply to the test." (let* ((storage (or storage 'mailcap--computed-mime-data)) (old-major (assoc major (symbol-value storage))) (cur-minor (assoc minor old-major))) - (if (null old-major) ; New major area - (set storage - (cons (cons major (list (cons minor info))) - (symbol-value storage))) - (cond - ((or (null cur-minor) ; New minor area, or - (assq 'test info)) ; Has a test, insert at beginning - (setcdr old-major - (cons (cons minor info) (cdr old-major)))) - ((and (not (assq 'test info)) ; No test info, replace completely - (not (assq 'test cur-minor)) - (equal (assq 'viewer info) ; Keep alternative viewer - (assq 'viewer cur-minor))) - (setcdr cur-minor info)) - (t - (setcdr old-major - (setcdr old-major - (cons (cons minor info) (cdr old-major))))))))) + (cond + ((null old-major) ; New major area + (set storage + (cons (cons major (list (cons minor info))) + (symbol-value storage)))) + ((or (null cur-minor) ; New minor area, or + (assq 'test info)) ; Has a test, insert at beginning + (setcdr old-major + (cons (cons minor info) (cdr old-major)))) + ((and (not (assq 'test info)) ; No test info, replace completely + (not (assq 'test cur-minor)) + (equal (assq 'viewer info) ; Keep alternative viewer + (assq 'viewer cur-minor))) + (setcdr cur-minor info)) + (t + (setcdr old-major + (setcdr old-major + (cons (cons minor info) (cdr old-major)))))))) (defun mailcap-add (type viewer &optional test) "Add VIEWER as a handler for TYPE. -- 2.35.1