diff options
| author | Juri Linkov | 2014-03-29 19:59:36 +0200 |
|---|---|---|
| committer | Juri Linkov | 2014-03-29 19:59:36 +0200 |
| commit | 8778eb5efac3bf8936fdf22231b46ac0f88e0ab5 (patch) | |
| tree | 96e07ed8f1b6711811c3ab09072da4c5d70c2c4e | |
| parent | 929c0500cc92dae4d2c3be18121f455fd5b325d6 (diff) | |
| download | emacs-8778eb5efac3bf8936fdf22231b46ac0f88e0ab5.tar.gz emacs-8778eb5efac3bf8936fdf22231b46ac0f88e0ab5.zip | |
* lisp/dired-aux.el (dired-compress-file): Don't use string-match-p
because its match data is used afterwards.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/dired-aux.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 66d5910b280..381aeda8cb4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-03-29 Juri Linkov <juri@jurta.org> | ||
| 2 | |||
| 3 | * dired-aux.el (dired-compress-file): Don't use string-match-p | ||
| 4 | because its match data is used afterwards. | ||
| 5 | |||
| 1 | 2014-03-28 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2014-03-28 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * emacs-lisp/package.el (package-built-in-p): Treat a min-version of | 8 | * emacs-lisp/package.el (package-built-in-p): Treat a min-version of |
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el index 1129dfd89f6..b1d5f4e53b0 100644 --- a/lisp/dired-aux.el +++ b/lisp/dired-aux.el | |||
| @@ -887,7 +887,7 @@ Otherwise, the rule is a compression rule, and compression is done with gzip.") | |||
| 887 | ;; See if any suffix rule matches this file name. | 887 | ;; See if any suffix rule matches this file name. |
| 888 | (while suffixes | 888 | (while suffixes |
| 889 | (let (case-fold-search) | 889 | (let (case-fold-search) |
| 890 | (if (string-match-p (car (car suffixes)) file) | 890 | (if (string-match (car (car suffixes)) file) |
| 891 | (setq suffix (car suffixes) suffixes nil)) | 891 | (setq suffix (car suffixes) suffixes nil)) |
| 892 | (setq suffixes (cdr suffixes)))) | 892 | (setq suffixes (cdr suffixes)))) |
| 893 | ;; If so, compute desired new name. | 893 | ;; If so, compute desired new name. |