diff options
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/files.el | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5b762102dcf..f34e5035a42 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2010-09-23 Glenn Morris <rgm@gnu.org> + * files.el (auto-mode-alist): Add .xa, .xw, .xsw for ld-script-mode. + * files.el (auto-mode-alist): Prefer C-mode for .xs. (Bug#7071) * progmodes/ld-script.el (auto-mode-alist): Move to files.el. diff --git a/lisp/files.el b/lisp/files.el index 6d205a25273..e842d5fe2a9 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -2318,7 +2318,10 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|7Z\\)\\'" . archive-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) + ;; Explained in binutils ld/genscripts.sh. Eg: + ;; A .x script file is the default script. + ;; A .xr script is for linking without relocation (-r flag). Etc. + ("\\.x[abdsru]?[cnw]?\\'" . ld-script-mode) ;; Common Lisp ASDF package system. ("\\.asd\\'" . lisp-mode) ("\\.\\(asn\\|mib\\|smi\\)\\'" . snmp-mode) |