diff options
| author | Glenn Morris | 2010-06-09 22:17:21 -0700 |
|---|---|---|
| committer | Glenn Morris | 2010-06-09 22:17:21 -0700 |
| commit | 8826afe32d5b2fb2734f6cf73b3b4fe8596decc5 (patch) | |
| tree | fce46ae6764fba8d448f0f566797f2e97a919d69 | |
| parent | a71832f78d2fa8128a03aeb551a1ec0895b49f67 (diff) | |
| download | emacs-8826afe32d5b2fb2734f6cf73b3b4fe8596decc5.tar.gz emacs-8826afe32d5b2fb2734f6cf73b3b4fe8596decc5.zip | |
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.
| -rw-r--r-- | lisp/ChangeLog | 10 |
1 files 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 @@ | |||
| 576 | 576 | ||
| 577 | 2010-05-25 Ryan Yeske <rcyeske@gmail.com> | 577 | 2010-05-25 Ryan Yeske <rcyeske@gmail.com> |
| 578 | 578 | ||
| 579 | * net/rcirc.el (rcirc-server-alist): Add :pass. | 579 | * net/rcirc.el (rcirc-default-user-name): Change to "user". |
| 580 | (rcirc-default-user-name): Change to "user". | ||
| 581 | (rcirc-default-full-name): Change to "unknown". | 580 | (rcirc-default-full-name): Change to "unknown". |
| 582 | (rcirc-user-name-history): Add variable. | 581 | (rcirc-user-name-history): Add variable. |
| 583 | (rcirc): When prompting for connection paramaters, also prompt for | 582 | |
| 583 | 2010-05-25 Ryan Yeske <rcyeske@gmail.com> | ||
| 584 | Jonathan Rockway <jon@jrock.us> | ||
| 585 | |||
| 586 | * net/rcirc.el (rcirc-server-alist): Add :pass. | ||
| 587 | (rcirc): When prompting for connection parameters, also prompt for | ||
| 584 | username and password. | 588 | username and password. |
| 585 | (rcirc-connect): Take a PASS argument. If PASS is non-nil, send | 589 | (rcirc-connect): Take a PASS argument. If PASS is non-nil, send |
| 586 | value to server when connecting. | 590 | value to server when connecting. |