Mercurial > emacs
comparison lisp/ChangeLog @ 108947:ca556d6b7c7a
Conflict resolution fixup
author | Andreas Schwab <schwab@linux-m68k.org> |
---|---|
date | Thu, 10 Jun 2010 00:34:08 +0200 |
parents | d418516def73 |
children | 943435f93f92 |
comparison
equal
deleted
inserted
replaced
108946:d418516def73 | 108947:ca556d6b7c7a |
---|---|
73 | 73 |
74 2010-06-09 Stefan Monnier <monnier@iro.umontreal.ca> | 74 2010-06-09 Stefan Monnier <monnier@iro.umontreal.ca> |
75 | 75 |
76 * emacs-lisp/smie.el (smie-indent-keyword): Remove special case that | 76 * emacs-lisp/smie.el (smie-indent-keyword): Remove special case that |
77 can be handled with a ((:before "fn") (:prev "=>" parent)) rule. | 77 can be handled with a ((:before "fn") (:prev "=>" parent)) rule. |
78 | |
79 2010-06-07 Jonathan Rockway <jon@jrock.us> | |
80 | |
81 * net/rcirc.el: Add support for password authentication. | |
82 (rcirc-server-alist): Add :password keyword. | |
83 (rcirc): Ask for a password, or get it from the server's alist. | |
84 (rcirc-connect): Add password argument. Pass it to server. | |
85 | 78 |
86 2010-06-07 Martin Pohlack <mp26@os.inf.tu-dresden.de> | 79 2010-06-07 Martin Pohlack <mp26@os.inf.tu-dresden.de> |
87 | 80 |
88 * iimage.el: Remove images as soon as the underlying text is modified. | 81 * iimage.el: Remove images as soon as the underlying text is modified. |
89 (iimage-modification-hook): New function. | 82 (iimage-modification-hook): New function. |