[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master b7ca3d5: Avoid destroying match data in 'setenv' (B
From: |
Noam Postavsky |
Subject: |
[Emacs-diffs] master b7ca3d5: Avoid destroying match data in 'setenv' (Bug#32201) |
Date: |
Sat, 21 Jul 2018 21:29:07 -0400 (EDT) |
branch: master
commit b7ca3d5d932bad6900296679ab87f7d0d64d1de9
Author: John Shahid <address@hidden>
Commit: Noam Postavsky <address@hidden>
Avoid destroying match data in 'setenv' (Bug#32201)
* lisp/env.el (setenv,setenv-internal): Replace string-match with
string-match-p.
---
lisp/env.el | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lisp/env.el b/lisp/env.el
index e47eb57..7007ba3 100644
--- a/lisp/env.el
+++ b/lisp/env.el
@@ -113,11 +113,11 @@ Changes ENV by side-effect, and returns its new value."
(not keep-empty)
env
(stringp (car env))
- (string-match pattern (car env)))
+ (string-match-p pattern (car env)))
(cdr env)
;; Try to find existing entry for VARIABLE in ENV.
(while (and scan (stringp (car scan)))
- (when (string-match pattern (car scan))
+ (when (string-match-p pattern (car scan))
(if value
(setcar scan (concat variable "=" value))
(if keep-empty
@@ -184,7 +184,7 @@ a side-effect."
(setq variable (encode-coding-string variable locale-coding-system)))
(if (and value (multibyte-string-p value))
(setq value (encode-coding-string value locale-coding-system)))
- (if (string-match "=" variable)
+ (if (string-match-p "=" variable)
(error "Environment variable name `%s' contains `='" variable))
(if (string-equal "TZ" variable)
(set-time-zone-rule value))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master b7ca3d5: Avoid destroying match data in 'setenv' (Bug#32201),
Noam Postavsky <=