Merge from trunk.

[gnu-emacs] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0699a93ac9bf2928a42eca367487d76de3dd44a5..b138d78a070b5977b8520d759587ccf107d4e617 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,18 @@
+2011-07-20  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * proced.el (proced-update): Revert yesterday's bug#1779 patch,
+       which apparently didn't work.
+
+2011-07-19  Roland Winkler  <winkler@gnu.org>
+
+       * proced.el (proced-send-signal): For *Marked Processes* buffer
+       put point at beginning of buffer.
+
+2011-07-19  Stephen Berman  <stephen.berman@gmx.net>
+
+       * proced.el (proced-format): Make header lines align with the text
+       (bug#1779).
+
 2011-07-19  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * view.el (view-buffer): Allow running in `special' modes if we're