Merge from emacs-23; up to 2010-06-11T18:51:00Z!juri@jurta.org.

[gnu-emacs] / lisp / dirtrack.el

diff --git a/lisp/dirtrack.el b/lisp/dirtrack.el
index e65e5fc7560cd893d044b8640211322a91f125ee..c3dfc747772a3b4b773766f83180904c844020b5 100644 (file)
--- a/lisp/dirtrack.el
+++ b/lisp/dirtrack.el
@@ -1,7 +1,6 @@
 ;;; dirtrack.el --- Directory Tracking by watching the prompt
 
-;; Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005,
-;;   2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 2001-2011 Free Software Foundation, Inc.
 
 ;; Author: Peter Breton <pbreton@cs.umb.edu>
 ;; Created: Sun Nov 17 1996
@@ -143,15 +142,8 @@ be on a single line."
   :group 'dirtrack
   :type  'string)
 
-(defcustom dirtrackp t
-  "If non-nil, directory tracking via `dirtrack' is enabled."
-  :group 'dirtrack
-  :type  'boolean)
-
-(make-variable-buffer-local 'dirtrackp)
-
 (defcustom dirtrack-directory-function
-  (if (memq system-type (list 'ms-dos 'windows-nt 'cygwin))
+  (if (memq system-type '(ms-dos windows-nt cygwin))
       'dirtrack-windows-directory-function
     'file-name-as-directory)
   "Function to apply to the prompt directory for comparison purposes."
@@ -159,7 +151,7 @@ be on a single line."
   :type  'function)
 
 (defcustom dirtrack-canonicalize-function
-  (if (memq system-type (list 'ms-dos 'windows-nt 'cygwin))
+  (if (memq system-type '(ms-dos windows-nt cygwin))
       'downcase 'identity)
   "Function to apply to the default directory for comparison purposes."
   :group 'dirtrack
@@ -238,14 +230,14 @@ function `dirtrack-debug-mode' to turn on debugging output."
     (let (prompt-path
          (current-dir default-directory)
          (dirtrack-regexp    (nth 0 dirtrack-list))
-         (match-num          (nth 1 dirtrack-list))
+         (match-num          (nth 1 dirtrack-list)))
           ;; Currently unimplemented, it seems.  --Stef
-         (multi-line         (nth 2 dirtrack-list)))
+         ;; (multi-line      (nth 2 dirtrack-list)))
       (save-excursion
         ;; No match
         (if (not (string-match dirtrack-regexp input))
             (dirtrack-debug-message
-             (format "Input `%s' failed to match `dirtrack-regexp'" input))
+             (format "Input `%s' failed to match `dirtrack-list'" input))
           (setq prompt-path (match-string match-num input))
           ;; Empty string
           (if (not (> (length prompt-path) 0))
@@ -270,11 +262,10 @@ function `dirtrack-debug-mode' to turn on debugging output."
                        (run-hooks 'dirtrack-directory-change-hook)
                        (dirtrack-debug-message
                         (format "Changing directory to %s" prompt-path)))
-                (error "Directory %s does not exist" prompt-path)))
+                (warn "Directory %s does not exist" prompt-path)))
             )))))
   input)
 
 (provide 'dirtrack)
 
-;; arch-tag: 168de071-be88-4937-aff6-2aba9f328d5a
 ;;; dirtrack.el ends here