diff options
author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-04-04 15:10:46 +0000 |
---|---|---|
committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-04-04 15:10:46 +0000 |
commit | 3f1e1ec27086e513778a2fc86e249a11ab92fe41 (patch) | |
tree | 75e82b3c8cc0a7321b566c0f831566abb383dae2 /app/xterm/cachedGCs.c | |
parent | 142e50ea1b148e92d0c6d2b57c5895e7d6b7065a (diff) |
Update to xterm 243. tested by naddy@.
Patch #243 - 2009/3/28
* revert change to default for allowTcapOps (request by Bram Moolenaar).
* reallocate result returned by xtermEnvLocale() to avoid reference to
freed memory after handling menuLocale resource.
* fix an old (X11R5) bug in tek4014 for switching fontsizes.
* add resource defaultString to make configurable the use of "#" when
pastes of UTF-8 text fail due to limitations in the current locale settings.
* make the set of selection target Atom's configurable by two new
resources eightBitSelectTypes and utf8SelectTypes, e.g., to use the TEXT
Atom in preference to UTF8_STRING (discussion with Stanislav Sedov
regarding koi8rxterm and the FreeBSD port).
* modify handling of TARGETS Atom by making it return exactly the set of
targets as those which xterm is currently providing.
* set MANPAGER and PAGER explicitly to /bin/cat in minstall.sh to work
around /etc/man.conf's with those variables already set (report by
Mar'yasin Semion).
* improve error-checking of tcap-query parser.
* add check for keyboard tcap), which ensures that terminal descriptions
containing the same string for shifted/unshifted keys will be seen by
tcap-query as only the unshifted key. (This would only happen with an
incorrect terminal description).
* fix conversion for input event-state to modifier-parameter which made
tcap-query feature not work with tcapFunctionKeys (keyboard type tcap).
* add "DEF_ALLOW_XXX" definitions to main.h to allow overriding the
default compiled-in values for "allowxxx" resources.
* remove check on bell-percentage added in patch #242, which disallowed
zero/negative values (Redhat Bugzilla #487829).
Diffstat (limited to 'app/xterm/cachedGCs.c')
-rw-r--r-- | app/xterm/cachedGCs.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/xterm/cachedGCs.c b/app/xterm/cachedGCs.c index 88819fc78..3c525ee5e 100644 --- a/app/xterm/cachedGCs.c +++ b/app/xterm/cachedGCs.c @@ -1,4 +1,4 @@ -/* $XTermId: cachedGCs.c,v 1.51 2009/02/13 00:37:46 tom Exp $ */ +/* $XTermId: cachedGCs.c,v 1.52 2009/03/26 23:59:32 tom Exp $ */ /************************************************************ @@ -812,9 +812,7 @@ swapCgs(XtermWidget xw, VTwin * cgsWin, CgsEnum dstCgsId, CgsEnum srcCgsId) int srcIndex = dataIndex(src); int dstIndex = dataIndex(dst); - tmp = *dst; - *dst = *src; - *src = tmp; + EXCHANGE(*src, *dst, tmp); relinkData(src, dstIndex); relinkData(dst, srcIndex); |