X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/5762abecd390e960b2a15bc58b5ed6a07af5955f..25d2f683b3e5c624f23fb395fcf96e7c3b21a03e:/lisp/shell.el diff --git a/lisp/shell.el b/lisp/shell.el index 13d1d9adb6..0a4119f0f8 100644 --- a/lisp/shell.el +++ b/lisp/shell.el @@ -1,8 +1,8 @@ -;;; shell.el --- specialized comint.el for running the shell. +;;; shell.el --- specialized comint.el for running the shell -;; Copyright (C) 1988, 93, 94, 95, 96, 1997 Free Software Foundation, Inc. +;; Copyright (C) 1988, 93, 94, 95, 96, 1997, 2000 Free Software Foundation, Inc. -;; Author: Olin Shivers then +;; Author: Olin Shivers ;; Simon Marshall ;; Maintainer: FSF ;; Keywords: processes @@ -37,7 +37,7 @@ ;; featureful, robust, and uniform than the Emacs 18 version. ;; Since this mode is built on top of the general command-interpreter-in- -;; a-buffer mode (comint mode), it shares a common base functionality, +;; a-buffer mode (comint mode), it shares a common base functionality, ;; and a common set of bindings, with all modes derived from comint mode. ;; This makes these modes easier to use. @@ -46,7 +46,7 @@ ;; For further information on shell mode, see the comments below. ;; Needs fixin: -;; When sending text from a source file to a subprocess, the process-mark can +;; When sending text from a source file to a subprocess, the process-mark can ;; move off the window, so you can lose sight of the process interactions. ;; Maybe I should ensure the process mark is in the window when I send ;; text to the process? Switch selectable? @@ -58,7 +58,7 @@ ;; ;; Define M-# to run some strange command: ;; (eval-after-load "shell" ;; '(define-key shell-mode-map "\M-#" 'shells-dynamic-spell)) - + ;; Brief Command Documentation: ;;============================================================================ ;; Comint Mode Commands: (common to shell and all comint-derived modes) @@ -100,7 +100,7 @@ ;; compatibility. ;; Read the rest of this file for more information. - + ;;; Code: (require 'comint) @@ -121,12 +121,24 @@ :group 'shell) ;;;###autoload +(defcustom shell-dumb-shell-regexp "cmd\\(proxy\\)?\\.exe" + "Regexp to match shells that don't save their command history, and +don't handle the backslash as a quote character. For shells that +match this regexp, Emacs will write out the command history when the +shell finishes, and won't remove backslashes when it unquotes shell +arguments." + :type 'regexp + :group 'shell) + (defcustom shell-prompt-pattern "^[^#$%>\n]*[#$%>] *" "Regexp to match prompts in the inferior shell. Defaults to \"^[^#$%>\\n]*[#$%>] *\", which works pretty well. -This variable is used to initialise `comint-prompt-regexp' in the +This variable is used to initialise `comint-prompt-regexp' in the shell buffer. +This variable is only used if the variable +`comint-use-prompt-regexp-instead-of-fields' is non-nil. + The pattern should probably not match more than one line. If it does, Shell mode may become confused trying to distinguish prompt from input on lines which don't start with a prompt. @@ -232,7 +244,7 @@ This mirrors the optional behavior of tcsh." :group 'shell-directories) (defcustom shell-chdrive-regexp - (if (memq system-type '(ms-dos windows-nt)) + (if (memq system-type '(ms-dos windows-nt)) ; NetWare allows the five chars between upper and lower alphabetics. "[]a-zA-Z^_`\\[\\\\]:" nil) @@ -318,17 +330,16 @@ Thus, this does not include the shell's current directory.") :group 'shell) (defvar shell-font-lock-keywords - '((eval . (cons shell-prompt-pattern 'font-lock-warning-face)) - ("[ \t]\\([+-][^ \t\n]+\\)" 1 font-lock-comment-face) + '(("[ \t]\\([+-][^ \t\n]+\\)" 1 font-lock-comment-face) ("^[^ \t\n]+:.*" . font-lock-string-face) ("^\\[[1-9][0-9]*\\]" . font-lock-string-face)) "Additional expressions to highlight in Shell mode.") - + ;;; Basic Procedures (put 'shell-mode 'mode-class 'special) -(defun shell-mode () +(define-derived-mode shell-mode comint-mode "Shell" "Major mode for interacting with an inferior shell. \\[comint-send-input] after the end of the process' output sends the text from the end of process to the end of the current line. @@ -351,7 +362,7 @@ to continue it. keep this buffer's default directory the same as the shell's working directory. While directory tracking is enabled, the shell's working directory is displayed by \\[list-buffers] or \\[mouse-buffer-menu] in the `File' field. -\\[dirs] queries the shell and resyncs Emacs' idea of what the current +\\[dirs] queries the shell and resyncs Emacs' idea of what the current directory stack is. \\[dirtrack-mode] turns directory tracking on and off. @@ -361,9 +372,9 @@ Customization: Entry to this mode runs the hooks on `comint-mode-hook' and `comint-input-filter-functions' are run. After each shell output, the hooks on `comint-output-filter-functions' are run. -Variables `shell-cd-regexp', `shell-chdrive-regexp', `shell-pushd-regexp' -and `shell-popd-regexp' are used to match their respective commands, -while `shell-pushd-tohome', `shell-pushd-dextract' and `shell-pushd-dunique' +Variables `shell-cd-regexp', `shell-chdrive-regexp', `shell-pushd-regexp' +and `shell-popd-regexp' are used to match their respective commands, +while `shell-pushd-tohome', `shell-pushd-dextract' and `shell-pushd-dunique' control the behavior of the relevant command. Variables `comint-completion-autolist', `comint-completion-addsuffix', @@ -380,11 +391,6 @@ Variables `comint-output-filter-functions', a hook, and `comint-scroll-to-bottom-on-input' and `comint-scroll-to-bottom-on-output' control whether input and output cause the window to scroll to the end of the buffer." - (interactive) - (comint-mode) - (setq major-mode 'shell-mode) - (setq mode-name "Shell") - (use-local-map shell-mode-map) (setq comint-prompt-regexp shell-prompt-pattern) (setq comint-completion-fignore shell-completion-fignore) (setq comint-delimiter-argument-list shell-delimiter-argument-list) @@ -419,18 +425,40 @@ buffer." (equal (file-truename comint-input-ring-file-name) (file-truename "/dev/null"))) (setq comint-input-ring-file-name nil)) + ;; Arrange to write out the input ring on exit, if the shell doesn't + ;; do this itself. + (if (and comint-input-ring-file-name + (string-match shell-dumb-shell-regexp shell)) + (set-process-sentinel (get-buffer-process (current-buffer)) + #'shell-write-history-on-exit)) (setq shell-dirstack-query (cond ((string-equal shell "sh") "pwd") ((string-equal shell "ksh") "echo $PWD ~-") (t "dirs")))) - (run-hooks 'shell-mode-hook) (comint-read-input-ring t)) - + +(defun shell-write-history-on-exit (process event) + "Called when the shell process is stopped. + +Writes the input history to a history file +`comint-input-ring-file-name' using `comint-write-input-ring' +and inserts a short message in the shell buffer. + +This function is a sentinel watching the shell interpreter process. +Sentinels will always get the two parameters PROCESS and EVENT." + ;; Write history. + (comint-write-input-ring) + (let ((buf (process-buffer process))) + (when (buffer-live-p buf) + (with-current-buffer buf + (insert (format "\nProcess %s %s\n" process event)))))) + ;;;###autoload -(defun shell () - "Run an inferior shell, with I/O through buffer *shell*. -If buffer exists but shell process is not running, make new shell. -If buffer exists and shell process is running, just switch to buffer `*shell*'. +(defun shell (&optional buffer) + "Run an inferior shell, with I/O through BUFFER (which defaults to `*shell*'). +Interactively, a prefix arg means to prompt for BUFFER. +If BUFFER exists but shell process is not running, make new shell. +If BUFFER exists and shell process is running, just switch to BUFFER. Program used comes from variable `explicit-shell-file-name', or (if that is nil) from the ESHELL environment variable, or else from SHELL if there is no ESHELL. @@ -454,30 +482,31 @@ its value is used as a list of arguments when invoking the shell. Otherwise, one argument `-i' is passed to the shell. \(Type \\[describe-mode] in the shell buffer for a list of commands.)" - (interactive) - (if (not (comint-check-proc "*shell*")) - (let* ((prog (or explicit-shell-file-name - (getenv "ESHELL") - (getenv "SHELL") - "/bin/sh")) - (name (file-name-nondirectory prog)) - (startfile (concat "~/.emacs_" name)) - (xargs-name (intern-soft (concat "explicit-" name "-args"))) - shell-buffer) - (save-excursion - (set-buffer (apply 'make-comint "shell" prog - (if (file-exists-p startfile) startfile) - (if (and xargs-name (boundp xargs-name)) - (symbol-value xargs-name) - '("-i")))) - (setq shell-buffer (current-buffer)) - (shell-mode)) - (pop-to-buffer shell-buffer)) - (pop-to-buffer "*shell*"))) + (interactive + (list + (and current-prefix-arg + (read-buffer "Shell buffer: " "*shell*")))) + (setq buffer (get-buffer-create (or buffer "*shell*"))) + ;; Pop to buffer, so that the buffer's window will be correctly set + ;; when we call comint (so that comint sets the COLUMNS env var properly). + (pop-to-buffer buffer) + (unless (comint-check-proc buffer) + (let* ((prog (or explicit-shell-file-name + (getenv "ESHELL") shell-file-name)) + (name (file-name-nondirectory prog)) + (startfile (concat "~/.emacs_" name)) + (xargs-name (intern-soft (concat "explicit-" name "-args")))) + (apply 'make-comint-in-buffer "shell" buffer prog + (if (file-exists-p startfile) startfile) + (if (and xargs-name (boundp xargs-name)) + (symbol-value xargs-name) + '("-i"))) + (shell-mode))) + buffer) ;;; Don't do this when shell.el is loaded, only while dumping. ;;;###autoload (add-hook 'same-window-buffer-names "*shell*") - + ;;; Directory tracking ;;; ;;; This code provides the shell mode input sentinel @@ -506,7 +535,7 @@ Otherwise, one argument `-i' is passed to the shell. ;;; ;;; The solution is to relax, not stress out about it, and settle for ;;; a hack that works pretty well in typical circumstances. Remember -;;; that a half-assed solution is more in keeping with the spirit of Unix, +;;; that a half-assed solution is more in keeping with the spirit of Unix, ;;; anyway. Blech. ;;; ;;; One good hack not implemented here for users of programmable shells @@ -528,7 +557,7 @@ You may toggle this tracking on and off with M-x dirtrack-mode. If emacs gets confused, you can resync with the shell with M-x dirs. See variables `shell-cd-regexp', `shell-chdrive-regexp', `shell-pushd-regexp', -and `shell-popd-regexp', while `shell-pushd-tohome', `shell-pushd-dextract', +and `shell-popd-regexp', while `shell-pushd-tohome', `shell-pushd-dextract', and `shell-pushd-dunique' control the behavior of the relevant command. Environment variables are expanded, see function `substitute-in-file-name'." @@ -568,9 +597,15 @@ Environment variables are expanded, see function `substitute-in-file-name'." (defun shell-unquote-argument (string) "Remove all kinds of shell quoting from STRING." (save-match-data - (let ((idx 0) next inside) + (let ((idx 0) next inside + (quote-chars + (if (string-match shell-dumb-shell-regexp + (file-name-nondirectory + (car (process-command (get-buffer-process (current-buffer)))))) + "['`\"]" + "[\\'`\"]"))) (while (and (< idx (length string)) - (setq next (string-match "[\\'`\"]" string next))) + (setq next (string-match quote-chars string next))) (cond ((= (aref string next) ?\\) (setq string (replace-match "" nil nil string)) (setq next (1+ next))) @@ -639,7 +674,7 @@ Environment variables are expanded, see function `substitute-in-file-name'." (cond ((> num (length shell-dirstack)) (message "Directory stack not that deep.")) ((= num 0) - (error (message "Couldn't cd."))) + (error (message "Couldn't cd"))) (shell-pushd-dextract (let ((dir (nth (1- num) shell-dirstack))) (shell-process-popd arg) @@ -692,7 +727,7 @@ Environment variables are expanded, see function `substitute-in-file-name'." (defun shell-resync-dirs () "Resync the buffer's idea of the current directory stack. -This command queries the shell with the command bound to +This command queries the shell with the command bound to `shell-dirstack-query' (default \"dirs\"), reads the next line output and parses it to form the new directory stack. DON'T issue this command unless the buffer is at a shell prompt. @@ -706,7 +741,7 @@ command again." (goto-char pmark) (insert shell-dirstack-query) (insert "\n") (sit-for 0) ; force redisplay - (comint-send-string proc shell-dirstack-query) + (comint-send-string proc shell-dirstack-query) (comint-send-string proc "\n") (set-marker pmark (point)) (let ((pt (point))) ; wait for 1 line @@ -735,7 +770,7 @@ command again." (setq shell-dirstack (cdr ds) shell-last-dir (car shell-dirstack)) (shell-dirstack-message)) - (error (message "Couldn't cd."))))))) + (error (message "Couldn't cd"))))))) ;;; For your typing convenience: (defalias 'dirs 'shell-resync-dirs) @@ -767,7 +802,7 @@ command again." (setq msg (concat msg (directory-file-name dir) " ")) (setq ds (cdr ds)))) (message "%s" msg)))) - + ;; This was mostly copied from shell-resync-dirs. (defun shell-snarf-envar (var) "Return as a string the shell's value of environment variable VAR." @@ -798,7 +833,7 @@ from Emacs." (interactive (list (read-envvar-name "\ Copy Shell environment variable to Emacs: "))) (setenv variable (shell-snarf-envar variable))) - + (defun shell-forward-command (&optional arg) "Move forward across ARG shell command(s). Does not cross lines. See `shell-command-regexp'." @@ -814,8 +849,8 @@ See `shell-command-regexp'." See `shell-command-regexp'." (interactive "p") (let ((limit (save-excursion (comint-bol nil) (point)))) - (if (> limit (point)) - (save-excursion (beginning-of-line) (setq limit (point)))) + (when (> limit (point)) + (setq limit (line-beginning-position))) (skip-syntax-backward " " limit) (if (re-search-backward (format "[;&|]+[\t ]*\\(%s\\)" shell-command-regexp) limit 'move arg) @@ -964,12 +999,12 @@ Returns t if successful." (cond ((null index) nil) ((>= index (length stack)) - (error "Directory stack not that deep.")) + (error "Directory stack not that deep")) (t (replace-match (file-name-as-directory (nth index stack)) t t) (message "Directory item: %d" index) t)))))) - + (provide 'shell) ;;; shell.el ends here