diff options
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/files.el | 20 | ||||
| -rw-r--r-- | lisp/image-mode.el | 12 | ||||
| -rw-r--r-- | lisp/progmodes/compile.el | 3 | ||||
| -rw-r--r-- | lisp/progmodes/gud.el | 7 | ||||
| -rw-r--r-- | lisp/progmodes/mixal-mode.el | 5 | ||||
| -rw-r--r-- | lisp/textmodes/bibtex-style.el | 5 | ||||
| -rw-r--r-- | lisp/textmodes/css-mode.el | 1 | ||||
| -rw-r--r-- | lisp/textmodes/dns-mode.el | 8 |
9 files changed, 31 insertions, 38 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5261f3f30d2..2a24d434796 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2010-09-24 Glenn Morris <rgm@gnu.org> + + * image-mode.el, progmodes/compile.el, progmodes/gud.el: + * progmodes/mixal-mode.el, textmodes/bibtex-style.el: + * textmodes/css-mode.el, textmodes/dns-mode.el: + Move autoloaded auto-mode-alist entries to files.el. + * files.el (auto-mode-alist): Move entries here. + 2010-09-23 Glenn Morris <rgm@gnu.org> * isearch.el (isearch-lazy-highlight-cleanup) diff --git a/lisp/files.el b/lisp/files.el index e842d5fe2a9..24190a51529 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -2211,6 +2211,15 @@ since only a single case-insensitive search through the alist is made." (cons (purecopy (car elt)) (cdr elt))) `(;; do this first, so that .html.pl is Polish html, not Perl ("\\.s?html?\\(\\.[a-zA-Z_]+\\)?\\'" . html-mode) + ("\\.svgz?\\'" . image-mode) + ("\\.svgz?\\'" . xml-mode) + ("\\.x[bp]m\\'" . image-mode) + ("\\.x[bp]m\\'" . c-mode) + ("\\.p[bpgn]m\\'" . image-mode) + ("\\.tiff?\\'" . image-mode) + ("\\.gif\\'" . image-mode) + ("\\.png\\'" . image-mode) + ("\\.jpe?g\\'" . image-mode) ("\\.te?xt\\'" . text-mode) ("\\.[tT]e[xX]\\'" . tex-mode) ("\\.ins\\'" . tex-mode) ;Installation files for TeX packages. @@ -2246,6 +2255,14 @@ since only a single case-insensitive search through the alist is made." ("\\.te?xi\\'" . texinfo-mode) ("\\.[sS]\\'" . asm-mode) ("\\.asm\\'" . asm-mode) + ("\\.css\\'" . css-mode) + ("\\.mixal\\'" . mixal-mode) + ("\\.gcov\\'" . compilation-mode) + ;; Besides .gdbinit, gdb documents other names to be usable for init + ;; files, cross-debuggers can use something like + ;; .PROCESSORNAME-gdbinit so that the host and target gdbinit files + ;; don't interfere with each other. + ("/\\.[a-z0-9-]*gdbinit" . gdb-script-mode) ("[cC]hange\\.?[lL]og?\\'" . change-log-mode) ("[cC]hange[lL]og[-.][0-9]+\\'" . change-log-mode) ("\\$CHANGE_LOG\\$\\.TXT" . change-log-mode) @@ -2262,6 +2279,7 @@ since only a single case-insensitive search through the alist is made." ("\\.cl[so]\\'" . latex-mode) ;LaTeX 2e class option ("\\.bbl\\'" . latex-mode) ("\\.bib\\'" . bibtex-mode) + ("\\.bst\\'" . bibtex-style-mode) ("\\.sql\\'" . sql-mode) ("\\.m[4c]\\'" . m4-mode) ("\\.mf\\'" . metafont-mode) @@ -2322,6 +2340,8 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|7Z\\)\\'" . archive-mode) ;; 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) + ("\\.zone\\'" . dns-mode) + ("\\.soa\\'" . dns-mode) ;; Common Lisp ASDF package system. ("\\.asd\\'" . lisp-mode) ("\\.\\(asn\\|mib\\|smi\\)\\'" . snmp-mode) diff --git a/lisp/image-mode.el b/lisp/image-mode.el index 6e67847857f..5f43f390c2a 100644 --- a/lisp/image-mode.el +++ b/lisp/image-mode.el @@ -36,18 +36,6 @@ (require 'image) (eval-when-compile (require 'cl)) -;;;###autoload (push (cons (purecopy "\\.jpe?g\\'") 'image-mode) auto-mode-alist) -;;;###autoload (push (cons (purecopy "\\.png\\'") 'image-mode) auto-mode-alist) -;;;###autoload (push (cons (purecopy "\\.gif\\'") 'image-mode) auto-mode-alist) -;;;###autoload (push (cons (purecopy "\\.tiff?\\'") 'image-mode) auto-mode-alist) -;;;###autoload (push (cons (purecopy "\\.p[bpgn]m\\'") 'image-mode) auto-mode-alist) - -;;;###autoload (push (cons (purecopy "\\.x[bp]m\\'") 'c-mode) auto-mode-alist) -;;;###autoload (push (cons (purecopy "\\.x[bp]m\\'") 'image-mode) auto-mode-alist) - -;;;###autoload (push (cons (purecopy "\\.svgz?\\'") 'xml-mode) auto-mode-alist) -;;;###autoload (push (cons (purecopy "\\.svgz?\\'") 'image-mode) auto-mode-alist) - ;;; Image mode window-info management. (defvar image-mode-winprops-alist t) diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index 7f0732ecffc..a335f3dd427 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el @@ -2425,9 +2425,6 @@ The file-structure looks like this: (or compilation-auto-jump-to-first-error (eq compilation-scroll-output 'first-error)))) -;;;###autoload -(add-to-list 'auto-mode-alist (cons (purecopy "\\.gcov\\'") 'compilation-mode)) - (provide 'compile) ;; arch-tag: 12465727-7382-4f72-b234-79855a00dd8c diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el index 4c1471e39ec..8c35a13ac53 100644 --- a/lisp/progmodes/gud.el +++ b/lisp/progmodes/gud.el @@ -3218,13 +3218,6 @@ Treats actions as defuns." (goto-char (point-max))) t) -;; Besides .gdbinit, gdb documents other names to be usable for init -;; files, cross-debuggers can use something like -;; .PROCESSORNAME-gdbinit so that the host and target gdbinit files -;; don't interfere with each other. -;;;###autoload -(add-to-list 'auto-mode-alist (cons (purecopy "/\\.[a-z0-9-]*gdbinit") 'gdb-script-mode)) - ;;;###autoload (define-derived-mode gdb-script-mode nil "GDB-Script" "Major mode for editing GDB scripts." diff --git a/lisp/progmodes/mixal-mode.el b/lisp/progmodes/mixal-mode.el index 94af563d88f..f2a7aa045e4 100644 --- a/lisp/progmodes/mixal-mode.el +++ b/lisp/progmodes/mixal-mode.el @@ -125,7 +125,7 @@ value.") (defvar mixal-operation-codes-alist ;; FIXME: the codes FADD, FSUB, FMUL, FDIV, JRAD, and FCMP were in ;; mixal-operation-codes but not here. They should probably be added here. - ;; + ;; ;; We used to define this with a backquote and subexps like ,(+ 8 3) for ;; better clarity, but the resulting code was too big and caused the ;; byte-compiler to eat up all the stack space. Even using @@ -1123,9 +1123,6 @@ Assumes that file has been compiled with debugging support." (set (make-local-variable 'require-final-newline) mode-require-final-newline)) -;;;###autoload -(add-to-list 'auto-mode-alist '("\\.mixal\\'" . mixal-mode)) - (provide 'mixal-mode) ;; arch-tag: be7c128a-bf61-4951-a90e-9398267ce3f3 diff --git a/lisp/textmodes/bibtex-style.el b/lisp/textmodes/bibtex-style.el index 688d6fe0bc1..3e84c37af9e 100644 --- a/lisp/textmodes/bibtex-style.el +++ b/lisp/textmodes/bibtex-style.el @@ -1,6 +1,7 @@ ;;; bibtex-style.el --- Major mode for BibTeX Style files -;; Copyright (C) 2005, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2005, 2007, 2008, 2009, 2010 +;; Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> ;; Keywords: tex @@ -63,8 +64,6 @@ ("\\<\\(FUNCTION\\|MACRO\\)\\s-+{\\([^}\n]+\\)}" (2 font-lock-function-name-face)))) -;;;###autoload (add-to-list 'auto-mode-alist (cons (purecopy "\\.bst\\'") 'bibtex-style-mode)) - ;;;###autoload (define-derived-mode bibtex-style-mode nil "BibStyle" "Major mode for editing BibTeX style files." diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el index bfa98e9c36f..759778eb025 100644 --- a/lisp/textmodes/css-mode.el +++ b/lisp/textmodes/css-mode.el @@ -264,7 +264,6 @@ (defvar css-font-lock-defaults '(css-font-lock-keywords nil t)) -;;;###autoload (add-to-list 'auto-mode-alist (cons (purecopy "\\.css\\'") 'css-mode)) ;;;###autoload (define-derived-mode css-mode fundamental-mode "CSS" "Major mode to edit Cascading Style Sheets." diff --git a/lisp/textmodes/dns-mode.el b/lisp/textmodes/dns-mode.el index 45ebc07d8bb..ed84b5be914 100644 --- a/lisp/textmodes/dns-mode.el +++ b/lisp/textmodes/dns-mode.el @@ -28,11 +28,6 @@ ;; C-c C-s Increment SOA serial. ;; Understands YYYYMMDDNN, Unix time, and serial number formats, ;; and complains if it fail to find SOA serial. -;; -;; Put something similar to the following in your ~/.emacs to use this file: -;; -;; (load "~/path/to/dns-mode.el") -;; (setq auto-mode-alist (cons '("\\.soa\\'" . dns-mode) auto-mode-alist)) ;;; References: @@ -151,7 +146,6 @@ Turning on DNS mode runs `dns-mode-hook'." (easy-menu-add dns-mode-menu dns-mode-map)) ;;;###autoload (defalias 'zone-mode 'dns-mode) -;;;###autoload (add-to-list 'auto-mode-alist (purecopy '("\\.zone\\'" . zone-mode))) ;; Tools. @@ -223,8 +217,6 @@ This function is run from `before-save-hook'." ;; We return nil in case this is used in write-contents-functions. nil))) -;;;###autoload(add-to-list 'auto-mode-alist (purecopy '("\\.soa\\'" . dns-mode))) - (provide 'dns-mode) ;;; dns-mode.el ends here |