summaryrefslogtreecommitdiff
path: root/admin/cus-test.el
diff options
context:
space:
mode:
Diffstat (limited to 'admin/cus-test.el')
-rw-r--r--admin/cus-test.el17
1 files changed, 9 insertions, 8 deletions
diff --git a/admin/cus-test.el b/admin/cus-test.el
index aca7b68aa7a..995586f9c71 100644
--- a/admin/cus-test.el
+++ b/admin/cus-test.el
@@ -1,4 +1,4 @@
-;;; cus-test.el --- tests for custom types and load problems
+;;; cus-test.el --- tests for custom types and load problems -*- lexical-binding: t; -*-
;; Copyright (C) 1998, 2000, 2002-2021 Free Software Foundation, Inc.
@@ -112,6 +112,7 @@ Names should be as they appear in loaddefs.el.")
;; This avoids a hang of `cus-test-apropos' in 21.2.
;; (add-to-list 'cus-test-skip-list 'sh-alias-alist)
+(defvar viper-mode)
(or noninteractive
;; Never Viperize.
(setq viper-mode nil))
@@ -196,7 +197,7 @@ The detected problematic options are stored in `cus-test-errors'."
mismatch)
(when (default-boundp symbol)
(push (funcall get symbol) values)
- (push (eval (car (get symbol 'standard-value))) values))
+ (push (eval (car (get symbol 'standard-value)) t) values))
(if (boundp symbol)
(push (symbol-value symbol) values))
;; That does not work.
@@ -222,7 +223,7 @@ The detected problematic options are stored in `cus-test-errors'."
(get symbol 'standard-value))))
(and (consp c-value)
(boundp symbol)
- (not (equal (eval (car c-value)) (symbol-value symbol)))
+ (not (equal (eval (car c-value) t) (symbol-value symbol)))
(add-to-list 'cus-test-vars-with-changed-state symbol)))
(if mismatch
@@ -239,7 +240,7 @@ The detected problematic options are stored in `cus-test-errors'."
(defun cus-test-cus-load-groups (&optional cus-load)
"Return a list of current custom groups.
If CUS-LOAD is non-nil, include groups from cus-load.el."
- (append (mapcar 'cdr custom-current-group-alist)
+ (append (mapcar #'cdr custom-current-group-alist)
(if cus-load
(with-temp-buffer
(insert-file-contents (locate-library "cus-load.el"))
@@ -290,7 +291,7 @@ currently defined groups."
"Call `custom-load-symbol' on all atoms."
(interactive)
(if noninteractive (let (noninteractive) (require 'dunnet)))
- (mapatoms 'custom-load-symbol)
+ (mapatoms #'custom-load-symbol)
(run-hooks 'cus-test-after-load-libs-hook))
(defmacro cus-test-load-1 (&rest body)
@@ -346,7 +347,7 @@ Optional argument ALL non-nil means list all (non-obsolete) Lisp files."
(prog1
;; Hack to remove leading "./".
(mapcar (lambda (e) (substring e 2))
- (apply 'process-lines find-program
+ (apply #'process-lines find-program
"." "-name" "obsolete" "-prune" "-o"
"-name" "[^.]*.el" ; ignore .dir-locals.el
(if all
@@ -542,7 +543,7 @@ in the Emacs source directory."
(message "No options not loaded by custom-load-symbol found")
(message "The following options were not loaded by custom-load-symbol:")
(cus-test-message
- (sort cus-test-vars-not-cus-loaded 'string<)))
+ (sort cus-test-vars-not-cus-loaded #'string<)))
(dolist (o groups-loaded)
(setq groups-not-loaded (delete o groups-not-loaded)))
@@ -550,7 +551,7 @@ in the Emacs source directory."
(if (not groups-not-loaded)
(message "No groups not in cus-load.el found")
(message "The following groups are not in cus-load.el:")
- (cus-test-message (sort groups-not-loaded 'string<)))))
+ (cus-test-message (sort groups-not-loaded #'string<)))))
(provide 'cus-test)