[Emacs-diffs] /srv/bzr/emacs/trunk r101581: Move some autoloaded auto-mode-alist entries to files.el.

[Glenn Morris]

------------------------------------------------------------
revno: 101581
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2010-09-23 20:06:33 -0700
message:
  Move some autoloaded auto-mode-alist entries to files.el.
  
  * 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.
modified:
  lisp/ChangeLog
  lisp/files.el
  lisp/image-mode.el
  lisp/progmodes/compile.el
  lisp/progmodes/gud.el
  lisp/progmodes/mixal-mode.el
  lisp/textmodes/bibtex-style.el
  lisp/textmodes/css-mode.el
  lisp/textmodes/dns-mode.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-09-23 19:00:31 +0000
+++ b/lisp/ChangeLog    2010-09-24 03:06:33 +0000
@@ -1,3 +1,11 @@
+2010-09-24  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
        * isearch.el (isearch-lazy-highlight-cleanup)

=== modified file 'lisp/files.el'
--- a/lisp/files.el     2010-09-23 07:40:11 +0000
+++ b/lisp/files.el     2010-09-24 03:06:33 +0000
@@ -2211,6 +2211,15 @@
      (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 @@
      ("\\.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 @@
      ("\\.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 @@
      ;; 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)

=== modified file 'lisp/image-mode.el'
--- a/lisp/image-mode.el        2010-08-29 16:17:13 +0000
+++ b/lisp/image-mode.el        2010-09-24 03:06:33 +0000
@@ -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)

=== modified file 'lisp/progmodes/compile.el'
--- a/lisp/progmodes/compile.el 2010-09-08 15:53:08 +0000
+++ b/lisp/progmodes/compile.el 2010-09-24 03:06:33 +0000
@@ -2425,9 +2425,6 @@
        (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

=== modified file 'lisp/progmodes/gud.el'
--- a/lisp/progmodes/gud.el     2010-09-10 23:13:42 +0000
+++ b/lisp/progmodes/gud.el     2010-09-24 03:06:33 +0000
@@ -3218,13 +3218,6 @@
     (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."

=== modified file 'lisp/progmodes/mixal-mode.el'
--- a/lisp/progmodes/mixal-mode.el      2010-09-10 23:13:42 +0000
+++ b/lisp/progmodes/mixal-mode.el      2010-09-24 03:06:33 +0000
@@ -125,7 +125,7 @@
 (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 @@
   (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

=== modified file 'lisp/textmodes/bibtex-style.el'
--- a/lisp/textmodes/bibtex-style.el    2010-01-13 08:35:10 +0000
+++ b/lisp/textmodes/bibtex-style.el    2010-09-24 03:06:33 +0000
@@ -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 <address@hidden>
 ;; 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."

=== modified file 'lisp/textmodes/css-mode.el'
--- a/lisp/textmodes/css-mode.el        2010-05-07 17:47:56 +0000
+++ b/lisp/textmodes/css-mode.el        2010-09-24 03:06:33 +0000
@@ -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."

=== modified file 'lisp/textmodes/dns-mode.el'
--- a/lisp/textmodes/dns-mode.el        2010-09-02 00:55:51 +0000
+++ b/lisp/textmodes/dns-mode.el        2010-09-24 03:06:33 +0000
@@ -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 @@
   (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 @@
           ;; 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