diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-04-20 06:03:12 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-04-20 06:03:12 (GMT) |
| commit | d20cd9d967caa52f959837fce8d531c9319231d4 (patch) | |
| tree | b0550f678028544c4bc88c308e065ffb6ac677f9 | |
| parent | 77e0c5e9fb76f2aa4dd4f3d9545f3bf22b77cdc4 (diff) | |
| parent | 63b6554668963fa5a4b94cd64931e556ad154fcb (diff) | |
| download | tk-d20cd9d967caa52f959837fce8d531c9319231d4.zip tk-d20cd9d967caa52f959837fce8d531c9319231d4.tar.gz tk-d20cd9d967caa52f959837fce8d531c9319231d4.tar.bz2 | |
Merge core-8-6-branch (merge-mark and eol-spacing)
| -rw-r--r-- | macosx/tkMacOSXScrlbr.c | 6 | ||||
| -rw-r--r-- | macosx/tkMacOSXWm.c | 2 | ||||
| -rw-r--r-- | macosx/tkMacOSXWm.h | 2 | ||||
| -rw-r--r-- | xlib/xcolors.c | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/macosx/tkMacOSXScrlbr.c b/macosx/tkMacOSXScrlbr.c index 1f5470c..49ba999 100644 --- a/macosx/tkMacOSXScrlbr.c +++ b/macosx/tkMacOSXScrlbr.c @@ -285,8 +285,8 @@ TkpComputeScrollbarGeometry( } - - + + /* *---------------------------------------------------------------------- @@ -527,7 +527,7 @@ UpdateControlValues( * <EnterNotify>, and <LeaveNotify> events. Scrollbar appearance is modified. * *-------------------------------------------------------------- - */ + */ static int ScrollbarPress(TkScrollbar *scrollPtr, XEvent *eventPtr) diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c index dfb7912..75473bf 100644 --- a/macosx/tkMacOSXWm.c +++ b/macosx/tkMacOSXWm.c @@ -1,5 +1,5 @@ /* - * tkMacOSXWm.c -- + * tkMacOSXWm.c -- * * This module takes care of the interactions between a Tk-based * application and the window manager. Among other things, it implements diff --git a/macosx/tkMacOSXWm.h b/macosx/tkMacOSXWm.h index 8256b54..e904f50 100644 --- a/macosx/tkMacOSXWm.h +++ b/macosx/tkMacOSXWm.h @@ -11,7 +11,7 @@ */ #ifndef _TKMACWM -#define _TKMACWM +#define _TKMACWM #include "tkMacOSXInt.h" #include "tkMenu.h" diff --git a/xlib/xcolors.c b/xlib/xcolors.c index 36dc67c..78fd44b 100644 --- a/xlib/xcolors.c +++ b/xlib/xcolors.c @@ -350,11 +350,11 @@ XParseColor( * digits in the spec. Ergo, it is not a vailid color string. * (Bug f0188aca9e) */ - + if (*p != '\0') { return 0; } - + switch ((int)(p-spec)) { case 3: colorPtr->red = US(((value >> 8) & 0xf) * 0x1111); |