diff options
| author | Glenn Morris | 2011-05-26 21:54:56 -0400 |
|---|---|---|
| committer | Glenn Morris | 2011-05-26 21:54:56 -0400 |
| commit | 4b29d9fbfb7e347844dd0fa68be44b8c635f6f34 (patch) | |
| tree | e72e1440f5e1d16d3f82a2021722fba7dba1c480 | |
| parent | 954595718400df00ef68680f76c2631c5cd83e72 (diff) | |
| download | emacs-4b29d9fbfb7e347844dd0fa68be44b8c635f6f34.tar.gz emacs-4b29d9fbfb7e347844dd0fa68be44b8c635f6f34.zip | |
* lisp/shell.el (shell-directory-tracker): Case matters. (Bug#8735)
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/shell.el | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index acde2b246c8..011e5e23e71 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2011-05-27 Glenn Morris <rgm@gnu.org> | 1 | 2011-05-27 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * shell.el (shell-directory-tracker): Case matters. (Bug#8735) | ||
| 4 | |||
| 3 | * files.el (set-auto-mode): | 5 | * files.el (set-auto-mode): |
| 4 | Also respect mode: entries at the end of the file. (Bug#8586) | 6 | Also respect mode: entries at the end of the file. (Bug#8586) |
| 5 | 7 | ||
diff --git a/lisp/shell.el b/lisp/shell.el index 53455944ee6..e07f996823e 100644 --- a/lisp/shell.el +++ b/lisp/shell.el | |||
| @@ -704,6 +704,7 @@ Environment variables are expanded, see function `substitute-in-file-name'." | |||
| 704 | (concat "^" shell-command-separator-regexp) | 704 | (concat "^" shell-command-separator-regexp) |
| 705 | str) ; skip whitespace | 705 | str) ; skip whitespace |
| 706 | (match-end 0))) | 706 | (match-end 0))) |
| 707 | (case-fold-search) | ||
| 707 | end cmd arg1) | 708 | end cmd arg1) |
| 708 | (while (string-match shell-command-regexp str start) | 709 | (while (string-match shell-command-regexp str start) |
| 709 | (setq end (match-end 0) | 710 | (setq end (match-end 0) |