tramp (2.3.1-pre); Can't open file due to wrong local path under MS-Windows

[Chris Zheng]

Hello, Michael.

With Tramp in master branch of Emacs, I can't open file through
"/sshx:" under MS-Windows. The recipe starting from "emacs -Q" looks
like:

C-x C-f /sshx:address@hidden:/root/htpasswd.py RET

The related messages look like:

Tramp: Inserting ‘/sshx:address@hidden:/root/htpasswd.py’...
Tramp: Encoding remote file ‘/sshx:address@hidden:/root/htpasswd.py’ with 
‘base64 <%s’...done
Tramp: Decoding local file ‘z:/TEMP/tramp.16808GLL.py’ with 
‘base64-decode-region’...done
Tramp: Inserting ‘/sshx:address@hidden:/root/htpasswd.py’...failed
Removing old name: No such file or directory, /TEMP/tramp.16808GLL.py

I think the problem is due to the commit

c5f466db6f6b8196b8429db8bb7b74f8090d5d3e
Fix Bug#20821

* lisp/net/tramp.el (tramp-file-name-handler):
* lisp/net/tramp-sh.el (tramp-sh-handle-expand-file-name):
Use `tramp-drop-volume-letter'.  (Bug#20821)

Since the volume letter ("z:") is dropped, the path becomes wrong. I
have read the original report of Bug#20821, but have no idea why the
`tramp-drop-volume-letter' was used here. Comment out the first call
to `tramp-drop-volume-letter' in `tramp-sh-handle-expand-file-name'
did fix the problem for me. Could you please have a look on it?

Please let me know if you want more information.

With many thanks,

Chris