Commit a9901f61 authored by Alan Mackenzie's avatar Alan Mackenzie
Browse files

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.
parent 11d074b2
2011-07-22 Alan Mackenzie <acm@muc.de>
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 <michael.albinus@gmx.de> 2011-07-22 Michael Albinus <michael.albinus@gmx.de>
* net/tramp.el (tramp-file-name-handler): Avoid recursive * net/tramp.el (tramp-file-name-handler): Avoid recursive
......
...@@ -3092,10 +3092,9 @@ accomplish that conveniently." ...@@ -3092,10 +3092,9 @@ accomplish that conveniently."
;; ',mode ,c-version c-version) ;; ',mode ,c-version c-version)
;; (put ',mode 'c-has-warned-lang-consts t)) ;; (put ',mode 'c-has-warned-lang-consts t))
(require 'cc-langs)
(setq source-eval t) (setq source-eval t)
(let ((init (append (cdr c-emacs-variable-inits) (let ((init ',(append (cdr c-emacs-variable-inits)
(cdr c-lang-variable-inits)))) (cdr c-lang-variable-inits))))
(while init (while init
(setq current-var (caar init)) (setq current-var (caar init))
(set (caar init) (eval (cadar init))) (set (caar init) (eval (cadar init)))
......
...@@ -120,11 +120,6 @@ ...@@ -120,11 +120,6 @@
; ' ; '
(require 'cc-fonts) ;) (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 ;; Other modes and packages which depend on CC Mode should do the
;; following to make sure everything is loaded and available for their ;; following to make sure everything is loaded and available for their
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment