diff options
| -rw-r--r-- | lisp/ChangeLog | 11 | ||||
| -rw-r--r-- | lisp/progmodes/cc-langs.el | 5 | ||||
| -rw-r--r-- | lisp/progmodes/cc-mode.el | 5 |
3 files changed, 13 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 848d991feed..aac855804cb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,14 @@ +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> * net/tramp.el (tramp-file-name-handler): Avoid recursive diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el index 9ce23a080d6..d7ef278174a 100644 --- a/lisp/progmodes/cc-langs.el +++ b/lisp/progmodes/cc-langs.el @@ -3092,10 +3092,9 @@ accomplish that conveniently." ;; ',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))) diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el index 1adc6c2eac0..4299c413312 100644 --- a/lisp/progmodes/cc-mode.el +++ b/lisp/progmodes/cc-mode.el @@ -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 |