From: Michael Albinus <michael.albinus@gmx.de>
Date: Sun, 5 Aug 2007 08:57:24 +0000 (+0000)
Subject: * files.el (set-auto-mode): Handle also remote files wrt
X-Git-Tag: emacs-pretest-22.1.90~1106
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=212b7268410aaf5bf4820a6c5e20eccedb7a4f32;p=emacs.git

* files.el (set-auto-mode): Handle also remote files wrt
`auto-mode-alist'.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ca8741013f5..d07f01641c8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-05  Michael Albinus  <michael.albinus@gmx.de>
+
+	* files.el (set-auto-mode): Handle also remote files wrt
+	`auto-mode-alist'.
+
 2007-08-04  Glenn Morris  <rgm@gnu.org>
 
 	* autorevert.el (auto-revert-tail-mode): auto-revert-tail-pos is
diff --git a/lisp/files.el b/lisp/files.el
index 444e402f438..135ccfafb92 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2259,7 +2259,12 @@ we don't actually set it to the same mode the buffer already has."
     ;; Next compare the filename against the entries in auto-mode-alist.
     (unless done
       (if buffer-file-name
-	  (let ((name buffer-file-name))
+	  (let ((name buffer-file-name)
+		(remote-id (file-remote-p buffer-file-name)))
+	    ;; Remove remote file name identification.
+	    (when (and (stringp remote-id)
+		       (string-match remote-id name))
+	      (setq name (substring name (match-end 0))))
 	    ;; Remove backup-suffixes from file name.
 	    (setq name (file-name-sans-versions name))
 	    (while name