Mercurial > emacs
comparison src/ChangeLog @ 111270:83641cd010c7
* src/xterm.c (x_connection_closed) [USE_X_TOOLKIT]: Fix merge, maybe.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Sun, 31 Oct 2010 15:35:44 -0700 |
parents | 8da6c861bf9f |
children | 707be8bc83af |
comparison
equal
deleted
inserted
replaced
111269:3d7a1caabf14 | 111270:83641cd010c7 |
---|---|
1 2010-10-31 Glenn Morris <rgm@gnu.org> | 1 2010-10-31 Glenn Morris <rgm@gnu.org> |
2 | |
3 * xterm.c (x_connection_closed) [USE_X_TOOLKIT]: Fix merge, maybe. | |
2 | 4 |
3 * frame.c (syms_of_frame) <tool-bar-mode>: | 5 * frame.c (syms_of_frame) <tool-bar-mode>: |
4 Default to nil if !HAVE_WINDOW_SYSTEM. (Bug#7299) | 6 Default to nil if !HAVE_WINDOW_SYSTEM. (Bug#7299) |
5 | 7 |
6 2010-10-31 Chong Yidong <cyd@stupidchicken.com> | 8 2010-10-31 Chong Yidong <cyd@stupidchicken.com> |