# HG changeset patch
# User Jan Dj¸«£rv <jan.h.d@swipnet.se>
# Date 1202393220 0
# Node ID d2d6b0b017fa6683b535cb40e523d6bd5fc8613b
# Parent  60f09344e8c9382590d098f18c0ad006b912dceb
*** empty log message ***

diff -r 60f09344e8c9 -r d2d6b0b017fa lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Feb 07 14:06:35 2008 +0000
+++ b/lisp/ChangeLog	Thu Feb 07 14:07:00 2008 +0000
@@ -1,3 +1,9 @@
+2008-02-07  Timo Savola <timo.savola@iki.fi>
+
+	* startup.el (command-line-x-option-alist): Add --parent-id.
+
+	* term/x-win.el (x-handle-parent-id): New function.
+
 2008-02-07  Chris Moore  <christopher.ian.moore@gmail.com>
 
 	* mouse.el (x-fixed-font-alist): Use consistent capitalization for