From 37cbda1c40611a4e1d10ce7d7bf310cbecf50b07 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Mon, 17 Feb 2025 22:04:41 +0100 Subject: [PATCH] Prefer plusp/minusp to cl-plusp/cl-minusp * lisp/dired.el (dired--move-to-next-line): * lisp/emacs-lisp/ert.el (ert-run-tests-batch, ert-face-for-stats): * lisp/emacs-lisp/pp.el (pp--format-definition): * lisp/gnus/gnus-icalendar.el (gnus-icalendar-event--org-timestamp): * lisp/ibuffer.el (ibuffer-compile-format, ibuffer--format-title) (ibuffer--format-summary): * lisp/image-mode.el (image-transform-set-percent): * lisp/international/emoji.el (emoji--list-generate, emoji--read-emoji): * lisp/progmodes/ebrowse.el (ebrowse-set-tree-indentation) (ebrowse-set-member-buffer-column-width) (ebrowse-cyclic-display-next/previous-member-list) (ebrowse-draw-member-short-fn) (ebrowse-switch-member-buffer-to-sibling-class, ebrowse-push-position): * lisp/textmodes/dns-mode.el (dns-mode-reverse-and-expand-ipv6): * test/lisp/emacs-lisp/bytecomp-tests.el (bytecomp-tests--not-writable-directory) (bytecomp-tests--dest-mountpoint) (bytecomp-tests--target-file-no-directory): * test/lisp/emacs-lisp/cl-seq-tests.el (cl-member-if-test) (cl-member-if-not-test, cl-assoc-if-not-test, cl-rassoc-if-test) (cl-rassoc-if-not-test): * test/src/emacs-module-tests.el (mod-test-add-nanosecond/valid): Prefer plusp and minusp to cl-plusp and cl-minusp. (cherry picked from commit 83bc811f7fad00b9b4ed3e4ffd67a96226991ca3) --- lisp/dired.el | 4 ++-- lisp/emacs-lisp/ert.el | 6 +++--- lisp/emacs-lisp/pp.el | 2 +- lisp/gnus/gnus-icalendar.el | 3 ++- lisp/ibuffer.el | 6 +++--- lisp/image-mode.el | 2 +- lisp/international/emoji.el | 4 ++-- lisp/textmodes/dns-mode.el | 4 ++-- test/lisp/emacs-lisp/bytecomp-tests.el | 12 ++++++------ test/lisp/emacs-lisp/cl-seq-tests.el | 10 +++++----- test/src/emacs-module-tests.el | 2 +- 11 files changed, 28 insertions(+), 27 deletions(-) diff --git a/lisp/dired.el b/lisp/dired.el index 8a91c04bc4a..acaa2174a07 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -2910,7 +2910,7 @@ is controlled by `dired-movement-style'." (dired-move-to-filename) (point))) ;; Up/Down indicates the direction. - (moving-down (if (cl-plusp arg) + (moving-down (if (plusp arg) 1 ; means Down. -1))) ; means Up. ;; Line by line in case we forget to skip empty lines. @@ -2926,7 +2926,7 @@ is controlled by `dired-movement-style'." ;; means infinite loop with no files found. (if (and wrapped (eq old-arg arg)) (setq arg 0) - (goto-char (if (cl-plusp moving-down) + (goto-char (if (plusp moving-down) (point-min) (point-max)))) (setq wrapped t)) diff --git a/lisp/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el index a0c72d2a0c8..fb4dd82381c 100644 --- a/lisp/emacs-lisp/ert.el +++ b/lisp/emacs-lisp/ert.el @@ -1412,7 +1412,7 @@ Returns the stats object." (message "%9s %S%s" (ert-string-for-test-result result nil) (ert-test-name test) - (if (cl-plusp + (if (plusp (length (getenv "EMACS_TEST_VERBOSE"))) (ert-reason-for-test-result result) "")))) @@ -1425,7 +1425,7 @@ Returns the stats object." (message "%9s %S%s" (ert-string-for-test-result result nil) (ert-test-name test) - (if (cl-plusp + (if (plusp (length (getenv "EMACS_TEST_VERBOSE"))) (ert-reason-for-test-result result) "")))) @@ -2116,7 +2116,7 @@ non-nil, returns the face for expected results.." (defun ert-face-for-stats (stats) "Return a face that represents STATS." (cond ((ert--stats-aborted-p stats) 'nil) - ((cl-plusp (ert-stats-completed-unexpected stats)) + ((plusp (ert-stats-completed-unexpected stats)) (ert-face-for-test-result nil)) ((eql (ert-stats-completed-expected stats) (ert-stats-total stats)) (ert-face-for-test-result t)) diff --git a/lisp/emacs-lisp/pp.el b/lisp/emacs-lisp/pp.el index ec784cceecf..0189ce30e9d 100644 --- a/lisp/emacs-lisp/pp.el +++ b/lisp/emacs-lisp/pp.el @@ -578,7 +578,7 @@ the bounds of a region containing Lisp code to pretty-print." (insert ")"))) (defun pp--format-definition (sexp indent edebug) - (while (and (cl-plusp indent) + (while (and (plusp indent) sexp) (insert " ") ;; We don't understand all the edebug specs. diff --git a/lisp/gnus/gnus-icalendar.el b/lisp/gnus/gnus-icalendar.el index c9f8055fa77..5a55efb3243 100644 --- a/lisp/gnus/gnus-icalendar.el +++ b/lisp/gnus/gnus-icalendar.el @@ -510,7 +510,8 @@ Return nil for non-recurring EVENT." ;; A 0:0 - A .:. -> A 0:0-.:. (default 1) ;; A 0:0 - A+n .:. -> A - A+n .:. ((and start-at-midnight - (cl-plusp start-end-date-diff)) (format "<%s>--<%s %s>" start-date end-date end-time)) + (plusp start-end-date-diff)) + (format "<%s>--<%s %s>" start-date end-date end-time)) ;; default ;; A .:. - A .:. -> A .:.-.:. ;; A .:. - B .:. diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el index c36804c1033..d8e44bbd8f9 100644 --- a/lisp/ibuffer.el +++ b/lisp/ibuffer.el @@ -1506,7 +1506,7 @@ If point is on a group name, this function operates on that group." (max (nth 2 form)) (align (nth 3 form)) (elide (nth 4 form))) - (let* ((from-end-p (when (cl-minusp min) + (let* ((from-end-p (when (minusp min) (setq min (- min)) t)) (letbindings nil) @@ -2057,7 +2057,7 @@ the value of point at the beginning of the line for that buffer." element (pcase-let ((`(,sym ,min ,_max ,align) element)) ;; Ignore negative MIN, since the titles are left-aligned. - (when (cl-minusp min) + (when (minusp min) (setq min (- min))) (let* ((name (or (get sym 'ibuffer-column-name) (error "Unknown column %s in ibuffer-formats" sym))) @@ -2082,7 +2082,7 @@ the value of point at the beginning of the line for that buffer." (make-string (length element) ?\s) (pcase-let ((`(,sym ,min ,_max ,align) element)) ;; Ignore negative MIN, since the summaries are left-aligned. - (when (cl-minusp min) + (when (minusp min) (setq min (- min))) (let* ((summary (if (get sym 'ibuffer-column-summarizer) diff --git a/lisp/image-mode.el b/lisp/image-mode.el index dfd3d5504f6..47cda0a50cf 100644 --- a/lisp/image-mode.el +++ b/lisp/image-mode.el @@ -1566,7 +1566,7 @@ The percentage is in relation to the original size of the image." (interactive (list (read-number "Scale (% of original): " 100 'read-number-history)) image-mode) - (unless (cl-plusp scale) + (unless (plusp scale) (error "Not a positive number: %s" scale)) (setq image-transform-resize (/ scale 100.0)) (image-toggle-display-image)) diff --git a/lisp/international/emoji.el b/lisp/international/emoji.el index d39dc3c77cd..7691a017332 100644 --- a/lisp/international/emoji.el +++ b/lisp/international/emoji.el @@ -222,7 +222,7 @@ the name is not known." (cl-loop for i from 0 for glyph in alist do - (when (and (cl-plusp i) + (when (and (plusp i) (zerop (mod i width))) (insert "\n")) (insert @@ -681,7 +681,7 @@ We prefer the earliest unique letter." ""))) strings))))) nil t))) - (if (cl-plusp (length name)) + (if (plusp (length name)) (let ((glyph (if emoji-alternate-names (cadr (split-string name "\t")) (gethash name emoji--all-bases)))) diff --git a/lisp/textmodes/dns-mode.el b/lisp/textmodes/dns-mode.el index 074819b3a59..5e0d47120d8 100644 --- a/lisp/textmodes/dns-mode.el +++ b/lisp/textmodes/dns-mode.el @@ -325,7 +325,7 @@ See `dns-mode-ipv6-to-nibbles' for examples." (string-to-number chunk 16))))) (rev-address-nibbles (nreverse (if (and prefix-length - (cl-minusp prefix-length)) + (minusp prefix-length)) (substring expanded-address prefix-length-nibbles) (substring expanded-address 0 prefix-length-nibbles))))) (with-temp-buffer @@ -334,7 +334,7 @@ See `dns-mode-ipv6-to-nibbles' for examples." (insert char) (insert ".")) (if (and prefix-length - (cl-minusp prefix-length)) + (minusp prefix-length)) (delete-char -1) (insert "ip6.arpa.")) (insert " ") diff --git a/test/lisp/emacs-lisp/bytecomp-tests.el b/test/lisp/emacs-lisp/bytecomp-tests.el index 25e5f483f4b..d5f76fd0230 100644 --- a/test/lisp/emacs-lisp/bytecomp-tests.el +++ b/test/lisp/emacs-lisp/bytecomp-tests.el @@ -1704,8 +1704,8 @@ writable (Bug#44631)." (set-file-modes directory #o500) (should (byte-compile-file input-file)) (should (file-regular-p output-file)) - (should (cl-plusp (file-attribute-size - (file-attributes output-file))))) + (should (plusp (file-attribute-size + (file-attributes output-file))))) ;; Allow the directory to be deleted. (set-file-modes directory #o777))))) @@ -1757,8 +1757,8 @@ mountpoint (Bug#44631)." (ert-fail `((status . ,status) (output . ,(buffer-string))))))) (should (file-regular-p output-file)) - (should (cl-plusp (file-attribute-size - (file-attributes output-file))))) + (should (plusp (file-attribute-size + (file-attributes output-file))))) ;; Allow the directory to be deleted. (set-file-modes directory #o777)))))) @@ -1772,8 +1772,8 @@ mountpoint (Bug#44631)." nil "test.el" nil nil nil 'excl) (should (byte-compile-file "test.el")) (should (file-regular-p "test.elc")) - (should (cl-plusp (file-attribute-size - (file-attributes "test.elc"))))))) + (should (plusp (file-attribute-size + (file-attributes "test.elc"))))))) (defun bytecomp-tests--get-vars () (list (ignore-errors (symbol-value 'bytecomp-tests--var1)) diff --git a/test/lisp/emacs-lisp/cl-seq-tests.el b/test/lisp/emacs-lisp/cl-seq-tests.el index 934304b878a..3e05ff639d7 100644 --- a/test/lisp/emacs-lisp/cl-seq-tests.el +++ b/test/lisp/emacs-lisp/cl-seq-tests.el @@ -645,7 +645,7 @@ Additionally register an `ert-info' to help identify test failures." (should (equal result '(a a a a)))) (let ((result (cl-member-if #'evenp '()))) (should (equal result nil))) - (let ((result (cl-member-if #'cl-minusp '(1 2 3 4 5)))) + (let ((result (cl-member-if #'minusp '(1 2 3 4 5)))) (should (equal result nil))) (let ((result (cl-member-if (lambda (x) (and (numberp x) (<= x 2))) '(1 "two" 3 0)))) @@ -672,7 +672,7 @@ Additionally register an `ert-info' to help identify test failures." (should (equal result nil))) (let ((result (cl-member-if-not (lambda (x) (eq x 'a)) '(a a a a)))) (should (equal result nil))) - (let ((result (cl-member-if-not #'cl-minusp '(1 2 3 4 5)))) + (let ((result (cl-member-if-not #'minusp '(1 2 3 4 5)))) (should (equal result '(1 2 3 4 5)))) (let ((result (cl-member-if-not (lambda (x) (or (numberp x) (stringp x) (eq x 'b))) @@ -734,7 +734,7 @@ Additionally register an `ert-info' to help identify test failures." (let* ((alist '((1 . "odd") (2 . "even") (3 . "odd") (4 . "even"))) (result (cl-assoc-if-not #'evenp alist))) (should (equal result '(1 . "odd")))) - (let ((result (cl-assoc-if-not #'cl-plusp + (let ((result (cl-assoc-if-not #'plusp '((1 . "one") (2 . "two") (3 . "three"))))) (should (equal result nil))) (let ((result (cl-assoc-if-not (lambda (x) (< x 5)) @@ -798,7 +798,7 @@ Additionally register an `ert-info' to help identify test failures." (should (equal result '("one" . 1)))) (let ((result (cl-rassoc-if #'evenp '()))) (should (equal result nil))) - (let ((result (cl-rassoc-if #'cl-plusp + (let ((result (cl-rassoc-if #'plusp '(("first" . 1) ("second" . 2) ("third" . 3))))) (should (equal result '("first" . 1)))) (let ((result (cl-rassoc-if (lambda (x) (string= (number-to-string x) "two")) @@ -812,7 +812,7 @@ Additionally register an `ert-info' to help identify test failures." (let ((result (cl-rassoc-if-not #'evenp '(("one" . 1) ("two" . 2) ("three" . 3))))) (should (equal result '("one" . 1)))) - (let ((result (cl-rassoc-if-not #'cl-plusp + (let ((result (cl-rassoc-if-not #'plusp '(("one" . 1) ("two" . 2) ("three" . 3))))) (should (equal result nil))) (let ((result (cl-rassoc-if-not (lambda (x) (< x 5)) diff --git a/test/src/emacs-module-tests.el b/test/src/emacs-module-tests.el index 03ab50d5adb..fa585b48df7 100644 --- a/test/src/emacs-module-tests.el +++ b/test/src/emacs-module-tests.el @@ -376,7 +376,7 @@ Interactively, you can try hitting \\[keyboard-quit] to quit." (should (consp result)) (should (integerp (car result))) (should (integerp (cdr result))) - (should (cl-plusp (cdr result))) + (should (plusp (cdr result))) (should (time-equal-p result desired-result)))))) (ert-deftest mod-test-add-nanosecond/nil () -- 2.39.5