diff options
| author | Glenn Morris | 2013-02-21 08:56:49 -0800 |
|---|---|---|
| committer | Glenn Morris | 2013-02-21 08:56:49 -0800 |
| commit | cfbf790d80eaa399afceecd9a6c3e2e76bca59b0 (patch) | |
| tree | b2c7ea684fb8d24d5f51d6959aa38854e335d9b6 /lisp/ChangeLog | |
| parent | d20e6e9093f74ce2e435a3dac948df200e767405 (diff) | |
| parent | 62cfd799f17a31188b3cdb9ffbe1421b4e6cba5d (diff) | |
| download | emacs-cfbf790d80eaa399afceecd9a6c3e2e76bca59b0.tar.gz emacs-cfbf790d80eaa399afceecd9a6c3e2e76bca59b0.zip | |
Merge from emacs-24; up to 2012-12-21T07:35:02Z!ueno@gnu.org
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 4210740791f..6258293be7e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,18 @@ | |||
| 1 | 2013-02-21 Fabián Ezequiel Gallina <fgallina@cuca> | ||
| 2 | |||
| 3 | * progmodes/python.el (python-info-current-defun): Enhance | ||
| 4 | match-data cluttering prevention. | ||
| 5 | |||
| 6 | 2013-02-21 Glenn Morris <rgm@gnu.org> | ||
| 7 | |||
| 8 | * net/tramp.el (tramp-get-debug-buffer): Ensure outline.el is not | ||
| 9 | loaded while outline-regexp is let bound. (Bug#9584) | ||
| 10 | |||
| 11 | 2013-02-21 Fabián Ezequiel Gallina <fgallina@cuca> | ||
| 12 | |||
| 13 | * progmodes/python.el (python-info-current-defun): Fix failed | ||
| 14 | defun name retrieval because of unwanted match-data cluttering. | ||
| 15 | |||
| 1 | 2013-02-21 Michael Albinus <michael.albinus@gmx.de> | 16 | 2013-02-21 Michael Albinus <michael.albinus@gmx.de> |
| 2 | 17 | ||
| 3 | * net/tramp.el (tramp-ssh-controlmaster-template): Make it a | 18 | * net/tramp.el (tramp-ssh-controlmaster-template): Make it a |