# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1285227280 25200
# Node ID c5db1b9154cca7012e4172c9bef22bc4a16d5b49
# Parent  7d1ae818a5d2330fb893b134824c31df398842e5
* lisp/files.el (auto-mode-alist): Prefer C-mode for .xs.  (Bug#7071)

diff -r 7d1ae818a5d2 -r c5db1b9154cc lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Sep 23 00:26:10 2010 -0700
+++ b/lisp/ChangeLog	Thu Sep 23 00:34:40 2010 -0700
@@ -1,5 +1,7 @@
 2010-09-23  Glenn Morris  <rgm@gnu.org>
 
+	* files.el (auto-mode-alist): Prefer C-mode for .xs.  (Bug#7071)
+
 	* progmodes/ld-script.el (auto-mode-alist): Move to files.el.
 	* files.el (auto-mode-alist): Move ld-script entries here, further down
 	the list.
diff -r 7d1ae818a5d2 -r c5db1b9154cc lisp/files.el
--- a/lisp/files.el	Thu Sep 23 00:26:10 2010 -0700
+++ b/lisp/files.el	Thu Sep 23 00:34:40 2010 -0700
@@ -2315,6 +2315,9 @@
      ;; eCos uses "ld" and "ldi".  Netbsd uses "ldscript.*".
      ("\\.ld[si]?\\'" . ld-script-mode)
      ("ld\\.?script\\'" . ld-script-mode)
+     ;; .xs is also used for ld scripts, but seems to be more commonly
+     ;; associated with Perl .xs files (C with Perl bindings).  (Bug#7071)
+     ("\\.xs\\'" . c-mode)
      ("\\.x[bdsru]?[cn]?\\'" . ld-script-mode)
      ;; Common Lisp ASDF package system.
      ("\\.asd\\'" . lisp-mode)