diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2010-03-22 08:26:56 +0100 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2010-03-22 08:26:56 +0100 |
| commit | 93318cbd4081abd95958485429b6fc497089b26e (patch) | |
| tree | c68359bb38469a82c4a63d25e342a21cc41ae968 /doc/emacs/ChangeLog | |
| parent | 4102856c09db692ac87c8214618134826c02fd51 (diff) | |
| download | emacs-93318cbd4081abd95958485429b6fc497089b26e.tar.gz | |
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).
Diffstat (limited to 'doc/emacs/ChangeLog')
| -rw-r--r-- | doc/emacs/ChangeLog | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 0e532345c7c..033e7b19270 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -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. |