diff src/ChangeLog @ 109351:c8a969d13eda

merge trunk

--- a/src/ChangeLog	Thu Jul 08 17:09:35 2010 +0900
+++ b/src/ChangeLog	Fri Jul 09 15:55:27 2010 +0900
@@ -1,3 +1,87 @@
[phone]  Dan Nicolaescu  <[e-mail]>
+
+	* alloc.c: Convert DEFUNs to standard C.
+	* buffer.c:
+	* bytecode.c:
+	* callint.c:
+	* callproc.c:
+	* casefiddle.c:
+	* casetab.c:
+	* category.c:
+	* character.c:
+	* charset.c:
+	* chartab.c:
+	* cmds.c:
+	* coding.c:
+	* composite.c:
+	* data.c:
+	* dbusbind.c:
+	* dired.c:
+	* dispnew.c:
+	* doc.c:
+	* dosfns.c:
+	* editfns.c:
+	* emacs.c:
+	* eval.c:
+	* fileio.c:
+	* filelock.c:
+	* floatfns.c:
+	* fns.c:
+	* font.c:
+	* fontset.c:
+	* frame.c:
+	* fringe.c:
+	* image.c:
+	* indent.c:
+	* insdel.c:
+	* keyboard.c:
+	* keymap.c:
+	* lread.c:
+	* macros.c:
+	* marker.c:
+	* menu.c:
+	* minibuf.c:
+	* msdos.c:
+	* nsfns.m:
+	* nsmenu.m:
+	* nsselect.m:
+	* print.c:
+	* process.c:
+	* search.c:
+	* sound.c:
+	* syntax.c:
+	* term.c:
+	* terminal.c:
+	* textprop.c:
+	* undo.c:
+	* w16select.c:
+	* w32console.c:
+	* w32fns.c:
+	* w32font.c:
+	* w32menu.c:
+	* w32proc.c:
+	* w32select.c:
+	* window.c:
+	* xdisp.c:
+	* xfaces.c:
+	* xfns.c:
+	* xmenu.c:
+	* xselect.c:
+	* xsettings.c:
+	* xsmfns.c: Likewise.
+
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* process.c (kbd_is_on_hold, hold_keyboard_input)
+	(unhold_keyboard_input, kbd_on_hold_p) [!subprocesses]: Define.
+
[phone]  Jan Djärv  <[e-mail]>
+
+	* xmenu.c (set_frame_menubar, create_and_show_popup_menu)
+	(create_and_show_dialog): Don't call apply_systemfont_to_(menu|dialog)
+	unless USE_LUCID.
+
 2010-07-08  Dan Nicolaescu  <[e-mail]>
 
 	* xdisp.c (store_mode_line_noprop_char): Remove K&R alternative declaration.