Mercurial > emacs
comparison lisp/ChangeLog @ 108952:7ffdaf7a645c
* lisp/net/rcirc.el (rcirc-server-alist, rcirc, rcirc-connect): Resolve
merge conflict, giving preference to the emacs-23 version of the code.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Wed, 09 Jun 2010 21:10:04 -0400 |
| parents | 943435f93f92 |
| children | a3dbf4fcc917 |
comparison
equal
deleted
inserted
replaced
| 108951:943435f93f92 | 108952:7ffdaf7a645c |
|---|---|
| 1 2010-06-10 Stefan Monnier <monnier@iro.umontreal.ca> | |
| 2 | |
| 3 * net/rcirc.el (rcirc-server-alist, rcirc, rcirc-connect): Resolve | |
| 4 merge conflict, giving preference to the emacs-23 version of the code. | |
| 5 | |
| 1 2010-06-09 Stefan Monnier <monnier@iro.umontreal.ca> | 6 2010-06-09 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 |
| 3 * emacs-lisp/advice.el (ad-compile-function): | 8 * emacs-lisp/advice.el (ad-compile-function): |
| 4 Define warning-suppress-types before we let-bind it (bug#6275). | 9 Define warning-suppress-types before we let-bind it (bug#6275). |
| 5 | 10 |