procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Prefer plusp/minusp to cl-plusp/cl-minusp

Browse source 
* 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.
This commit is contained in:
Stefan Kangas 2025-02-17 22:04:41 +01:00
parent afbf932106
commit 83bc811f7f
12 changed files with 35 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/dired.el
View file

@ -2914,7 +2914,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.
@ -2930,7 +2930,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))

6
lisp/emacs-lisp/ert.el
View file

@ -1419,7 +1419,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)
""))))
@ -1432,7 +1432,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)
""))))
@ -2123,7 +2123,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))

2
lisp/emacs-lisp/pp.el
View file

@ -577,7 +577,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.

3
lisp/gnus/gnus-icalendar.el
View file

@ -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 .:.

6
lisp/ibuffer.el
View file

@ -1504,7 +1504,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)
@ -2055,7 +2055,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)))
@ -2080,7 +2080,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)

2
lisp/image-mode.el
View file

@ -1564,7 +1564,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))

4
lisp/international/emoji.el
View file

@ -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
@ -680,7 +680,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))))

14
lisp/progmodes/ebrowse.el
View file

@ -1334,7 +1334,7 @@ Pop to member buffer if no prefix ARG, to tree buffer otherwise."
"Indentation"
(int-to-string ebrowse--indentation))
nil nil ebrowse--indentation))))
(when (cl-plusp width)
(when (plusp width)
(setq-local ebrowse--indentation width)
(ebrowse-redraw-tree))))
@ -2168,7 +2168,7 @@ The new width is read from the minibuffer."
ebrowse--decl-column
ebrowse--column-width))
"): ")))))
(when (cl-plusp width)
(when (plusp width)
(if ebrowse--long-display-flag
(setq ebrowse--decl-column width)
(setq ebrowse--column-width width))
@ -2209,11 +2209,11 @@ make one."
ebrowse--accessor
#'eql)))
(setf ebrowse--accessor
(cond ((cl-plusp incr)
(cond ((plusp incr)
(or (nth (1+ index)
ebrowse-member-list-accessors)
(cl-first ebrowse-member-list-accessors)))
((cl-minusp incr)
((minusp incr)
(or (and (>= (cl-decf index) 0)
(nth index
ebrowse-member-list-accessors))
@ -2693,7 +2693,7 @@ TREE is the class tree in which the members are found."
(when (>= i ebrowse--n-columns)
(setf i 0)
(insert "\n")))))
(when (cl-plusp i)
(when (plusp i)
(insert "\n"))
(goto-char (point-min))))
@ -2863,7 +2863,7 @@ Prefix arg INC specifies which one."
(setq index (+ inc (seq-position containing-list
ebrowse--displayed-class
#'eql)))
(cond ((cl-minusp index) (message "No previous class"))
(cond ((minusp index) (message "No previous class"))
((null (nth index containing-list)) (message "No next class")))
(setq index (max 0 (min index (1- (length containing-list)))))
(setq cls (nth index containing-list))
@ -3729,7 +3729,7 @@ Positions in buffers that have no file names are not saved."
(let ((too-much (- (length ebrowse-position-stack)
ebrowse-max-positions)))
;; Do not let the stack grow to infinity.
(when (cl-plusp too-much)
(when (plusp too-much)
(setq ebrowse-position-stack
(butlast ebrowse-position-stack too-much)))
;; Push the position.

4
lisp/textmodes/dns-mode.el
View file

@ -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 " ")

12
test/lisp/emacs-lisp/bytecomp-tests.el
View file

@ -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))

10
test/lisp/emacs-lisp/cl-seq-tests.el
View file

@ -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))

2
test/src/emacs-module-tests.el
View file

@ -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 ()