[Emacs-diffs] /srv/bzr/emacs/trunk r101558: * lisp/files.el (auto-mode-alist): Prefer C-mode for .xs. (Bug#7071)

[Glenn Morris]

------------------------------------------------------------
revno: 101558
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2010-09-23 00:34:40 -0700
message:
  * lisp/files.el (auto-mode-alist): Prefer C-mode for .xs.  (Bug#7071)
modified:
  lisp/ChangeLog
  lisp/files.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-09-23 07:26:10 +0000
+++ b/lisp/ChangeLog    2010-09-23 07:34:40 +0000
@@ -1,5 +1,7 @@
 2010-09-23  Glenn Morris  <address@hidden>
 
+       * 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.

=== modified file 'lisp/files.el'
--- a/lisp/files.el     2010-09-23 07:26:10 +0000
+++ b/lisp/files.el     2010-09-23 07:34:40 +0000
@@ -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)