merge 8.5

2 files changed, 73 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index 969ebc2..5b54091 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -79,7 +79,8 @@
 	* generic/tkMain.c:   Implement TkCygwinMainEx for loading
 	* generic/tkWindow.c: Cygwin's Tk_MainEx from the Tk dll.
 	* generic/tkInt.decls:   Change XChangeWindowAttributes signature and
-	* generic/tkIntXlibDeclsDecls.h: many others to match Xorg, needed for Cygwin.
+	* generic/tkIntXlibDeclsDecls.h: many others to match Xorg, needed for
+	Cygwin.
 
 2012-06-06  Jan Nijtmans  <nijtmans@users.sf.net>
 
@@ -88,12 +89,12 @@
 
 2012-05-31  Jan Nijtmans  <nijtmans@users.sf.net>
 
-	* generic/tkWindow.c:    Simpify determination whether we are running on cygwin.
-	* generic/tkStubInit.c:  Export Tk_GetHINSTANCE, TkSetPixmapColormap and
-	* generic/tkInt.decls: 	 TkpPrintWindowId on the Cygwin dll, sync stub table
-	with Tk 8.6 win32 version.
+	* generic/tkWindow.c:	Simplify determination whether we are running
+	* generic/tkStubInit.c:	on cygwin.  Export Tk_GetHINSTANCE,
+	* generic/tkInt.decls:	TkSetPixmapColormap and TkpPrintWindowId on the
+	Cygwin dll, sync stub table with Tk 8.6 win32 version.
 	* generic/tk*Decls.h:    re-generated
-	* win/Makefile.in:       Fix "make genstubs" when cross-compiling on UNIX
+	* win/Makefile.in:       "make genstubs" when cross-compiling on UNIX
 
 	* win/stubs.c:           Implement XFlush and various others for win32 as stubs,
 	* win/tkWinPort.h:       so win32 extensions using those can run under CYGWIN as well.
@@ -107,13 +108,13 @@
 
 2012-05-28  Francois Vogel  <fvogelnew1@free.fr>
 
-	* doc/text.n:  [Bug 1630251]: Documentation for -endline option was wrong
+	* doc/text.n:  [Bug 1630251]: Doc for -endline option was wrong
 
 2012-05-28  Francois Vogel  <fvogelnew1@free.fr>
 
-	* generic/tkTextDisp.c:    [Bug 1630254]: missing scrolling of text widget
-	when from a -startline == -endline initial state it is configured to display
-	a non-empty part of it
+	* generic/tkTextDisp.c: [Bug 1630254]: missing scrolling of text widget
+	when from a -startline == -endline initial state it is configured to
+	display a non-empty part of it
 
 2012-05-24  Jan Nijtmans  <nijtmans@users.sf.net>
 
@@ -133,15 +134,16 @@
 2012-05-05  Jan Nijtmans  <nijtmans@users.sf.net>
 
 	* xlib/xcolors.c:      Single "const" addition
-	* generic/tkWindow.c:  If tk.dll loaded in cygwin, don't use the win32 file dialogs
+	* generic/tkWindow.c:  If tk.dll loaded in cygwin, don't use the
+	win32 file dialogs
 
 2012-05-04  Jan Nijtmans  <nijtmans@users.sf.net>
 
-	* library/menu.tcl:    [Bug 2768586]: Menu posting problem on dual monitors
+	* library/menu.tcl: [Bug 2768586]: Menu posting on dual monitors
 
 2012-04-29  Jan Nijtmans  <nijtmans@users.sf.net>
 
-	* library/tk.tcl:    [Bug 533519]: Window placement with multiple screens
+	* library/tk.tcl: [Bug 533519]: Window placement with multiple screens
 	* generic/tkBind.c:
 	* generic/tkFocus.c:
 	* generic/tkMenuDraw.c:
@@ -154,8 +156,8 @@
 
 2012-04-26  Jan Nijtmans  <nijtmans@users.sf.net>
 
-	* generic/tk.decls:      [Bug 3508771]: Implement TkClipBox, Tk*Region and
-	* generic/tkInt.decls:   Tk_GetHINSTANCE for Cygwin
+	* generic/tk.decls:	[Bug 3508771]: Implement TkClipBox, Tk*Region
+	* generic/tkInt.decls:	and Tk_GetHINSTANCE for Cygwin
 	* generic/tkPlatDecls.h:
 	* generic/tkintDecls.h:
 	* generic/tkStubInit.c:
@@ -262,6 +264,11 @@
 	Tkinter's handling of multiple filename results. Issue was reported
 	via StackOverflow: http://stackoverflow.com/q/9227859/301832
 
+2012-01-30  Joe English  <jenglish@users.sourceforge.net>
+
+	* library/ttk/combobox.tcl: [Bug 2925561] Don't take focus in
+	disabled state.
+
 2012-01-29  Jan Nijtmans  <nijtmans@users.sf.net>
 
 	* win/tkImgPhoto.c: [Bug 3480634]: PNG Images missing in menus on Mac
@@ -305,6 +312,11 @@
 	* generic/tkText.c: [Bug-3021557]: Moving the cursor in
 	* tests/text.test:  elided text freezes Tk
 
+2011-12-22  Don Porter  <dgp@users.sourceforge.net>
+
+	* win/tkWinMenu.c: [Bug 3235256] Keep menu entry IDs out of system
+	values. Thanks Colin McDonald. 
+
 2011-12-13  Donal K. Fellows  <dkf@users.sf.net>
 
 	* doc/getOpenFile.n: Make example follow best practices. Issue spotted
diff --git a/changes b/changes
index 84c46e9..9ae1e7b 100644
--- a/changes
+++ b/changes
@@ -6946,3 +6946,49 @@ and -to (porter)
 2011-10-25 (bug fix)[3410609] AltGr keysyms on Swiss keyboard (tasser,kenny)
 
 --- Released 8.6b3, November 20, 2011 --- See ChangeLog for details ---
+
+2011-11-17 (bug fix)[3437816] return code of [canvas lower] (hirner,ferrieux)
+
+2011-12-22 (bug fix)[3235256] correct menu failure on Windows (mcdonald)
+
+2012-01-19 (bug fix)[3021557] cursor freeze in elided text (vogel)
+
+2012-01-22 (bug fix)[3476698] hang in [text mark prev/next] (vogel)
+
+2012-01-25 (bug fix)[3475627] Stop text-31.11 failure (vogel)
+
+2012-01-25 (bug fix)[1630271] hang/crash on mark before -startline (vogel)
+
+2012-01-26 (bug fix)[1754043,2321450] -blockcursor appearance (vogel)
+
+2012-01-27 (bug fix)[3480471] crash in [tk_getOpenFile] (nijtmans)
+
+2012-01-29 (bug fix)[3480634] PNG image in menus (nijtmans)
+
+2012-01-30 (bug fix)[2925561] disabled combobox don't take focus (english)
+
+2012-02-10 (bug fix) win dialog avoid shimmer that confuses Python (fellows)
+
+2012-02-15 (bug fix)[3486474] Correct color scaling (goth,nijtmans)
+
+2012-02-28 (bug fix)[1630262,1615425] [text] crash tags & -*line (vogel)
+
+2012-03-07 (bug fix)[3497848] consistent pixel rounding (fassel,fellows)
+
+2012-03-18 (enhancement)[3503317] XParseColor speedup (nijtmans)
+
+2012-04-07 (bug fix)[3176239] control-Mousewheel crash (couch,nijtmans)
+
+2012-04-22 (bug fix)[3520202] <MouseWheel> %k,%K,%N for Python (deily,fellows)
+
+2012-05-02 (bug fix)[533519] multiscreen window placement (nijtmans)
+
+2012-05-04 (bug fix)[2768586] multiscreen menu posting (nijtmans)
+
+2012-05-28 (bug fix)[1630254] text peer update on -startline reset (baker,vogel)
+
+2012-06-11 (bug fix)[3294450] ttk text element clipping (oehlmann,fellows)
+
+Many revisions to better support a Cygwin environment (nijtmans)
+
+--- Released 8.5.12, July 20, 2012 --- See ChangeLog for details ---