diff options
| author | Stefan Monnier | 2011-09-19 15:27:30 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2011-09-19 15:27:30 -0400 |
| commit | 345083b2cbbe0fec01a7d2c052bd20d723675e2a (patch) | |
| tree | ea65e486c85d0cda03acd11a7c5f09c39d5a78c6 /lisp/ChangeLog | |
| parent | 08d355e3eb01f875e64828e5eabea56f874567f1 (diff) | |
| download | emacs-345083b2cbbe0fec01a7d2c052bd20d723675e2a.tar.gz emacs-345083b2cbbe0fec01a7d2c052bd20d723675e2a.zip | |
* lisp/ps-mule.el (ps-mule-plot-string): Don't inf-loop.
* lisp/image-mode.el (image-toggle-display-text)
(image-toggle-display-image): Stay away from evil `intangible'.
Fixes: debbugs:5108
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 54b8e1ff7a2..258b0067d98 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2011-09-19 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * ps-mule.el (ps-mule-plot-string): Don't inf-loop (bug#5108). | ||
| 4 | * image-mode.el (image-toggle-display-text) | ||
| 5 | (image-toggle-display-image): Stay away from evil `intangible'. | ||
| 6 | |||
| 1 | 2011-09-19 Leo Liu <sdl.web@gmail.com> | 7 | 2011-09-19 Leo Liu <sdl.web@gmail.com> |
| 2 | 8 | ||
| 3 | * replace.el (occur-revert-arguments): Make it permanent-local. | 9 | * replace.el (occur-revert-arguments): Make it permanent-local. |