[Emacs-diffs] emacs-24 r116921: * lisp/shell.el (shell-directory-tracker): Go back to just ignoring failures.

[Glenn Morris]

------------------------------------------------------------
revno: 116921
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/17159
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Sun 2014-04-06 18:27:32 -0700
message:
  * lisp/shell.el (shell-directory-tracker): Go back to just ignoring failures.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/shell.el                  shell.el-20091113204419-o5vbwnq5f7feedwu-150

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-04-07 00:04:00 +0000
+++ b/lisp/ChangeLog    2014-04-07 01:27:32 +0000
@@ -1,3 +1,8 @@
+2014-04-07  Glenn Morris  <address@hidden>
+
+       * shell.el (shell-directory-tracker):
+       Go back to just ignoring failures.  (Bug#17159)
+
 2014-04-06  João Távora  <address@hidden>
 
        Fix `electric-pair-delete-adjacent-pairs' in modes binding

=== modified file 'lisp/shell.el'
--- a/lisp/shell.el     2014-02-10 01:34:22 +0000
+++ b/lisp/shell.el     2014-04-07 01:27:32 +0000
@@ -792,8 +792,11 @@
 Environment variables are expanded, see function `substitute-in-file-name'."
   (if shell-dirtrackp
       ;; We fail gracefully if we think the command will fail in the shell.
-      (with-demoted-errors "Couldn't cd: %s"
-         (let ((start (progn (string-match
+;;;      (with-demoted-errors "Directory tracker failure: %s"
+      ;; This fails so often that it seems better to just ignore errors (?).
+      ;; Eg even: foo=/tmp; cd $foo is beyond us (bug#17159).
+      (ignore-errors
+        (let ((start (progn (string-match
                               (concat "^" shell-command-separator-regexp)
                               str) ; skip whitespace
                              (match-end 0)))