From 66a100be19467e6f616c5f6542b9e3f854cf079c Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Wed, 22 Aug 2007 19:47:57 +0000 Subject: [PATCH] * comint.el (comint-exec-1): Raise an error if `start-file-process' does not return a process object. * shell.el (shell): Prompt for `default-directory' if it is a remote file name, and if called with a prefix arg. --- lisp/ChangeLog | 8 ++++++++ lisp/comint.el | 2 ++ lisp/shell.el | 12 +++++++++++- 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6a4e181ac6c..dcde501f18a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2007-08-22 Michael Albinus + + * comint.el (comint-exec-1): Raise an error if + `start-file-process' does not return a process object. + + * shell.el (shell): Prompt for `default-directory' if it is a + remote file name, and if called with a prefix arg. + 2007-08-22 Sam Steingold * pcvs.el (cvs-vc-command-advice): Fix a typo in code (file->files). diff --git a/lisp/comint.el b/lisp/comint.el index 23a78bba009..e8a6a139db5 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -783,6 +783,8 @@ buffer. The hook `comint-exec-hook' is run after each exec." ;; first look relative to the current directory. (cons default-directory exec-path) exec-path))) (setq proc (apply 'start-file-process name buffer command switches))) + ;; Some file name handler cannot start a process, fe ange-ftp. + (unless (processp proc) (error "No process started")) (let ((coding-systems (process-coding-system proc))) (setq decoding (car coding-systems) encoding (cdr coding-systems))) diff --git a/lisp/shell.el b/lisp/shell.el index 03fbf46df67..6c09654a0e5 100644 --- a/lisp/shell.el +++ b/lisp/shell.el @@ -511,6 +511,9 @@ Sentinels will always get the two parameters PROCESS and EVENT." (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 `default-directory' is a remote file name, it is also prompted +to change if called with a prefix arg. + 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', @@ -540,7 +543,14 @@ Otherwise, one argument `-i' is passed to the shell. (list (and current-prefix-arg (read-buffer "Shell buffer: " - (generate-new-buffer-name "*shell*"))))) + (generate-new-buffer-name "*shell*")) + (file-remote-p default-directory) + ;; It must be possible to declare a local default-directory. + (setq default-directory + (expand-file-name + (read-file-name + "Default directory: " default-directory default-directory + t nil 'file-directory-p)))))) (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). -- 2.39.2