diff options
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/files.el | 6 | ||||
| -rw-r--r-- | lisp/progmodes/ld-script.el | 22 |
3 files changed, 15 insertions, 17 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 658c4b18b58..d7665e31969 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,9 @@ 2010-09-23 Glenn Morris <rgm@gnu.org> + * 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. + * vc/add-log.el: Don't require timezone when compiling. (timezone-make-date-sortable): Autoload it. (change-log-sortable-date-at): Don't require timezone. diff --git a/lisp/files.el b/lisp/files.el index a7c465ae8c1..33e7d44d528 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -2310,6 +2310,12 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|7Z\\)\\'" . archive-mode) ("[:/]_emacs\\'" . emacs-lisp-mode) ("/crontab\\.X*[0-9]+\\'" . shell-script-mode) ("\\.ml\\'" . lisp-mode) + ;; Linux-2.6.9 uses some different suffix for linker scripts: + ;; "ld", "lds", "lds.S", "lds.in", "ld.script", and "ld.script.balo". + ;; eCos uses "ld" and "ldi". Netbsd uses "ldscript.*". + ("\\.ld[si]?\\'" . ld-script-mode) + ("ld\\.?script\\'" . ld-script-mode) + ("\\.x[bdsru]?[cn]?\\'" . ld-script-mode) ;; Common Lisp ASDF package system. ("\\.asd\\'" . lisp-mode) ("\\.\\(asn\\|mib\\|smi\\)\\'" . snmp-mode) diff --git a/lisp/progmodes/ld-script.el b/lisp/progmodes/ld-script.el index 3d07ed226b2..318456e9534 100644 --- a/lisp/progmodes/ld-script.el +++ b/lisp/progmodes/ld-script.el @@ -1,7 +1,7 @@ ;;; ld-script.el --- GNU linker script editing mode for Emacs -;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -;; Free Software Foundation, Inc. +;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, +;; 2010 Free Software Foundation, Inc. ;; Author: Masatake YAMATO<jet@gyve.org> ;; Keywords: languages, faces @@ -76,20 +76,20 @@ (defvar ld-script-keywords '( ;; 3.4.1 Setting the Entry Point - "ENTRY" + "ENTRY" ;; 3.4.2 Commands Dealing with Files "INCLUDE" "INPUT" "GROUP" "AS_NEEDED" "OUTPUT" "SEARCH_DIR" "STARTUP" ;; 3.4.3 Commands Dealing with Object File Formats "OUTPUT_FORMAT" "TARGET" ;; 3.4.3 Other Linker Script Commands - "ASSERT" "EXTERN" "FORCE_COMMON_ALLOCATION" + "ASSERT" "EXTERN" "FORCE_COMMON_ALLOCATION" "INHIBIT_COMMON_ALLOCATION" "NOCROSSREFS" "OUTPUT_ARCH" ;; 3.5.2 PROVIDE "PROVIDE" ;; 3.5.3 PROVIDE_HIDDEN "PROVIDE_HIDDEN" ;; 3.6 SECTIONS Command - "SECTIONS" + "SECTIONS" ;; 3.6.4.2 Input Section Wildcard Patterns "SORT" "SORT_BY_NAME" "SORT_BY_ALIGNMENT" ;; 3.6.4.3 Input Section for Common Symbols @@ -157,18 +157,6 @@ cpp-font-lock-keywords) "Default font-lock-keywords for `ld-script-mode'.") -;; Linux-2.6.9 uses some different suffix for linker scripts: -;; "ld", "lds", "lds.S", "lds.in", "ld.script", and "ld.script.balo". -;; eCos uses "ld" and "ldi". -;; Netbsd uses "ldscript.*". -;;;###autoload -(add-to-list 'auto-mode-alist (purecopy '("\\.ld[si]?\\>" . ld-script-mode))) -;;;###autoload -(add-to-list 'auto-mode-alist (purecopy '("ld\\.?script\\>" . ld-script-mode))) - -;;;###autoload -(add-to-list 'auto-mode-alist (purecopy '("\\.x[bdsru]?[cn]?\\'" . ld-script-mode))) - ;;;###autoload (define-derived-mode ld-script-mode nil "LD-Script" "A major mode to edit GNU ld script files" |