* lisp/shell.el (shell-dir-cookie-re): Move definition before use.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bd92ca9eb1d44835d749b0765ab3e4e2c4687ea2..03e8b609d981bc9660783ef678b537176bae5df5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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.
 

diff --git a/lisp/shell.el b/lisp/shell.el
index 4288834e029b7e0266c89520d7407fdc4373a239..815add76502cddc3b2f0433268a01bf4b6fea296 100644 (file)
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -368,6 +368,17 @@ Thus, this does not include the shell's current directory.")
 
 ;;; 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 @@ Otherwise, one argument `-i' is passed to the shell.
 ;; 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 @@ to `dirtrack-mode'."
        ((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.