From: Glenn Morris <rgm@gnu.org>
Date: Thu, 23 Sep 2010 07:40:11 +0000 (-0700)
Subject: * lisp/files.el (auto-mode-alist): Add .xa, .xw, .xsw for ld-script-mode.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~47^2~42^2~80
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=19543b17af7ab4fd804d782f84d4b87c3573f786;p=emacs.git

* lisp/files.el (auto-mode-alist): Add .xa, .xw, .xsw for ld-script-mode.
---

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)