[Emacs-diffs] Changes to emacs/lisp/net/tramp.el,v

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       08/03/19 07:10:37

Index: tramp.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/tramp.el,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -b -r1.180 -r1.181
--- tramp.el    18 Mar 2008 09:17:44 -0000      1.180
+++ tramp.el    19 Mar 2008 07:10:36 -0000      1.181
@@ -3497,7 +3497,8 @@
 
 ;; Canonicalization of file names.
 
-(if (memq system-type '(cygwin windows-nt))
+(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'
@@ -3506,7 +3507,7 @@
 letter into the file name.  This function removes it."
       (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 @@
     ;; 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