mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-30 10:11:47 -07:00
Code Issues Projects Releases Wiki Activity

(tramp-drop-volume-letter): Evaluate when compiling.

Browse source
This commit is contained in:
Glenn Morris 2008-03-19 07:11:57 +00:00
parent 9f4e4f5bb9
commit 699a11fbb6
2 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -1,3 +1,9 @@
2008-03-19 Glenn Morris <rgm@gnu.org>
* net/tramp.el (tramp-drop-volume-letter): Evaluate when compiling.
(tramp-handle-shell-command): Use condition-case rather than
ignore-errors.
2008-03-19 Dan Nicolaescu <dann@ics.uci.edu>
* diff-mode.el (diff-header): Make the color louder.

15
lisp/net/tramp.el
View file

@ -3497,16 +3497,17 @@ This is like `dired-recursive-delete-directory' for Tramp files."
;; Canonicalization of file names.
(if (memq system-type '(cygwin windows-nt))
(defun tramp-drop-volume-letter (name)
"Cut off unnecessary drive letter from file NAME.
(eval-and-compile ; silence compiler
(if (memq system-type '(cygwin windows-nt))
(defun tramp-drop-volume-letter (name)
"Cut off unnecessary drive letter from file NAME.
The function `tramp-handle-expand-file-name' calls `expand-file-name'
locally on a remote file name. When the local system is a W32 system
but the remote system is Unix, this introduces a superfluous drive
letter into the file name. This function removes it."
(save-match-data (replace-regexp-in-string tramp-root-regexp "/" name)))
(save-match-data (replace-regexp-in-string tramp-root-regexp "/" name)))
(defalias 'tramp-drop-volume-letter 'identity))
(defalias 'tramp-drop-volume-letter 'identity)))
(defun tramp-handle-expand-file-name (name &optional dir)
"Like `expand-file-name' for Tramp files.
@ -3810,7 +3811,9 @@ Lisp error raised when PROGRAM is nil is trapped also, returning 1."
;; support 2 (asynchronous) processes in parallel.
(when p
(if (yes-or-no-p "A command is running. Kill it? ")
(ignore-errors (kill-process p))
(condition-case nil
(kill-process p)
(error nil))
(error "Shell command in progress")))
(with-current-buffer output-buffer