From: Jonas Bernoulli Date: Mon, 25 Oct 2021 18:16:54 +0000 (+0200) Subject: ; Revert parts of "Use string-replace instead of replace-regexp-in-string" X-Git-Tag: emacs-28.0.90~178 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=40400e69771eb955c80d64092256bd65466a7b14;p=emacs.git ; Revert parts of "Use string-replace instead of replace-regexp-in-string" "transient.el" is also distributed as a separate package, which supports Emacs versions as old as 25.1 (see "Package-Requires"). --- diff --git a/lisp/transient.el b/lisp/transient.el index 2adb4c573ee..c1b82377f68 100644 --- a/lisp/transient.el +++ b/lisp/transient.el @@ -3064,18 +3064,18 @@ Optional support for popup buttons is also implemented here." ((equal (seq-take seq len) transient--redisplay-key) (let ((pre (key-description (vconcat (seq-take seq len)))) (suf (key-description (vconcat (seq-drop seq len))))) - (setq pre (string-replace "RET" "C-m" pre)) - (setq pre (string-replace "TAB" "C-i" pre)) - (setq suf (string-replace "RET" "C-m" suf)) - (setq suf (string-replace "TAB" "C-i" suf)) + (setq pre (replace-regexp-in-string "RET" "C-m" pre t)) + (setq pre (replace-regexp-in-string "TAB" "C-i" pre t)) + (setq suf (replace-regexp-in-string "RET" "C-m" suf t)) + (setq suf (replace-regexp-in-string "TAB" "C-i" suf t)) ;; We use e.g. "-k" instead of the more correct "- k", ;; because the former is prettier. If we did that in ;; the definition, then we want to drop the space that ;; is reinserted above. False-positives are possible ;; for silly bindings like "-C-c C-c". (unless (string-match-p " " key) - (setq pre (string-replace " " "" pre)) - (setq suf (string-replace " " "" suf))) + (setq pre (replace-regexp-in-string " " "" pre)) + (setq suf (replace-regexp-in-string " " "" suf))) (concat (propertize pre 'face 'default) (and (string-prefix-p (concat pre " ") key) " ") (transient--colorize-key suf cmd)