Eliminate some unnecessary conditions

mattiase · Jun 12, 2023 · 2c0644e · 2c0644e
1 parent 62321cb
commit 2c0644e
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/relint.el b/relint.el
@@ -1869,8 +1869,7 @@ directly."
            (cond
             ((memq name relint--known-regexp-variables)
              (relint--check-re expr name pos (cons i path)))
-            ((and (symbolp name) (string-match-p (rx "font-lock-keywords")
-                                                 (symbol-name name)))
+            ((string-match-p (rx "font-lock-keywords") (symbol-name name))
              (relint--check-font-lock-keywords expr name pos (cons i path)))
             ((eq name 'font-lock-defaults)
              (relint--check-font-lock-defaults expr name pos (cons i path)))
@@ -2080,8 +2079,7 @@ directly."
                                   (symbol-name name)))
               (relint--check-list re-arg name pos (cons 2 path) nil)
               (push name relint--checked-variables))
-             ((and (symbolp name) (string-match-p (rx "font-lock-keywords")
-                                                  (symbol-name name)))
+             ((string-match-p (rx "font-lock-keywords") (symbol-name name))
               (relint--check-font-lock-keywords re-arg name pos (cons 2 path))
               (push name relint--checked-variables))
              ((eq name 'compilation-error-regexp-alist-alist)
@@ -2148,13 +2146,12 @@ directly."
        (`(font-lock-add-keywords ,_ ,keywords . ,_)
         (relint--check-font-lock-keywords
          keywords (car form) pos (cons 2 path)))
-       (`(set (make-local-variable ',name) ,expr)
+       (`(set (make-local-variable ',(and (pred symbolp) name)) ,expr)
         (cond ((memq name relint--known-regexp-variables)
                (relint--check-re expr name pos (cons 2 path)))
               ((eq name 'font-lock-defaults)
                (relint--check-font-lock-defaults expr name pos (cons 2 path)))
-              ((and (symbolp name) (string-match-p (rx "font-lock-keywords")
-                                                   (symbol-name name)))
+              ((string-match-p (rx "font-lock-keywords") (symbol-name name))
                (relint--check-font-lock-keywords expr name pos (cons 2 path)))
               ((eq name 'imenu-generic-expression)
                (relint--check-imenu-generic-expression