Mercurial > emacs
comparison lisp/ChangeLog @ 109223:3d4150adbcf7
Merge from mainline.
| author | Katsumi Yamaoka <katsumi@flagship2> |
|---|---|
| date | Mon, 14 Jun 2010 11:56:46 +0000 |
| parents | 65de28008783 |
| children | c20f62b45fc9 |
comparison
equal
deleted
inserted
replaced
| 109222:81f2d1ac795c | 109223:3d4150adbcf7 |
|---|---|
| 1 2010-06-14 Stefan Monnier <monnier@iro.umontreal.ca> | |
| 2 | |
| 3 * image-mode.el (image-mode-map): Remap left-char and right-char. | |
| 4 | |
| 5 * nxml/nxml-mode.el (nxml-indent-line): Standardize indent behavior. | |
| 6 | |
| 1 2010-06-12 Chong Yidong <cyd@stupidchicken.com> | 7 2010-06-12 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 8 |
| 3 * term/common-win.el (x-colors): Add all the color names defined | 9 * term/common-win.el (x-colors): Add all the color names defined |
| 4 in rgb.txt (Bug#6332). | 10 in rgb.txt (Bug#6332). |
| 5 | 11 |