changeset 110500:430f14ffaad3

* lisp/files.el (auto-mode-alist): Add .xa, .xw, .xsw for ld-script-mode.
author Glenn Morris <rgm@gnu.org>
date Thu, 23 Sep 2010 00:40:11 -0700
parents c5db1b9154cc
children 906ce0f04ef3
files lisp/ChangeLog lisp/files.el
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Thu Sep 23 00:34:40 2010 -0700
+++ b/lisp/ChangeLog	Thu Sep 23 00:40:11 2010 -0700
@@ -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.
--- a/lisp/files.el	Thu Sep 23 00:34:40 2010 -0700
+++ b/lisp/files.el	Thu Sep 23 00:40:11 2010 -0700
@@ -2318,7 +2318,10 @@
      ;; .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)