[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 8e20da1517a 8/8: Simplify rng-substq with cl-substitute
From: |
Stefan Kangas |
Subject: |
master 8e20da1517a 8/8: Simplify rng-substq with cl-substitute |
Date: |
Sat, 5 Aug 2023 12:00:12 -0400 (EDT) |
branch: master
commit 8e20da1517aa585e6286fa8e439db10fb62aaa57
Author: Stefan Kangas <stefankangas@gmail.com>
Commit: Stefan Kangas <stefankangas@gmail.com>
Simplify rng-substq with cl-substitute
* lisp/nxml/rng-util.el (rng-substq): Simplify.
(cl-lib): Require.
---
lisp/nxml/rng-util.el | 23 +++--------------------
1 file changed, 3 insertions(+), 20 deletions(-)
diff --git a/lisp/nxml/rng-util.el b/lisp/nxml/rng-util.el
index 27c924d960f..4f49885fc45 100644
--- a/lisp/nxml/rng-util.el
+++ b/lisp/nxml/rng-util.el
@@ -24,6 +24,8 @@
;;; Code:
+(require 'cl-lib)
+
(defun rng-make-datatypes-uri (uri)
(if (string-equal uri "")
;; The spec doesn't say to do this, but it's perfectly conformant
@@ -39,26 +41,7 @@
(defun rng-substq (new old list)
"Replace first member of LIST (if any) that is `eq' to OLD by NEW.
LIST is not modified."
- (cond ((null list) nil)
- ((eq (car list) old)
- (cons new (cdr list)))
- (t
- (let ((tail (cons (car list)
- nil))
- (rest (cdr list)))
- (setq list tail)
- (while rest
- (let ((item (car rest)))
- (setq rest (cdr rest))
- (cond ((eq item old)
- (setcdr tail
- (cons new rest))
- (setq rest nil))
- (t
- (setq tail
- (setcdr tail
- (cons item nil))))))))
- list)))
+ (cl-substitute new old list :count 1 :test #'eq))
(defun rng-escape-string (s)
(replace-regexp-in-string "[&\"<>]"
- master updated (5683c4bad3c -> 8e20da1517a), Stefan Kangas, 2023/08/05
- master 25641c3e882 2/8: Add crossref to set-default-file-modes docstring, Stefan Kangas, 2023/08/05
- master 8e20da1517a 8/8: Simplify rng-substq with cl-substitute,
Stefan Kangas <=
- master 3b2b0b5f921 5/8: Fix eshell "ls" command for files larger than 1TiB, Stefan Kangas, 2023/08/05
- master ed395444504 7/8: Make eshell-redisplay into alias for redisplay, Stefan Kangas, 2023/08/05
- master 7df1adab1e1 6/8: Use file-size-human-readable in eshell, Stefan Kangas, 2023/08/05
- master ee788ab2f81 4/8: ; * lisp/eshell/esh-util.el: Delete redundant autoload., Stefan Kangas, 2023/08/05
- master 3f8db3bbe5e 1/8: image-dired: Fix gallery directory permissions, Stefan Kangas, 2023/08/05
- master 88ce2a5624b 3/8: Simplify pcomplete-uniquify-list, Stefan Kangas, 2023/08/05