Add 2011 to FSF/AIST copyright years.

[bpt/emacs.git] / lisp / dirtrack.el

diff --git a/lisp/dirtrack.el b/lisp/dirtrack.el
index 6b9a58e..50017a0 100644 (file)
--- a/lisp/dirtrack.el
+++ b/lisp/dirtrack.el
@@ -1,7 +1,7 @@
 ;;; dirtrack.el --- Directory Tracking by watching the prompt
 
 ;; Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005,
-;;   2006, 2007, 2008 Free Software Foundation, Inc.
+;;   2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 ;; Author: Peter Breton <pbreton@cs.umb.edu>
 ;; Created: Sun Nov 17 1996
@@ -9,10 +9,10 @@
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,9 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -247,7 +245,7 @@ function `dirtrack-debug-mode' to turn on debugging output."
         ;; 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))
@@ -272,7 +270,7 @@ 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)