aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/ChangeLog')
-rw-r--r--lisp/ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d748214959d..f16d8c36344 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12012-08-20 Michael Albinus <michael.albinus@gmx.de>
2
3 * net/tramp.el (tramp-accept-process-output): Accept only output
4 from PROC. Otherwise, process filters and sentinels might be
5 confused. (Bug#12145)
6
12012-08-20 Chong Yidong <cyd@gnu.org> 72012-08-20 Chong Yidong <cyd@gnu.org>
2 8
3 * descr-text.el (describe-text-properties-1): Use overlays-in to 9 * descr-text.el (describe-text-properties-1): Use overlays-in to