diff options
| author | Eli Zaretskii | 2025-03-01 10:01:53 -0500 |
|---|---|---|
| committer | Eli Zaretskii | 2025-03-01 10:01:53 -0500 |
| commit | a7e75dbabdf8b36c38e32bfedad23b25657c056e (patch) | |
| tree | b109afa8be4f3726df97dd05b3b1de029e657cea | |
| parent | f7e1fa88a11471f5f2846b0379236ea2e232e28d (diff) | |
| parent | 5247da2e3cd2705278bb68e0c5313a6972a6d43c (diff) | |
| download | emacs-a7e75dbabdf8b36c38e32bfedad23b25657c056e.tar.gz emacs-a7e75dbabdf8b36c38e32bfedad23b25657c056e.zip | |
Merge from origin/emacs-30
5247da2e3cd * lisp/proced.el (proced-<): Check, that NUM1 and NUM2 ar...
| -rw-r--r-- | lisp/proced.el | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lisp/proced.el b/lisp/proced.el index 7bc6b44eee4..7c605aaa192 100644 --- a/lisp/proced.el +++ b/lisp/proced.el | |||
| @@ -1423,10 +1423,12 @@ a certain refinement, consider defining a new filter in `proced-filter-alist'." | |||
| 1423 | 1423 | ||
| 1424 | (defun proced-< (num1 num2) | 1424 | (defun proced-< (num1 num2) |
| 1425 | "Return t if NUM1 less than NUM2. | 1425 | "Return t if NUM1 less than NUM2. |
| 1426 | Return `equal' if NUM1 equals NUM2. Return nil if NUM1 greater than NUM2." | 1426 | Return `equal' if NUM1 equals NUM2. Return nil if NUM1 greater than NUM2. |
| 1427 | (if (= num1 num2) | 1427 | If either NUM1 or NUM2 is not a number, return nil." |
| 1428 | 'equal | 1428 | (when (and (numberp num1) (numberp num2)) |
| 1429 | (< num1 num2))) | 1429 | (if (= num1 num2) |
| 1430 | 'equal | ||
| 1431 | (< num1 num2)))) | ||
| 1430 | 1432 | ||
| 1431 | (defun proced-string-lessp (s1 s2) | 1433 | (defun proced-string-lessp (s1 s2) |
| 1432 | "Return t if string S1 is less than S2 in lexicographic order. | 1434 | "Return t if string S1 is less than S2 in lexicographic order. |