From 8826afe32d5b2fb2734f6cf73b3b4fe8596decc5 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 9 Jun 2010 22:17:21 -0700 Subject: [PATCH] Fix ChangeLog attribution. This is on the assumption that the change from http://lists.gnu.org/archive/html/emacs-devel/2010-05/msg00196.html is actually based on the change from http://lists.gnu.org/archive/html/emacs-devel/2009-02/msg00606.html http://debbugs.gnu.org/cgi/bugreport.cgi?bug=2404 The fact that this wasn't pointed out at the time explains the recent confusion with the latest emacs23 -> trunk merge. --- lisp/ChangeLog | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d5e0b5ac4f4..2d9ac9cb5fe 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -576,11 +576,15 @@ 2010-05-25 Ryan Yeske - * net/rcirc.el (rcirc-server-alist): Add :pass. - (rcirc-default-user-name): Change to "user". + * net/rcirc.el (rcirc-default-user-name): Change to "user". (rcirc-default-full-name): Change to "unknown". (rcirc-user-name-history): Add variable. - (rcirc): When prompting for connection paramaters, also prompt for + +2010-05-25 Ryan Yeske + Jonathan Rockway + + * net/rcirc.el (rcirc-server-alist): Add :pass. + (rcirc): When prompting for connection parameters, also prompt for username and password. (rcirc-connect): Take a PASS argument. If PASS is non-nil, send value to server when connecting. -- 2.39.2