Mercurial > emacs
comparison lisp/ChangeLog @ 109222:81f2d1ac795c
Merge from mainline.
author | Katsumi Yamaoka <katsumi@flagship2> |
---|---|
date | Sun, 13 Jun 2010 09:38:33 +0000 |
parents | c3dddc8e5767 |
children | 18cf7a828b34 |
comparison
equal
deleted
inserted
replaced
109221:d5e171b53de0 | 109222:81f2d1ac795c |
---|---|
1 2010-06-12 Chong Yidong <cyd@stupidchicken.com> | |
2 | |
3 * term/common-win.el (x-colors): Add all the color names defined | |
4 in rgb.txt (Bug#6332). | |
5 | |
6 * facemenu.el (list-colors-print): Don't print extra names if it | |
7 will overflow the window width. | |
8 | |
9 * vc/log-edit.el (log-edit-font-lock-keywords): Revert 2010-06-02 | |
10 change (Bug#6343). | |
11 | |
1 2010-06-12 Eli Zaretskii <eliz@gnu.org> | 12 2010-06-12 Eli Zaretskii <eliz@gnu.org> |
2 | 13 |
3 * files.el (make-directory): Doc fix (bug#6396). | 14 * files.el (make-directory): Doc fix (bug#6396). |
4 | 15 |
5 2010-06-12 Michael Albinus <michael.albinus@gmx.de> | 16 2010-06-12 Michael Albinus <michael.albinus@gmx.de> |
333 (tramp-gvfs-mount-spec): Return both prefix and mountspec. | 344 (tramp-gvfs-mount-spec): Return both prefix and mountspec. |
334 (tramp-gvfs-maybe-open-connection): Test, whether mountpoint | 345 (tramp-gvfs-maybe-open-connection): Test, whether mountpoint |
335 exists. Raise an error, if not (due to a corresponding answer | 346 exists. Raise an error, if not (due to a corresponding answer |
336 "no" in interactive questions, for example). | 347 "no" in interactive questions, for example). |
337 | 348 |
338 22010-06-02 Dan Nicolaescu <dann@ics.uci.edu> | 349 2010-06-02 Dan Nicolaescu <dann@ics.uci.edu> |
339 | 350 |
340 * log-edit.el (log-edit-font-lock-keywords): Make group 4 match lax. | 351 * log-edit.el (log-edit-font-lock-keywords): Make group 4 match lax. |
341 | 352 |
342 2010-06-01 Juanma Barranquero <lekktu@gmail.com> | 353 2010-06-01 Juanma Barranquero <lekktu@gmail.com> |
343 | 354 |