aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/term
diff options
context:
space:
mode:
authorJuri Linkov2019-07-05 22:11:34 +0300
committerJuri Linkov2019-07-05 22:11:34 +0300
commitdde0320020429a2d2917895fc0e2f5a24ffe6348 (patch)
tree565e314230e08f4334fc7c484322f1a5d3672270 /lisp/term
parent44f199648b0c986a0ac7608f4e9d803c619ae2d6 (diff)
downloademacs-dde0320020429a2d2917895fc0e2f5a24ffe6348.tar.gz
emacs-dde0320020429a2d2917895fc0e2f5a24ffe6348.zip
* lisp/replace.el (replace-highlight): Add save-match-data (bug#36328)
* lisp/term/tty-colors.el (tty-color-canonicalize): Replace string-match with string-match-p. Thanks to Jayden Navarro <jayden@yugabyte.com> and Alan Mackenzie <acm@muc.de>
Diffstat (limited to 'lisp/term')
-rw-r--r--lisp/term/tty-colors.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/term/tty-colors.el b/lisp/term/tty-colors.el
index 307586f2213..5af8170203e 100644
--- a/lisp/term/tty-colors.el
+++ b/lisp/term/tty-colors.el
@@ -820,7 +820,7 @@ Value is the modified color alist for FRAME."
820 "Return COLOR in canonical form. 820 "Return COLOR in canonical form.
821A canonicalized color name is all-lower case, with any blanks removed." 821A canonicalized color name is all-lower case, with any blanks removed."
822 (let ((case-fold-search nil)) 822 (let ((case-fold-search nil))
823 (if (string-match "[A-Z ]" color) 823 (if (string-match-p "[A-Z ]" color)
824 (replace-regexp-in-string " +" "" (downcase color)) 824 (replace-regexp-in-string " +" "" (downcase color))
825 color))) 825 color)))
826 826