aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2010-01-29 14:08:09 -0500
committerChong Yidong2010-01-29 14:08:09 -0500
commit1e86875746f1890ee62c8f1460ff905e50750aff (patch)
tree45df91585f5bf318fc17641ed69b79e495a3409e
parentc024ac081d2f128ab65b325a6db8bdc12dc081db (diff)
downloademacs-1e86875746f1890ee62c8f1460ff905e50750aff.tar.gz
emacs-1e86875746f1890ee62c8f1460ff905e50750aff.zip
Don't signal error on incorrect dirtrack regexp (Bug#5476)
* dirtrack.el (dirtrack): Warn instead of signalling error if the regexp is incorrect (Bug#5476).
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/dirtrack.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f8edcd6f38e..4a4baf917c0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12010-01-29 Chong Yidong <cyd@stupidchicken.com>
2
3 * dirtrack.el (dirtrack): Warn instead of signalling error if the
4 regexp is incorrect (Bug#5476).
5
12010-01-29 Michael Albinus <michael.albinus@gmx.de> 62010-01-29 Michael Albinus <michael.albinus@gmx.de>
2 7
3 * net/tramp.el (tramp-handle-insert-directory): Handle also 8 * net/tramp.el (tramp-handle-insert-directory): Handle also
diff --git a/lisp/dirtrack.el b/lisp/dirtrack.el
index 41ffc0e3195..c209a2a6eb9 100644
--- a/lisp/dirtrack.el
+++ b/lisp/dirtrack.el
@@ -270,7 +270,7 @@ function `dirtrack-debug-mode' to turn on debugging output."
270 (run-hooks 'dirtrack-directory-change-hook) 270 (run-hooks 'dirtrack-directory-change-hook)
271 (dirtrack-debug-message 271 (dirtrack-debug-message
272 (format "Changing directory to %s" prompt-path))) 272 (format "Changing directory to %s" prompt-path)))
273 (error "Directory %s does not exist" prompt-path))) 273 (warn "Directory %s does not exist" prompt-path)))
274 ))))) 274 )))))
275 input) 275 input)
276 276