[Emacs-diffs] /srv/bzr/emacs/emacs-24 r111337: * net/tramp.el (tramp-drop-volume-letter): Make it an ordinary

[Michael Albinus]

------------------------------------------------------------
revno: 111337
committer: Michael Albinus <address@hidden>
branch nick: emacs-24
timestamp: Mon 2013-03-25 10:16:31 +0100
message:
  * 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)
modified:
  lisp/ChangeLog
  lisp/net/tramp.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-03-25 03:53:46 +0000
+++ b/lisp/ChangeLog    2013-03-25 09:16:31 +0000
@@ -1,3 +1,9 @@
+2013-03-25  Michael Albinus  <address@hidden>
+
+       * 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  <address@hidden>
 
        * iswitchb.el (iswitchb-read-buffer): Fix typo.

=== modified file 'lisp/net/tramp.el'
--- a/lisp/net/tramp.el 2013-02-19 21:21:30 +0000
+++ b/lisp/net/tramp.el 2013-03-25 09:16:31 +0000
@@ -1565,23 +1565,16 @@
 (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."