1 files changed, 16 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a2169898670..aac855804cb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,19 @@
+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
+        loading.  (Bug#9114)
+
 2011-07-21  Martin Rudalics  <rudalics@gmx.at>
 
         * window.el (display-buffer-pop-up-window)