diff options
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/progmodes/grep.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0fe7ed67067..18a4eadbed7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2014-05-09 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * progmodes/grep.el (lgrep): Fix a typo in last commit. | ||
| 4 | |||
| 1 | 2014-05-09 Glenn Morris <rgm@gnu.org> | 5 | 2014-05-09 Glenn Morris <rgm@gnu.org> |
| 2 | 6 | ||
| 3 | * files.el (file-expand-wildcards): | 7 | * files.el (file-expand-wildcards): |
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el index d3e06892abf..d60534074b9 100644 --- a/lisp/progmodes/grep.el +++ b/lisp/progmodes/grep.el | |||
| @@ -904,7 +904,7 @@ This command shares argument histories with \\[rgrep] and \\[grep]." | |||
| 904 | (confirm (equal current-prefix-arg '(4)))) | 904 | (confirm (equal current-prefix-arg '(4)))) |
| 905 | (list regexp files dir confirm)))))) | 905 | (list regexp files dir confirm)))))) |
| 906 | (when (and (stringp regexp) (> (length regexp) 0)) | 906 | (when (and (stringp regexp) (> (length regexp) 0)) |
| 907 | (unless (and dir (file-acessible-directory-p dir)) | 907 | (unless (and dir (file-accessible-directory-p dir)) |
| 908 | (setq dir default-directory)) | 908 | (setq dir default-directory)) |
| 909 | (let ((command regexp)) | 909 | (let ((command regexp)) |
| 910 | (if (null files) | 910 | (if (null files) |