upstream

1 files changed, 29 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 68a85a43387..abae693d0c8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,32 @@
+2011-10-15  Glenn Morris  <rgm@gnu.org>
+
+        * emacs-lisp/ert.el (ert--explain-equal-rec, ert-select-tests):
+        Doc fixes.
+
+2011-10-15  Chong Yidong  <cyd@stupidchicken.com>
+
+        * net/network-stream.el (network-stream-open-starttls): Improve
+        detection of failure due to lack of TLS support.
+
+        * mail/sendmail.el (sendmail-query-once): Tweak prompt message,
+        putting the input text in front and in bold.
+
+2011-10-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * pcmpl-unix.el (pcomplete/ssh): SSH does allow ganging.
+
+        * mpc.el (mpc-songs-jump-to): Don't burp if the user clicks in an
+        empty buffer.
+
+        * mouse.el (mouse-drag-mode-line-1): Modify the end-event we pushed on
+        unread-command-events rather than pushing yet-another event.
+
+2011-10-14  Eli Zaretskii  <eliz@gnu.org>
+
+        * mail/sendmail.el (sendmail-query-once): Improve the wording of
+        the explanation of the possible choices.  Make the options passed
+        to completing-read shorter.
+
 2011-10-13  Agustín Martín Domingo  <agustin.martin@hispalinux.es>
 
         * textmodes/flyspell.el (flyspell-large-region): Make sure