diff options
| author | Chong Yidong | 2012-08-11 10:13:55 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-08-11 10:13:55 +0800 |
| commit | 5725bd2cc0e691dadc31bd958f210b1bbcf17c49 (patch) | |
| tree | a8faec22f21eff83d918076adcc9c8c49c4cc820 /lisp/ChangeLog | |
| parent | 5723992258a8025e29ba9fcae923182fb5456426 (diff) | |
| parent | 711f4590cddbc83c509c1c5e852ef4e528a39780 (diff) | |
| download | emacs-5725bd2cc0e691dadc31bd958f210b1bbcf17c49.tar.gz emacs-5725bd2cc0e691dadc31bd958f210b1bbcf17c49.zip | |
Merge from emacs-24; up to 2012-05-02T11:38:01Z!lekktu@gmail.com
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c2e45204026..dc921213b42 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,18 @@ | |||
| 1 | 2012-08-10 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * emacs-lisp/copyright.el (copyright-update-directory): Logic fix. | ||
| 4 | |||
| 5 | * tutorial.el (help-with-tutorial): | ||
| 6 | * emacs-lisp/copyright.el (copyright-update-directory): | ||
| 7 | * emacs-lisp/autoload.el (autoload-find-generated-file) | ||
| 8 | (autoload-find-file): Disable local eval: (for insurance). | ||
| 9 | |||
| 10 | 2012-08-07 Glenn Morris <rgm@gnu.org> | ||
| 11 | |||
| 12 | * files.el (hack-local-variables-filter): If an eval: form is not | ||
| 13 | known to be safe, and enable-local-variables is :safe, then ignore | ||
| 14 | the form totally, as is done for non-eval forms. (Bug#12155) | ||
| 15 | |||
| 1 | 2012-08-10 Stefan Monnier <monnier@iro.umontreal.ca> | 16 | 2012-08-10 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 17 | ||
| 3 | * emacs-lisp/rx.el (rx-constituents): Don't define as constant. | 18 | * emacs-lisp/rx.el (rx-constituents): Don't define as constant. |