Mercurial > emacs

diff doc/emacs/ChangeLog @ 107526:af52c11fa4bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bug #5736: Allow X-resource menuBar to take on/off as documented. * frame.c (x_get_arg): Handle RES_TYPE_BOOLEAN_NUMBER (bug #5736). * xfns.c (Fx_create_frame): Make menuBar a RES_TYPE_BOOLEAN_NUMBER. * dispextern.h (resource_types): RES_TYPE_BOOLEAN_NUMBER is new. * xresources.texi (Table of Resources): Clarify toolBar number for Gtk+. * frames.texi (Menu Bars): menuBarLines => menuBar (bug#5736).
author Jan D. <jan.h.d@swipnet.se>
date Mon, 22 Mar 2010 08:26:56 +0100
parents cd363410df90
children daf1d382bc07
line wrap: on
line diff
--- a/doc/emacs/ChangeLog	Sun Mar 21 18:13:26 2010 -0400
+++ b/doc/emacs/ChangeLog	Mon Mar 22 08:26:56 2010 +0100
@@ -1,3 +1,10 @@
+2010-03-20  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* xresources.texi (Table of Resources): Clarify toolBar number
+	for Gtk+.
+
+	* frames.texi (Menu Bars): menuBarLines => menuBar (bug#5736).
+
 2010-03-21  Chong Yidong  <cyd@stupidchicken.com>
 
 	* dired.texi (Dired Updating): Document dired-auto-revert-buffer.
@@ -18,6 +25,7 @@
 	* xresources.texi (Table of Resources):
 	* mule.texi (Defining Fontsets, Charsets): Update xrefs.
 
+>>>>>>> MERGE-SOURCE
 2010-03-06  Chong Yidong  <cyd@stupidchicken.com>
 
 	* custom.texi (Init Examples): Add xref to Locals.