From: Michael Albinus <michael.albinus@gmx.de>
Date: Mon, 25 Mar 2013 09:16:31 +0000 (+0100)
Subject: * net/tramp.el (tramp-drop-volume-letter): Make it an ordinary
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1943^2~31
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4430bd53998ea752ce99b1c25384cf7cfabcef88;p=emacs.git

* net/tramp.el (tramp-drop-volume-letter): Make it an ordinary
defun.  Defining it as defalias could introduce too eager
byte-compiler optimization.  (Bug#14030)
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bd4f0494123..d843e0fa703 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2013-03-25  Michael Albinus  <michael.albinus@gmx.de>
+
+	* net/tramp.el (tramp-drop-volume-letter): Make it an ordinary
+	defun.  Defining it as defalias could introduce too eager
+	byte-compiler optimization.  (Bug#14030)
+
 2013-03-25  Chong Yidong  <cyd@gnu.org>
 
 	* iswitchb.el (iswitchb-read-buffer): Fix typo.
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index e392116d157..c4c8efcbfe8 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -1565,23 +1565,16 @@ FILE must be a local file name on a connection identified via VEC."
 (tramp-compat-font-lock-add-keywords
  'emacs-lisp-mode '("\\<with-tramp-connection-property\\>"))
 
-(defalias 'tramp-drop-volume-letter
-  (if (memq system-type '(cygwin windows-nt))
-      (lambda (name)
-	"Cut off unnecessary drive letter from file NAME.
+(defun tramp-drop-volume-letter (name)
+  "Cut off unnecessary drive letter from file NAME.
 The functions `tramp-*-handle-expand-file-name' call `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
-	  (if (string-match "\\`[a-zA-Z]:/" name)
-	      (replace-match "/" nil t name)
-	    name)))
-
-    'identity))
-
-(if (featurep 'xemacs)
-    (defalias 'tramp-drop-volume-letter 'identity))
+  (save-match-data
+    (if (string-match "\\`[a-zA-Z]:/" name)
+	(replace-match "/" nil t name)
+      name)))
 
 (defun tramp-cleanup (vec)
   "Cleanup connection VEC, but keep the debug buffer."