[Emacs-diffs] /srv/bzr/emacs/trunk r105304: Prevent cc-langs.elc being loaded at run time.

[Alan Mackenzie]

------------------------------------------------------------
revno: 105304
committer: Alan Mackenzie <address@hidden>
branch nick: trunk
timestamp: Fri 2011-07-22 12:53:46 +0000
message:
  Prevent cc-langs.elc being loaded at run time.
  
  cc-mode.el: Remove two autoload forms which loaded cc-langs.
  
  cc-langs.el (c-make-init-lang-vars-fun): Don't emit "(require 'cc-langs)".
  Quote a form so it will evaluate at (cc-mode's) compilation time.
modified:
  lisp/ChangeLog
  lisp/progmodes/cc-langs.el
  lisp/progmodes/cc-mode.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-07-22 11:04:55 +0000
+++ b/lisp/ChangeLog    2011-07-22 12:53:46 +0000
@@ -1,3 +1,14 @@
+2011-07-22  Alan Mackenzie  <address@hidden>
+
+       Prevent cc-langs.elc being loaded at run time.
+
+       * progmodes/cc-mode.el: Remove two autoload forms which loaded
+       cc-langs.
+
+       * /progmodes/cc-langs.el (c-make-init-lang-vars-fun): Don't emit
+       "(require 'cc-langs)".  Quote a form so it will evaluate at
+       (cc-mode's) compilation time.
+
 2011-07-22  Michael Albinus  <address@hidden>
 
        * net/tramp.el (tramp-file-name-handler): Avoid recursive

=== modified file 'lisp/progmodes/cc-langs.el'
--- a/lisp/progmodes/cc-langs.el        2011-07-18 17:15:24 +0000
+++ b/lisp/progmodes/cc-langs.el        2011-07-22 12:53:46 +0000
@@ -3092,10 +3092,9 @@
                 ;;           ',mode ,c-version c-version)
                 ;;  (put ',mode 'c-has-warned-lang-consts t))
 
-                (require 'cc-langs)
                 (setq source-eval t)
-                (let ((init (append (cdr c-emacs-variable-inits)
-                                    (cdr c-lang-variable-inits))))
+                (let ((init ',(append (cdr c-emacs-variable-inits)
+                                      (cdr c-lang-variable-inits))))
                   (while init
                     (setq current-var (caar init))
                     (set (caar init) (eval (cadar init)))

=== modified file 'lisp/progmodes/cc-mode.el'
--- a/lisp/progmodes/cc-mode.el 2011-06-30 20:45:12 +0000
+++ b/lisp/progmodes/cc-mode.el 2011-07-22 12:53:46 +0000
@@ -120,11 +120,6 @@
 ;   '
 (require 'cc-fonts) ;)
 
-;; cc-langs isn't loaded when we're byte compiled, so add autoload
-;; directives for the interface functions.
-(autoload 'c-make-init-lang-vars-fun "cc-langs")
-(autoload 'c-init-language-vars "cc-langs" nil nil 'macro)
-
 
 ;; Other modes and packages which depend on CC Mode should do the
 ;; following to make sure everything is loaded and available for their