FW: shell: cd after &

[Marshall, Simon]

I don't know if anyone cares enough about this.  It's so long since I
maintained shell.el I don't know if it's worth it.

-----Original Message-----
From: Ilya N. Golubev [mailto:address@hidden 
Sent: 06 June 2003 18:27
To: address@hidden
Cc: Olin Shivers; Simon Marshall
Subject: shell: cd after &


Current version of `shell-directory-tracker' fails even on simple
command sequences: linear ones, where some commands are separated with
`&' rather than ';': `pushd dir;cmd&popd'.  The patch fixes this.

XEmacs/packages/xemacs-packages/xemacs-base/ChangeLog:

2003-06-06  Ilya N. Golubev  <address@hidden>

        * shell.el (shell-directory-tracker): Make regexp used for
        skipping to next command correspond to one used for command
        itself.
        (shell-command-separator-regexp): New variable.

--- shell.el    26 Nov 2002 19:38:35 -0000      1.9
+++ shell.el    6 Jun 2003 17:04:01 -0000
@@ -193,6 +193,12 @@
   :type 'regexp
   :group 'shell)
 
+(defcustom shell-command-separator-regexp "[;&|\n \t]*"
+  "*Regexp to match a single command within a pipeline.
+This is used for directory tracking and does not do a perfect job."
+  :type 'regexp
+  :group 'shell)
+
 (defcustom shell-completion-execonly t
   "*If non-nil, use executable files only for completion candidates.
 This mirrors the optional behavior of tcsh.
@@ -666,7 +672,9 @@
   (if shell-dirtrackp
       ;; We fail gracefully if we think the command will fail in the
shell.
       (condition-case chdir-failure
-         (let ((start (progn (string-match "^[; \t]*" str) ; skip
whitespace
+         (let ((start (progn (string-match
+                              (concat "^"
shell-command-separator-regexp)
+                              str) ; skip whitespace
                              (match-end 0)))
                end cmd arg1)
            (while (string-match shell-command-regexp str start)
@@ -704,7 +712,9 @@
                              ;; what
`shell-dirtrack-process-other-func'
                              ;; will want to do with it
                              arg1)))
-             (setq start (progn (string-match "[; \t]*" str end) ; skip
again
+             (setq start (progn (string-match
+                                 shell-command-separator-regexp str
end)
+                                ;; skip again
                                 (match-end 0)))))
        (error "Couldn't cd"))))