Hello community, here is the log from the commit of package xterm for openSUSE:Factory checked in at 2012-10-16 21:36:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xterm (Old) and /work/SRC/openSUSE:Factory/.xterm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xterm", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/xterm/xterm.changes 2012-10-13 21:11:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xterm.new/xterm.changes 2012-10-16 21:36:31.000000000 +0200 @@ -1,0 +2,17 @@ +Tue Oct 16 14:49:09 UTC 2012 - [email protected] + +-Patch #284 - 2012/10/14 + * amend configurability changes for icons from patch #283, moving the + new functionality to the iconHint resource to avoid conflict with + existing uses of the iconName resource in the Shell widget (report + by Emanuel Haupt). + * fix documentation errata (reports by Miroslav Lichvar): + + correct manpage default for allowTcapOps (see patch #243 + + modify documentation for configure --enable-backarrow-key to + match the script (see patch #280). + + fix typo in minstall.sh in patch #283, which made the + leading-cap "Xterm" become "xterm" (patch by Miroslav). + * fix two typos in configure.in from patch #283 changes; one broke + the --regex configure option (report by H Merijn Brand). + +------------------------------------------------------------------- Old: ---- xterm-283.tgz xterm-283.tgz.asc New: ---- xterm-284.tgz xterm-284.tgz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xterm.spec ++++++ --- /var/tmp/diff_new_pack.OHlxzz/_old 2012-10-16 21:36:34.000000000 +0200 +++ /var/tmp/diff_new_pack.OHlxzz/_new 2012-10-16 21:36:34.000000000 +0200 @@ -47,7 +47,7 @@ %if 0%{?suse_version} > 1210 Requires: luit %endif -Version: 283 +Version: 284 Release: 0 Summary: The basic X terminal program License: MIT ++++++ xterm-283.tgz -> xterm-284.tgz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-283/INSTALL new/xterm-284/INSTALL --- old/xterm-283/INSTALL 2012-09-22 14:22:47.000000000 +0200 +++ new/xterm-284/INSTALL 2012-10-11 01:33:29.000000000 +0200 @@ -1,4 +1,4 @@ --- $XTermId: INSTALL,v 1.138 2012/09/22 12:22:47 tom Exp $ +-- $XTermId: INSTALL,v 1.139 2012/10/10 23:33:29 tom Exp $ ------------------------------------------------------------------------------- -- Copyright 1997-2011,2012 by Thomas E. Dickey -- @@ -359,7 +359,7 @@ This sets the default resource value, which is shown in the manpage. - --enable-backarrow-is-del set default backarrowKey resource (default: true) + --enable-backarrow-key set default backarrowKey resource (default: true) This sets the default resource value, which is shown in the manpage. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-283/MANIFEST new/xterm-284/MANIFEST --- old/xterm-283/MANIFEST 2012-10-09 12:52:36.000000000 +0200 +++ new/xterm-284/MANIFEST 2012-10-11 00:18:21.000000000 +0200 @@ -1,4 +1,4 @@ -MANIFEST for xterm-283, version xterm-283 +MANIFEST for xterm-284, version xterm-284 -------------------------------------------------------------------------------- MANIFEST this file 256colres.h resource-definitions for 256-color mode diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-283/Makefile.in new/xterm-284/Makefile.in --- old/xterm-283/Makefile.in 2012-10-09 02:28:09.000000000 +0200 +++ new/xterm-284/Makefile.in 2012-10-14 21:58:03.000000000 +0200 @@ -1,4 +1,4 @@ -## $XTermId: Makefile.in,v 1.204 2012/10/09 00:28:09 tom Exp $ +## $XTermId: Makefile.in,v 1.205 2012/10/14 19:58:03 tom Exp $ # ----------------------------------------------------------------------------- # this file is part of xterm # @@ -223,13 +223,14 @@ ls -l \$$name @XTERM_SYMLINK@ ) ; \ fi" +MINSTALL_ARGS = $(appsdir) $(CLASS) $(actual_xterm) $(pixmapdir) install \ install-man \ install-full :: $(MANDIR) - $(SHELL) ./minstall "$(INSTALL_DATA)" $(srcdir)/xterm.man $(MANDIR)/$(actual_xterm).$(manext) $(appsdir) $(CLASS) $(actual_xterm) - $(SHELL) ./minstall "$(INSTALL_DATA)" $(srcdir)/resize.man $(MANDIR)/$(actual_resize).$(manext) $(appsdir) $(CLASS) $(actual_xterm) - $(SHELL) ./minstall "$(INSTALL_DATA)" $(srcdir)/uxterm.man $(MANDIR)/$(actual_uxterm).$(manext) $(appsdir) $(CLASS) $(actual_xterm) - $(SHELL) ./minstall "$(INSTALL_DATA)" $(srcdir)/koi8rxterm.man $(MANDIR)/$(actual_k8term).$(manext) $(appsdir) $(CLASS) $(actual_xterm) + $(SHELL) ./minstall "$(INSTALL_DATA)" $(srcdir)/xterm.man $(MANDIR)/$(actual_xterm).$(manext) $(MINSTALL_ARGS) + $(SHELL) ./minstall "$(INSTALL_DATA)" $(srcdir)/resize.man $(MANDIR)/$(actual_resize).$(manext) $(MINSTALL_ARGS) + $(SHELL) ./minstall "$(INSTALL_DATA)" $(srcdir)/uxterm.man $(MANDIR)/$(actual_uxterm).$(manext) $(MINSTALL_ARGS) + $(SHELL) ./minstall "$(INSTALL_DATA)" $(srcdir)/koi8rxterm.man $(MANDIR)/$(actual_k8term).$(manext) $(MINSTALL_ARGS) @-$(SHELL) -c "if test @XTERM_SYMLINK@ != NONE ; then cd $(MANDIR) && rm -f @XTERM_SYMLINK@.$(manext) ; fi" @-$(SHELL) -c "if test @XTERM_SYMLINK@ != NONE ; then cd $(MANDIR) && $(LN_S) $(actual_xterm).$(manext) @XTERM_SYMLINK@.$(manext) ; fi" @-$(SHELL) -c "if test @XTERM_SYMLINK@ != NONE ; then cd $(MANDIR) && echo '... created symbolic link:' && ls -l $(actual_xterm).$(manext) @XTERM_SYMLINK@.$(manext) ; fi" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-283/configure new/xterm-284/configure --- old/xterm-283/configure 2012-10-07 22:55:52.000000000 +0200 +++ new/xterm-284/configure 2012-10-11 00:16:12.000000000 +0200 @@ -13840,7 +13840,7 @@ if test "$enable_active_icon" = no ; then cat >>confdefs.h <<\EOF -#define NO_ACTIVE_ICON 0 +#define NO_ACTIVE_ICON 1 EOF fi @@ -16295,7 +16295,7 @@ fi cat >>confdefs.h <<\EOF -#define OPT_SELECT_REGEX 0 +#define OPT_SELECT_REGEX 1 EOF fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-283/configure.in new/xterm-284/configure.in --- old/xterm-283/configure.in 2012-10-05 02:25:44.000000000 +0200 +++ new/xterm-284/configure.in 2012-10-11 01:32:47.000000000 +0200 @@ -1,4 +1,4 @@ -dnl $XTermId: configure.in,v 1.304 2012/10/05 00:25:44 tom Exp $ +dnl $XTermId: configure.in,v 1.306 2012/10/10 23:32:47 tom Exp $ dnl dnl ----------------------------------------------------------------------------- dnl this file is part of xterm @@ -302,7 +302,7 @@ ############################################################################### AC_MSG_CHECKING(if backarrow-key should be DEL) CF_ARG_DISABLE(backarrow-key, - [ --enable-backarrow-is-del set default backarrowKey resource (default: true)], + [ --enable-backarrow-key set default backarrowKey resource (default: true)], [backarrow_is_del=$enableval], [backarrow_is_del=yes]) CF_XBOOL_RESULT(DEF_BACKARO_DEL,backarrow_is_del,[Define to 1 if backarrow-key should be DEL]) @@ -384,7 +384,7 @@ [enable_active_icon=yes]) AC_MSG_RESULT($enable_active_icon) if test "$enable_active_icon" = no ; then - AC_DEFINE(NO_ACTIVE_ICON,0,[Define to 0 to disable X11R6.3 active-icon feature]) + AC_DEFINE(NO_ACTIVE_ICON,1,[Define to 1 to disable X11R6.3 active-icon feature]) fi AC_MSG_CHECKING(if you want ANSI color) @@ -740,7 +740,7 @@ AC_MSG_ERROR(Only POSIX or PCRE regular expressions are supported) fi fi - AC_DEFINE(OPT_SELECT_REGEX,0,[Define to 0 to disable regular-expression selections]) + AC_DEFINE(OPT_SELECT_REGEX,1,[Define to 1 to enable regular-expression selections]) fi AC_MSG_CHECKING(if you want support for right-scrollbar) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-283/data.h new/xterm-284/data.h --- old/xterm-283/data.h 2012-03-26 23:48:09.000000000 +0200 +++ new/xterm-284/data.h 2012-10-14 20:51:30.000000000 +0200 @@ -1,4 +1,4 @@ -/* $XTermId: data.h,v 1.120 2012/03/26 21:48:09 tom Exp $ */ +/* $XTermId: data.h,v 1.121 2012/10/14 18:51:30 tom Exp $ */ /* * Copyright 2002-2011,2012 by Thomas E. Dickey @@ -144,6 +144,7 @@ typedef struct XTERM_RESOURCE { char *icon_geometry; char *title; + char *icon_hint; char *icon_name; char *term_name; char *tty_modes; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-283/main.c new/xterm-284/main.c --- old/xterm-283/main.c 2012-08-24 17:28:59.000000000 +0200 +++ new/xterm-284/main.c 2012-10-14 20:55:00.000000000 +0200 @@ -1,4 +1,4 @@ -/* $XTermId: main.c,v 1.687 2012/08/24 15:28:59 tom Exp $ */ +/* $XTermId: main.c,v 1.688 2012/10/14 18:55:00 tom Exp $ */ /* * Copyright 2002-2011,2012 by Thomas E. Dickey @@ -832,6 +832,7 @@ { Sres("iconGeometry", "IconGeometry", icon_geometry, NULL), Sres(XtNtitle, XtCTitle, title, NULL), + Sres(XtNiconHint, XtCIconHint, icon_hint, NULL), Sres(XtNiconName, XtCIconName, icon_name, NULL), Sres("termName", "TermName", term_name, NULL), Sres("ttyModes", "TtyModes", tty_modes, NULL), @@ -2382,9 +2383,10 @@ XtSetArg(args[0], XtNtitle, resource.title); XtSetArg(args[1], XtNiconName, resource.icon_name); - TRACE(("setting:\n\ttitle \"%s\"\n\ticon \"%s\"\n\tbased on command \"%s\"\n", + TRACE(("setting:\n\ttitle \"%s\"\n\ticon \"%s\"\n\thint \"%s\"\n\tbased on command \"%s\"\n", resource.title, resource.icon_name, + NonNull(resource.icon_hint), *command_to_exec)); XtSetValues(toplevel, args, 2); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-283/minstall.in new/xterm-284/minstall.in --- old/xterm-283/minstall.in 2012-10-09 01:02:57.000000000 +0200 +++ new/xterm-284/minstall.in 2012-10-14 21:45:07.000000000 +0200 @@ -1,5 +1,5 @@ #!/bin/sh -# $XTermId: minstall.in,v 1.8 2012/10/08 23:02:57 tom Exp $ +# $XTermId: minstall.in,v 1.10 2012/10/14 19:45:07 tom Exp $ # ----------------------------------------------------------------------------- # this file is part of xterm # @@ -42,6 +42,7 @@ # $4 = app-defaults directory # $5 = app-defaults class # $6 = application name, normally "xterm" +# $7 = pixmap directory # # Other values correspond to definitions in xtermcfg.h, and cannot be directly # modified using "make". They are substituted directly into this script. @@ -71,6 +72,7 @@ APPS_DIR="$4" APP_TYPE="$5" APP_name="$6" +XPMS_DIR="$7" suffix=`echo "$END_FILE" | sed -e 's%^.*\.%%'` NEW_FILE=temp$$ @@ -121,7 +123,7 @@ sed -e 's%__vendorversion__%"X Window System"%' \ -e "s%^\.ds N Xterm%.ds n $APP_Name%" \ - -e "s%^\.ds n xterm%.ds n $APP_name%" \ + -e "s%^\.ds n xterm%.ds N $APP_name%" \ -e s%__default_termname__%@default_TERM@% \ -e s%__default_termid__%@default_termid@% \ -e s%__alt_sends_esc__%@alt_sends_esc@% \ @@ -133,6 +135,7 @@ -e s%__apploaddir__%$APPS_DIR% \ -e s%__mansuffix__%$MY_MANSECT%g \ -e s%__miscmansuffix__%$X_MANSECT%g \ + -e s%__pixmapsdir__%$XPMS_DIR% \ -e s%fIutmp'\\%fI'$UTMP_NAME'\\%g' \ -e s%/etc/utmp%$UTMP_PATH%g \ -e s%fIwtmp'\\%fI'$WTMP_NAME'\\%g' \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-283/misc.c new/xterm-284/misc.c --- old/xterm-283/misc.c 2012-10-09 02:24:42.000000000 +0200 +++ new/xterm-284/misc.c 2012-10-14 20:53:14.000000000 +0200 @@ -1,4 +1,4 @@ -/* $XTermId: misc.c,v 1.623 2012/10/09 00:24:42 tom Exp $ */ +/* $XTermId: misc.c,v 1.624 2012/10/14 18:53:14 tom Exp $ */ /* * Copyright 1999-2011,2012 by Thomas E. Dickey @@ -4295,7 +4295,7 @@ static char * x_find_icon(char **work, int *state, const char *suffix) { - const char *filename = resource.icon_name; + const char *filename = resource.icon_hint; const char *prefix = PIXMAP_ROOTDIR; const char *larger = "_48x48"; char *result = 0; @@ -4338,7 +4338,7 @@ static const XPM_DATA * BuiltInXPM(const XPM_DATA * table, Cardinal length) { - const char *find = resource.icon_name; + const char *find = resource.icon_hint; const XPM_DATA *result = 0; if (!IsEmpty(find)) { Cardinal n; @@ -4408,9 +4408,9 @@ #include <icons/mini.xterm_48x48.xpm> #endif - TRACE(("xtermLoadIcon %p:%s\n", (void *) xw, NonNull(resource.icon_name))); + TRACE(("xtermLoadIcon %p:%s\n", (void *) xw, NonNull(resource.icon_hint))); - if (!IsEmpty(resource.icon_name)) { + if (!IsEmpty(resource.icon_hint)) { int state = 0; while (x_find_icon(&workname, &state, ".xpm") != 0) { Pixmap resIcon = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-283/os2main.c new/xterm-284/os2main.c --- old/xterm-283/os2main.c 2012-03-28 01:09:20.000000000 +0200 +++ new/xterm-284/os2main.c 2012-10-14 20:55:18.000000000 +0200 @@ -1,4 +1,4 @@ -/* $XTermId: os2main.c,v 1.276 2012/03/27 23:09:20 tom Exp $ */ +/* $XTermId: os2main.c,v 1.277 2012/10/14 18:55:18 tom Exp $ */ /* removed all foreign stuff to get the code more clear (hv) * and did some rewrite for the obscure OS/2 environment @@ -264,6 +264,7 @@ { Sres("iconGeometry", "IconGeometry", icon_geometry, NULL), Sres(XtNtitle, XtCTitle, title, NULL), + Sres(XtNiconHint, XtCIconHint, icon_hint, NULL), Sres(XtNiconName, XtCIconName, icon_name, NULL), Sres("termName", "TermName", term_name, NULL), Sres("ttyModes", "TtyModes", tty_modes, NULL), @@ -1243,9 +1244,10 @@ XtSetArg(args[0], XtNtitle, resource.title); XtSetArg(args[1], XtNiconName, resource.icon_name); - TRACE(("setting:\n\ttitle \"%s\"\n\ticon \"%s\"\n\tbased on command \"%s\"\n", + TRACE(("setting:\n\ttitle \"%s\"\n\ticon \"%s\"\n\thint \"%s\"\n\tbased on command \"%s\"\n", resource.title, resource.icon_name, + NonNull(resource.icon_hint), *command_to_exec)); XtSetValues(toplevel, args, 2); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-283/package/debian/changelog new/xterm-284/package/debian/changelog --- old/xterm-283/package/debian/changelog 2012-10-02 02:45:53.000000000 +0200 +++ new/xterm-284/package/debian/changelog 2012-10-11 00:17:38.000000000 +0200 @@ -1,3 +1,10 @@ +xterm-dev (284) unstable; urgency=low + + * fix documentation errata + * fix regression in --enable-regex + + -- Thomas E. Dickey <[email protected]> Wed, 10 Oct 2012 18:17:35 -0400 + xterm-dev (283) unstable; urgency=low * Miscellaneous fixes. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-283/package/xterm.spec new/xterm-284/package/xterm.spec --- old/xterm-283/package/xterm.spec 2012-10-09 02:31:06.000000000 +0200 +++ new/xterm-284/package/xterm.spec 2012-10-11 00:16:39.000000000 +0200 @@ -1,7 +1,7 @@ -# $XTermId: xterm.spec,v 1.36 2012/10/09 00:31:06 tom Exp $ +# $XTermId: xterm.spec,v 1.37 2012/10/10 22:16:39 tom Exp $ Summary: X terminal emulator (development version) Name: xterm-dev -Version: 283 +Version: 284 Release: 1 License: X11 Group: User Interface/X diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-283/trace.c new/xterm-284/trace.c --- old/xterm-283/trace.c 2012-05-06 20:01:58.000000000 +0200 +++ new/xterm-284/trace.c 2012-10-14 20:54:05.000000000 +0200 @@ -1,4 +1,4 @@ -/* $XTermId: trace.c,v 1.140 2012/05/06 18:01:58 tom Exp $ */ +/* $XTermId: trace.c,v 1.141 2012/10/14 18:54:05 tom Exp $ */ /* * Copyright 1997-2011,2012 by Thomas E. Dickey @@ -796,6 +796,7 @@ Trace("XTERM_RESOURCE settings:\n"); XRES_S(icon_geometry); XRES_S(title); + XRES_S(icon_hint); XRES_S(icon_name); XRES_S(term_name); XRES_S(tty_modes); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-283/version.h new/xterm-284/version.h --- old/xterm-283/version.h 2012-10-02 02:45:05.000000000 +0200 +++ new/xterm-284/version.h 2012-10-11 00:15:05.000000000 +0200 @@ -1,4 +1,4 @@ -/* $XTermId: version.h,v 1.343 2012/10/02 00:45:05 tom Exp $ */ +/* $XTermId: version.h,v 1.344 2012/10/10 22:15:05 tom Exp $ */ /* * Copyright 1998-2011,2012 by Thomas E. Dickey @@ -36,7 +36,7 @@ * version of X to which this version of xterm has been built. The number in * parentheses is my patch number (Thomas E. Dickey). */ -#define XTERM_PATCH 283 +#define XTERM_PATCH 284 #ifndef __vendorversion__ #define __vendorversion__ "XTerm" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-283/xterm.h new/xterm-284/xterm.h --- old/xterm-283/xterm.h 2012-10-09 02:04:43.000000000 +0200 +++ new/xterm-284/xterm.h 2012-10-14 20:34:32.000000000 +0200 @@ -1,4 +1,4 @@ -/* $XTermId: xterm.h,v 1.707 2012/10/09 00:04:43 tom Exp $ */ +/* $XTermId: xterm.h,v 1.708 2012/10/14 18:34:32 tom Exp $ */ /* * Copyright 1999-2011,2012 by Thomas E. Dickey @@ -350,13 +350,13 @@ #define XtNallowWindowOps "allowWindowOps" #define XtNaltIsNotMeta "altIsNotMeta" #define XtNaltSendsEscape "altSendsEscape" +#define XtNalternateScroll "alternateScroll" #define XtNalwaysBoldMode "alwaysBoldMode" #define XtNalwaysHighlight "alwaysHighlight" #define XtNalwaysUseMods "alwaysUseMods" #define XtNanswerbackString "answerbackString" #define XtNappcursorDefault "appcursorDefault" #define XtNappkeypadDefault "appkeypadDefault" -#define XtNalternateScroll "alternateScroll" #define XtNautoWrap "autoWrap" #define XtNawaitInput "awaitInput" #define XtNbackarrowKey "backarrowKey" @@ -428,6 +428,7 @@ #define XtNhighlightTextColor "highlightTextColor" #define XtNhpLowerleftBugCompat "hpLowerleftBugCompat" #define XtNi18nSelections "i18nSelections" +#define XtNiconHint "iconHint" #define XtNinitialFont "initialFont" #define XtNinternalBorder "internalBorder" #define XtNitalicULMode "italicULMode" @@ -604,6 +605,7 @@ #define XtCHighlightSelection "HighlightSelection" #define XtCHpLowerleftBugCompat "HpLowerleftBugCompat" #define XtCI18nSelections "I18nSelections" +#define XtCIconHint "IconHint" #define XtCInitialFont "InitialFont" #define XtCJumpScroll "JumpScroll" #define XtCKeepSelection "KeepSelection" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-283/xterm.log.html new/xterm-284/xterm.log.html --- old/xterm-283/xterm.log.html 2012-10-09 12:42:15.000000000 +0200 +++ new/xterm-284/xterm.log.html 2012-10-14 23:43:46.000000000 +0200 @@ -31,7 +31,7 @@ * sale, use or other dealings in this Software without prior written * * authorization. * ***************************************************************************** - $XTermId: xterm.log.html,v 1.1246 2012/10/09 10:42:15 tom Exp $ + $XTermId: xterm.log.html,v 1.1253 2012/10/14 21:43:46 tom Exp $ --> <html> @@ -70,6 +70,8 @@ the latest version of this file.</p> <ul> + <li><a href="#xterm_284">Patch #284 - 2012/10/14</a></li> + <li><a href="#xterm_283">Patch #283 - 2012/10/09</a></li> <li><a href="#xterm_282">Patch #282 - 2012/09/28</a></li> @@ -849,6 +851,38 @@ <li><a href="#xterm_01">Patch #1 - 1996/1/6</a></li> </ul> + <h1><a name="xterm_284" id="xterm_284">Patch #284 - + 2012/10/14</a></h1> + + <ul> + <li>amend configurability changes for icons from <a href= + "#xterm_283">patch #283</a>, moving the new functionality to + the <code>iconHint</code> resource to avoid conflict with + existing uses of the <code>iconName</code> resource in the + <code>Shell</code> widget (report by Emanuel Haupt).</li> + + <li>fix documentation errata (reports by Miroslav Lichvar): + + <ul> + <li>correct manpage default for <code>allowTcapOps</code> + (see <a href="#xterm_243">patch #243</a></li> + + <li>modify documentation for configure + <code>--enable-backarrow-key</code> to match the script + (see <a href="#xterm_280">patch #280</a>).</li> + + <li>fix typo in <code>minstall.sh</code> in <a href= + "#xterm_283">patch #283</a>, which made the leading-cap + "Xterm" become "xterm" (patch by Miroslav).</li> + </ul> + </li> + + <li>fix two typos in configure.in from <a href= + "#xterm_283">patch #283</a> changes; one broke the + <code>--regex</code> configure option (report by H Merijn + Brand).</li> + </ul> + <h1><a name="xterm_283" id="xterm_283">Patch #283 - 2012/10/09</a></h1> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-283/xterm.man new/xterm-284/xterm.man --- old/xterm-283/xterm.man 2012-10-09 00:58:12.000000000 +0200 +++ new/xterm-284/xterm.man 2012-10-14 21:47:51.000000000 +0200 @@ -1,5 +1,5 @@ '\" t -.\" $XTermId: xterm.man,v 1.546 2012/10/08 22:58:12 tom Exp $ +.\" $XTermId: xterm.man,v 1.548 2012/10/14 19:47:51 tom Exp $ .\" .\" Copyright 1996-2011,2012 by Thomas E. Dickey .\" @@ -1291,15 +1291,18 @@ Specifies the preferred size and position of the application when iconified. It is not necessarily obeyed by all window managers. .TP 8 -.B "iconName (\fPclass\fB IconName)" -Specifies the icon name. -\fI\*n\fP provides no default value; -some window managers may assume the application name, e.g., \*(``\*n\*(''. +.B "iconHint (\fPclass\fB IconHint)" +Specifies a icon which will be added to the window manager hints. +\fI\*n\fP provides no default value. .IP -If the \fBiconName\fP resource is given (or is set via the \fB\-n\fP option) +If the \fBiconHint\fP resource is given (or is set via the \fB\-n\fP option) \fI\*n\fP searches for a pixmap file with that name, -possibly adding a \*(``.xpm\*('' suffix. -If it is able to load that file, \fI\*n\fP sets the window manager +in the current directory as well as in __pixmapsdir__. +if the resource does not specify an absolute pathname. +In each case, \fI\*n\fP adds \*(``_48x48\*('' +and/or \*(``.xpm\*('' to the filename +after trying without those suffixes. +If it is able to load the file, \fI\*n\fP sets the window manager hint for the icon-pixmap. These pixmaps are distributed with \fI\*n\fP, and can optionally be compiled-in: @@ -1326,16 +1329,25 @@ largest of the pixmaps as a default. That is, \*(``mini.\*n\*('' is the same as \*(``mini.\*n_48x48\*(''. .IP -If no \fBiconName\fP resource is given +If no \fBiconHint\fP resource is given (or if none of the compiled-in names matches), \*n uses \*(``mini.\*n\*('' (which is always compiled-in). .IP -The \fBiconName\fP resource has no effect on \*(``desktop\*('' files, +The \fBiconHint\fP resource has no effect on \*(``desktop\*('' files, including \*(``panel\*('' and \*(``menu\*(''. Those are typically set via a \*(``.desktop\*('' file; \fI\*n\fP provides samples for itself (and the \fIu\*n\fP script). The more capable desktop systems allow changing the icon on a per-user basis. .TP 8 +.B "iconName (\fPclass\fB IconName)" +Specifies the icon name. +\fI\*n\fP provides no default value; +some window managers may assume the application name, e.g., \*(``\*n\*(''. +.IP +Setting the \fBiconName\fP resource sets the window title +unless overridden by \fBzIconBeep\fP +or the control sequences which change the window title. +.TP 8 .B "keyboardType (\fPclass\fB KeyboardType)" Enables one (or none) of the various keyboard-type resources: \fBhpFunctionKeys\fP, @@ -1721,7 +1733,7 @@ Specifies whether control sequences that query the terminal's notion of its function-key strings, as termcap or terminfo capabilities should be allowed. -The default is \*(``false\*(''. +The default is \*(``true\*(''. .IP A few programs, e.g., \fIvim\fP, use this feature to get an accurate description of the terminal's capabilities, @@ -6216,6 +6228,9 @@ .IR __apploaddir__/__default_class__ . If you do not do this, \fI\*n\fP uses its compiled-in default resource settings for colors. +.TP 5 +.I __pixmapsdir__ +the directory in which \fI\*n\fP's pixmap icon files are installed. . . .SH ERROR MESSAGES -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
