diff options
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/files.el | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d7665e31969..5b762102dcf 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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 --git a/lisp/files.el b/lisp/files.el index 33e7d44d528..6d205a25273 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -2315,6 +2315,9 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|7Z\\)\\'" . archive-mode) ;; 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) |