Mercurial > emacs
changeset 111739:ce132c9fdaf1
* lisp/shell.el (shell-dir-cookie-re): Move definition before use.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Fri, 26 Nov 2010 19:22:00 -0800 |
| parents | afde28b09d79 |
| children | 97a0564526d2 |
| files | lisp/ChangeLog lisp/shell.el |
| diffstat | 2 files changed, 13 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Nov 26 19:15:59 2010 -0800 +++ b/lisp/ChangeLog Fri Nov 26 19:22:00 2010 -0800 @@ -1,5 +1,7 @@ 2010-11-27 Glenn Morris <rgm@gnu.org> + * shell.el (shell-dir-cookie-re): Move definition before use. + * mail/emacsbug.el (report-emacs-bug-create-existing-bugs-buffer): Replace undefined CL functions.
--- a/lisp/shell.el Fri Nov 26 19:15:59 2010 -0800 +++ b/lisp/shell.el Fri Nov 26 19:22:00 2010 -0800 @@ -368,6 +368,17 @@ ;;; Basic Procedures +(defcustom shell-dir-cookie-re nil + "Regexp matching your prompt, including some part of the current directory. +If your prompt includes the current directory or the last few elements of it, +set this to a pattern that matches your prompt and whose subgroup 1 matches +the directory part of it. +This is used by `shell-dir-cookie-watcher' to try and use this info +to track your current directory. It can be used instead of or in addition +to `dirtrack-mode'." + :group 'shell + :type '(choice (const nil) regexp)) + (put 'shell-mode 'mode-class 'special) (define-derived-mode shell-mode comint-mode "Shell" @@ -629,16 +640,6 @@ ;; replace it with a process filter that watches for and strips out ;; these messages. -(defcustom shell-dir-cookie-re nil - "Regexp matching your prompt, including some part of the current directory. -If your prompt includes the current directory or the last few elements of it, -set this to a pattern that matches your prompt and whose subgroup 1 matches -the directory part of it. -This is used by `shell-dir-cookie-watcher' to try and use this info -to track your current directory. It can be used instead of or in addition -to `dirtrack-mode'." - :type '(choice (const nil) regexp)) - (defun shell-dir-cookie-watcher (text) ;; This is fragile: the TEXT could be split into several chunks and we'd ;; miss it. Oh well. It's a best effort anyway. I'd expect that it's @@ -652,7 +653,6 @@ ((string-match "\\`\\(.*\\)\\(?:/.*\\)?\n\\(.*/\\)\\1\\(?:/.*\\)?\\'" (setq text (concat dir "\n" default-directory))) (shell-cd (concat (match-string 2 text) dir))))))) - (defun shell-directory-tracker (str) "Tracks cd, pushd and popd commands issued to the shell.