# ------------------------------------------------------------------------------
# main.c | 8 +-------
# os2main.c | 6 ------
# version.h | 4 ++--
# xterm.log.html | 9 +++++++++
# 4 files changed, 12 insertions(+), 15 deletions(-)
# ------------------------------------------------------------------------------
Index: main.c
--- xterm-138+/main.c Wed Jun 14 15:50:37 2000
+++ xterm-139/main.c Sat Jun 17 23:04:47 2000
@@ -1302,7 +1302,6 @@
Widget form_top, menu_top;
register TScreen *screen;
int mode;
- char *app_name = "XTerm";
/* Do these first, since we may not be able to open the display */
ProgramName = argv[0];
@@ -1312,11 +1311,6 @@
Version();
if (abbrev(argv[1], "-help"))
Help();
- for (n = 1; n < argc - 1; n++) {
- if (abbrev(argv[n], "-name")) {
- app_name = argv[n+1];
- }
- }
}
/* This dumps core on HP-UX 9.05 with X11R5 */
@@ -1625,7 +1619,7 @@
#endif
XtSetErrorHandler(xt_error);
- toplevel = XtAppInitialize (&app_con, app_name,
+ toplevel = XtAppInitialize (&app_con, "XTerm",
optionDescList,
XtNumber(optionDescList),
&argc, argv, fallback_resources,
Index: os2main.c
--- xterm-138+/os2main.c Wed Jun 14 15:50:37 2000
+++ xterm-139/os2main.c Sat Jun 17 23:04:29 2000
@@ -833,7 +833,6 @@
Widget form_top, menu_top;
register TScreen *screen;
int mode;
- char *app_name = "XTerm";
/* Do these first, since we may not be able to open the display */
ProgramName = argv[0];
@@ -843,11 +842,6 @@
Version();
if (abbrev(argv[1], "-help"))
Help();
- for (n = 1; n < argc - 1; n++) {
- if (abbrev(argv[n], "-name")) {
- app_name = argv[n+1];
- }
- }
}
/* XXX: for some obscure reason EMX seems to lose the value of
Index: version.h
--- xterm-138+/version.h Sat Jun 17 14:42:47 2000
+++ xterm-139/version.h Sat Jun 17 22:52:21 2000
@@ -6,5 +6,5 @@
* XFree86 to which this version of xterm has been built. The number in
* parentheses is my patch number (T.Dickey).
*/
-#define XTERM_PATCH 138
-#define XFREE86_VERSION "XFree86 4.0c"
+#define XTERM_PATCH 139
+#define XFREE86_VERSION "XFree86 4.0d"
Index: xterm.log.html
--- xterm-138+/xterm.log.html Sat Jun 17 14:42:47 2000
+++ xterm-139/xterm.log.html Sat Jun 17 23:09:42 2000
@@ -42,6 +42,7 @@
xc/programs/Xserver/hw/xfree86).
<UL>
+<LI><A HREF="#xterm_139">Patch #139 - 2000/6/17 - XFree86 4.0d</A>
<LI><A HREF="#xterm_138">Patch #138 - 2000/6/15 - XFree86 4.0c</A>
<LI><A HREF="#xterm_137">Patch #137 - 2000/6/10 - XFree86 4.0b</A>
<LI><A HREF="#xterm_136">Patch #136 - 2000/6/3 - XFree86 4.0b</A>
@@ -182,6 +183,14 @@
<LI><A HREF="#xterm_02">Patch #2 - 1996/1/7</A>
<LI><A HREF="#xterm_01">Patch #1 - 1996/1/6</A>
</UL>
+
+<H1><A NAME="xterm_139">Patch #139 - 2000/6/17 - XFree86 4.0d</A></H1>
+<ul>
+ <li>back out change to <code>-name</code> command-line option,
+ restoring its original behavior (as noted by David Madore, the
+ correct interpretation of this option is the application instance
+ rather than the application class).
+</ul>
<H1><A NAME="xterm_138">Patch #138 - 2000/6/15 - XFree86 4.0c</A></H1>
<ul>