diff options
| author | Joakim Verona | 2011-07-23 09:37:55 +0200 |
|---|---|---|
| committer | Joakim Verona | 2011-07-23 09:37:55 +0200 |
| commit | 32feb900b6bbe2e2898984ace501fbb6ed234d49 (patch) | |
| tree | 82c1eeef72448f5dc5703b15896e87cdf16b7c74 /lisp/ChangeLog | |
| parent | 37d53e76fafe8ba6732cbeb1c481a23ea5ade726 (diff) | |
| parent | b2d0c91afda345844c6e4b647b1b0fd6faac6875 (diff) | |
| download | emacs-32feb900b6bbe2e2898984ace501fbb6ed234d49.tar.gz emacs-32feb900b6bbe2e2898984ace501fbb6ed234d49.zip | |
merge from upstream
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 16 |
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 @@ | |||
| 1 | 2011-07-22 Alan Mackenzie <acm@muc.de> | ||
| 2 | |||
| 3 | Prevent cc-langs.elc being loaded at run time. | ||
| 4 | |||
| 5 | * progmodes/cc-mode.el: Remove two autoload forms which loaded | ||
| 6 | cc-langs. | ||
| 7 | |||
| 8 | * /progmodes/cc-langs.el (c-make-init-lang-vars-fun): Don't emit | ||
| 9 | "(require 'cc-langs)". Quote a form so it will evaluate at | ||
| 10 | (cc-mode's) compilation time. | ||
| 11 | |||
| 12 | 2011-07-22 Michael Albinus <michael.albinus@gmx.de> | ||
| 13 | |||
| 14 | * net/tramp.el (tramp-file-name-handler): Avoid recursive | ||
| 15 | loading. (Bug#9114) | ||
| 16 | |||
| 1 | 2011-07-21 Martin Rudalics <rudalics@gmx.at> | 17 | 2011-07-21 Martin Rudalics <rudalics@gmx.at> |
| 2 | 18 | ||
| 3 | * window.el (display-buffer-pop-up-window) | 19 | * window.el (display-buffer-pop-up-window) |