From 2472c214a6fe78dcbb5eb6df9b6074fb31c0509c Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 4 Dec 2010 14:52:04 +0200
Subject: Fix bug #4674 with UNCs in file-relative-name.

 files.el (file-relative-name): Handle UNC file names on DOS/Windows.
 Also fixes bug#4673.
---
 lisp/files.el | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

(limited to 'lisp/files.el')

diff --git a/lisp/files.el b/lisp/files.el
index 4901c3872cd..97dce0fc1e5 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -4054,11 +4054,29 @@ on a DOS/Windows machine, it returns FILENAME in expanded form."
           (dremote (file-remote-p directory)))
       (if ;; Conditions for separate trees
 	  (or
-	   ;; Test for different drives on DOS/Windows
+	   ;; Test for different filesystems on DOS/Windows
 	   (and
 	    ;; Should `cygwin' really be included here?  --stef
 	    (memq system-type '(ms-dos cygwin windows-nt))
-	    (not (eq t (compare-strings filename 0 2 directory 0 2))))
+	    (or
+	     ;; Test for different drive letters
+	     (not (eq t (compare-strings filename 0 2 directory 0 2)))
+	     ;; Test for UNCs on different servers
+	     (not (eq t (compare-strings
+			 (progn
+			   (if (string-match "\\`//\\([^:/]+\\)/" filename)
+			       (match-string 1 filename)
+			     ;; Windows file names cannot have ? in
+			     ;; them, so use that to detect when
+			     ;; neither FILENAME nor DIRECTORY is a
+			     ;; UNC.
+			     "?"))
+			 0 nil
+			 (progn
+			   (if (string-match "\\`//\\([^:/]+\\)/" directory)
+			       (match-string 1 directory)
+			     "?"))
+			 0 nil t)))))
 	   ;; Test for different remote file system identification
 	   (not (equal fremote dremote)))
 	  filename
-- 
cgit v1.2.3


From 11cb1e35ff74fdff80d74ee3ec6d61e74b802cea Mon Sep 17 00:00:00 2001
From: "W. Martin Borgert" <debacle@debian.org>
Date: Sat, 4 Dec 2010 16:45:17 -0500
Subject: * lisp/files.el (auto-mode-alist): Handle .dbk (DocBook) with
 xml-mode. * etc/schema/schemas.xml: Handle *.dbk as DocBook.

---
 etc/ChangeLog          | 4 ++++
 etc/schema/schemas.xml | 3 ++-
 lisp/ChangeLog         | 5 +++++
 lisp/files.el          | 1 +
 4 files changed, 12 insertions(+), 1 deletion(-)

(limited to 'lisp/files.el')

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 384b276a285..738c63828fe 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2010-12-04  W. Martin Borgert <debacle@debian.org>  (tiny change)
+
+	* schema/schemas.xml: Add DocBook (Bug#7491).
+
 2010-11-21  Ulrich Mueller  <ulm@gentoo.org>
 
 	* HELLO: Add ancient Greek (Bug#7418).
diff --git a/etc/schema/schemas.xml b/etc/schema/schemas.xml
index 099df6b9436..6edc563b689 100644
--- a/etc/schema/schemas.xml
+++ b/etc/schema/schemas.xml
@@ -22,7 +22,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>. -->
   <uri pattern="*.html" typeId="XHTML"/>
   <uri pattern="*.rng" typeId="RELAX NG"/>
   <uri pattern="*.rdf" typeId="RDF"/>
-  
+  <uri pattern="*.dbk" typeId="DocBook"/>
+
   <namespace ns="http://www.w3.org/1999/XSL/Transform" typeId="XSLT"/>
   <namespace ns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" typeId="RDF"/>
   <namespace ns="http://www.w3.org/1999/xhtml" typeId="XHTML"/>
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 18bf0a40391..95ee06e7812 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-04  W. Martin Borgert <debacle@debian.org>  (tiny change)
+
+	* files.el (auto-mode-alist): Handle .dbk (DocBook) with xml-mode.
+	(Bug#7491).
+
 2010-12-04  Chong Yidong  <cyd@stupidchicken.com>
 
 	* simple.el (transient-mark-mode): Doc fix (Bug#7465).
diff --git a/lisp/files.el b/lisp/files.el
index 97dce0fc1e5..70d514d16ec 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2267,6 +2267,7 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\)\\'" . archive-mode)
      ("\\.oak\\'" . scheme-mode)
      ("\\.sgml?\\'" . sgml-mode)
      ("\\.x[ms]l\\'" . xml-mode)
+     ("\\.dbk\\'" . xml-mode)
      ("\\.dtd\\'" . sgml-mode)
      ("\\.ds\\(ss\\)?l\\'" . dsssl-mode)
      ("\\.js\\'" . js-mode)		; javascript-mode would be better
-- 
cgit v1.2.3