Hello community,
here is the log from the commit of package xterm for openSUSE:Factory checked
in at 2013-05-02 12:07:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xterm (Old)
and /work/SRC/openSUSE:Factory/.xterm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xterm"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xterm/xterm.changes 2013-03-22
13:06:51.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.xterm.new/xterm.changes 2013-05-02
12:07:44.000000000 +0200
@@ -1,0 +2,29 @@
+Fri Apr 26 11:06:37 UTC 2013 - meiss...@suse.com
+
+- Patch #292 - 2013/04/25
+ * add limit-check when double-click selects a word; if the saved-lines
+ were scrolled back and the word selected wrapped at the screen's lower
+ right corner, an assertion was triggered (patch by Taketo Kabe).
+ * correct limit-check in unsaveEditBufLines, fixing a case where
+ enlarging the terminal size could show a blank line where there
+ actually is available text (patch by Bertram Felgenhauer).
+ * add PasteControls feature to allowWindowOps which by default
+ disallows pasting control characters other than formatting such as
+ carriage return (discussion with Hayaki Saito).
+ * fix typo in ctlseqs.ms for DECRQM response (patch by Emanuele
+ Giaquinta).
+ * update default shown in configure --help message for
+ --with-terminal-id option (patch by Andres Perera).
+ * rename script/preprocessor variables used for substituting the
+ backarrowKey default value for consistency (patch by Andres
+ Perera).
+ * set umask to 077 before creating debugging-trace files.
+ * add configure option --disable-openpty to control whether openpty()
+ may be used in preference to posix_openpt().
+ * improve workaround from patch #279 for BSD systems which do not
+ complete initialization until both sides of the pseudoterminal are
+ opened, by preferring openpty() function over posix_openpt() when
+ available (report by Christian Weisgerber).
+- refreshed xterm-disallow-window-and-fonts-ops.patch
+
+-------------------------------------------------------------------
Old:
----
xterm-291.tgz
xterm-291.tgz.asc
New:
----
xterm-292.tgz
xterm-292.tgz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xterm.spec ++++++
--- /var/tmp/diff_new_pack.duupOe/_old 2013-05-02 12:07:47.000000000 +0200
+++ /var/tmp/diff_new_pack.duupOe/_new 2013-05-02 12:07:47.000000000 +0200
@@ -52,7 +52,7 @@
%if 0%{?suse_version} > 1210
Requires: luit
%endif
-Version: 291
+Version: 292
Release: 0
Summary: The basic X terminal program
License: MIT
++++++ xterm-291.tgz -> xterm-292.tgz ++++++
++++ 12081 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-291/INSTALL new/xterm-292/INSTALL
--- old/xterm-291/INSTALL 2013-02-03 20:36:47.000000000 +0100
+++ new/xterm-292/INSTALL 2013-04-17 11:13:09.000000000 +0200
@@ -1,4 +1,4 @@
--- $XTermId: INSTALL,v 1.142 2013/02/03 19:36:47 tom Exp $
+-- $XTermId: INSTALL,v 1.143 2013/04/17 09:13:09 tom Exp $
-------------------------------------------------------------------------------
-- Copyright 1997-2012,2013 by Thomas E. Dickey
--
@@ -240,6 +240,12 @@
(The same ifdef controls the metaSendsEscape support).
+ --disable-openpty disable openpty, prefer other interfaces
+
+ Do not check for, or use openpty(). Instead, use other interfaces such
+ as posix_openpt(). Modern (sic) BSD systems should have a workable
+ openpty() interface. Older systems may not.
+
--disable-paste64 disable support for bracketed paste mode
Do not compile-in code to support experimental bracketed paste mode,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-291/MANIFEST new/xterm-292/MANIFEST
--- old/xterm-291/MANIFEST 2013-02-27 01:08:39.000000000 +0100
+++ new/xterm-292/MANIFEST 2013-03-27 00:10:33.000000000 +0100
@@ -1,4 +1,4 @@
-MANIFEST for xterm-291, version xterm-291
+MANIFEST for xterm-292, version xterm-292
--------------------------------------------------------------------------------
MANIFEST this file
256colres.h resource-definitions for 256-color mode
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-291/button.c new/xterm-292/button.c
--- old/xterm-291/button.c 2013-02-06 10:56:15.000000000 +0100
+++ new/xterm-292/button.c 2013-04-25 03:05:41.000000000 +0200
@@ -1,4 +1,4 @@
-/* $XTermId: button.c,v 1.451 2013/02/06 09:56:15 tom Exp $ */
+/* $XTermId: button.c,v 1.454 2013/04/25 01:05:41 Taketo.Kabe Exp $ */
/*
* Copyright 1999-2012,2013 by Thomas E. Dickey
@@ -1963,6 +1963,50 @@
}
#endif /* OPT_READLINE */
+/*
+ * Unless enabled by the user, strip control characters other than formatting.
+ */
+static size_t
+removeControls(XtermWidget xw, char *value)
+{
+ TScreen *screen = TScreenOf(xw);
+ size_t dst = 0;
+ size_t src = 0;
+
+ if (screen->allowPasteControls) {
+ dst = strlen(value);
+ } else {
+ while ((value[dst] = value[src]) != '\0') {
+ int ch = CharOf(value[src++]);
+ if (ch < 32) {
+ switch (ch) {
+ case '\b':
+ case '\t':
+ case '\n':
+ case '\r':
+ ++dst;
+ break;
+ default:
+ continue;
+ }
+ }
+#if OPT_WIDE_CHARS
+ else if (screen->utf8_inparse)
+ ++dst;
+#endif
+#if OPT_C1_PRINT || OPT_WIDE_CHARS
+ else if (screen->c1_printable)
+ ++dst;
+#endif
+ else if (ch >= 128 && ch < 160)
+ continue;
+ else
+ ++dst;
+ }
+ }
+ return dst;
+}
+
/* SelectionReceived: stuff received selection text into pty */
/* ARGSUSED */
@@ -2068,7 +2112,7 @@
}
#endif
for (i = 0; i < text_list_count; i++) {
- size_t len = strlen(text_list[i]);
+ size_t len = removeControls(xw, text_list[i]);
if (screen->selectToBuffer) {
size_t have = (screen->internal_select
? strlen(screen->internal_select)
@@ -2839,7 +2883,6 @@
temp.col /= 2;
}
#endif
-
assert(temp.col < (int) ld->lineSize);
return CharacterClass((int) (ld->charData[temp.col]));
}
@@ -2875,6 +2918,10 @@
result = False;
}
}
+ if (cell->col > screen->max_col) {
+ /* Clicked on rightmost edge of the screen. Clamp to max_col */
+ cell->col = screen->max_col;
+ }
return result;
}
@@ -3301,6 +3348,13 @@
screen->endSel.col = 0;
NextRow(endSel);
}
+ /* Clicking on right edge will make endSel.col == screen->max_col,
+ * so clamp it. Otherwise XTERM_CELL and friends will fail assertion
+ */
+ if (screen->endSel.col > screen->max_col) {
+ screen->endSel.col = screen->max_col;
+ TRACE(("Select_WORD endSel.col clamped to %d\n",
screen->endSel.col));
+ }
}
#if OPT_WIDE_CHARS
if (screen->endSel.col
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-291/charproc.c new/xterm-292/charproc.c
--- old/xterm-291/charproc.c 2013-02-05 02:47:58.000000000 +0100
+++ new/xterm-292/charproc.c 2013-04-24 11:07:06.000000000 +0200
@@ -1,4 +1,4 @@
-/* $XTermId: charproc.c,v 1.1283 2013/02/05 01:47:58 tom Exp $ */
+/* $XTermId: charproc.c,v 1.1287 2013/04/24 09:07:06 tom Exp $ */
/*
* Copyright 1999-2012,2013 by Thomas E. Dickey
@@ -390,6 +390,8 @@
static XtResource xterm_resources[] =
{
+ Bres(XtNallowPasteControls, XtCAllowPasteControls,
+ screen.allowPasteControls, False),
Bres(XtNallowSendEvents, XtCAllowSendEvents, screen.allowSendEvent0,
False),
Bres(XtNallowColorOps, XtCAllowColorOps, screen.allowColorOp0,
DEF_ALLOW_COLOR),
Bres(XtNallowFontOps, XtCAllowFontOps, screen.allowFontOp0,
DEF_ALLOW_FONT),
@@ -407,7 +409,7 @@
Bres(XtNautoWrap, XtCAutoWrap, misc.autoWrap, True),
Bres(XtNawaitInput, XtCAwaitInput, screen.awaitInput, False),
Bres(XtNfreeBoldBox, XtCFreeBoldBox, screen.free_bold_box, False),
- Bres(XtNbackarrowKey, XtCBackarrowKey, screen.backarrow_key,
DEF_BACKARO_DEL),
+ Bres(XtNbackarrowKey, XtCBackarrowKey, screen.backarrow_key,
DEF_BACKARO_BS),
Bres(XtNbellIsUrgent, XtCBellIsUrgent, screen.bellIsUrgent, False),
Bres(XtNbellOnReset, XtCBellOnReset, screen.bellOnReset, True),
Bres(XtNboldMode, XtCBoldMode, screen.bold_mode, True),
@@ -7427,6 +7429,7 @@
init_Bres(screen.alt_sends_esc);
init_Bres(screen.meta_sends_esc);
+ init_Bres(screen.allowPasteControls);
init_Bres(screen.allowSendEvent0);
init_Bres(screen.allowColorOp0);
init_Bres(screen.allowFontOp0);
@@ -8011,8 +8014,8 @@
XtDestroyWidget(screen->scrollWidget);
}
#if OPT_FIFO_LINES
- while (screen->saved_fifo-- > 0) {
- deleteScrollback(screen, 0);
+ while (screen->saved_fifo > 0) {
+ deleteScrollback(screen);
}
#endif
while (screen->save_title != 0) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-291/configure.in new/xterm-292/configure.in
--- old/xterm-291/configure.in 2013-02-03 20:30:48.000000000 +0100
+++ new/xterm-292/configure.in 2013-04-21 21:30:21.000000000 +0200
@@ -1,4 +1,4 @@
-dnl $XTermId: configure.in,v 1.312 2013/02/03 19:30:48 tom Exp $
+dnl $XTermId: configure.in,v 1.315 2013/04/21 19:30:21 Andres.Perera Exp $
dnl
dnl
-----------------------------------------------------------------------------
dnl this file is part of xterm
@@ -147,6 +147,14 @@
XTERM_SYMLINK="$with_symlink"
fi
+AC_MSG_CHECKING(if you want to disable openpty)
+CF_ARG_DISABLE(openpty,
+ [ --disable-openpty disable openpty, prefer other interfaces],
+ [disable_openpty=yes],
+ [disable_openpty=no],
+ no)
+AC_MSG_RESULT($disable_openpty)
+
AC_MSG_CHECKING(if you want to disable setuid)
CF_ARG_DISABLE(setuid,
[ --disable-setuid disable setuid in xterm, do not install
setuid/setgid],
@@ -281,7 +289,7 @@
AC_MSG_CHECKING(for default terminal-id)
AC_ARG_WITH(terminal-id,
- [ --with-terminal-id=V set default decTerminalID (default: vt100)],
+ [ --with-terminal-id=V set default decTerminalID (default: vt420)],
[default_termid=$withval],
[default_termid=vt420])
AC_MSG_RESULT($default_termid)
@@ -302,12 +310,12 @@
AC_SUBST(default_TERM)
###############################################################################
-AC_MSG_CHECKING(if backarrow-key should be DEL)
+AC_MSG_CHECKING(if backarrow-key should be BS)
CF_ARG_DISABLE(backarrow-key,
[ --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])
+ [backarrow_is_bs=$enableval],
+ [backarrow_is_bs=yes])
+CF_XBOOL_RESULT(DEF_BACKARO_BS,backarrow_is_bs,[Define to 1 if backarrow-key
should be BS])
AC_MSG_CHECKING(if backarrow-key should be treated as erase)
CF_ARG_ENABLE(backarrow-is-erase,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-291/ctlseqs.ms new/xterm-292/ctlseqs.ms
--- old/xterm-291/ctlseqs.ms 2013-02-07 02:59:09.000000000 +0100
+++ new/xterm-292/ctlseqs.ms 2013-04-24 11:49:19.000000000 +0200
@@ -1,6 +1,6 @@
.\"#! troff -ms $1 -*- Nroff -*-
.\" "Xterm Control Sequences" document
-.\" $XTermId: ctlseqs.ms,v 1.285 2013/02/07 01:59:09 tom Exp $
+.\" $XTermId: ctlseqs.ms,v 1.288 2013/04/24 09:49:19 tom Exp $
.\"
.\"
.\" Copyright 1996-2012,2013 by Thomas E. Dickey
@@ -69,8 +69,8 @@
.\"
.ds XT XTerm
.ds xt xterm
-.ds LF Patch #289
-.ds RF 2013/02/06
+.ds LF Patch #292
+.ds RF 2013/04/24
.\"
.if n .pl 9999v \" no page breaks in nroff
.ND
@@ -1200,7 +1200,7 @@
Request DEC private mode (DECRQM).
For VT300 and up, reply is
.br
- \*(Cs\*?\*(Ps\*;\*(Pm\*$\*p
+ \*(Cs\*?\*(Ps\*;\*(Pm\*$\*y
.br
where \*(Ps is the mode number as in DECSET,
\*(Pm is the mode value as in the ANSI DECRQM.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-291/ctlseqs.txt new/xterm-292/ctlseqs.txt
--- old/xterm-291/ctlseqs.txt 2013-02-07 02:59:43.000000000 +0100
+++ new/xterm-292/ctlseqs.txt 2013-04-24 11:49:34.000000000 +0200
@@ -21,7 +21,7 @@
Thomas Dickey
XFree86 Project (1996-2006)
invisible-island.net (2006-2012)
- updated for XTerm Patch #289 (2013/02/06)
+ updated for XTerm Patch #292 (2013/04/24)
@@ -676,7 +676,7 @@
4 - permanently reset
CSI ? Ps$ p
Request DEC private mode (DECRQM). For VT300 and up, reply is
- CSI ? Ps; Pm$ p
+ CSI ? Ps; Pm$ y
where Ps is the mode number as in DECSET, Pm is the mode value
as in the ANSI DECRQM.
CSI Ps ; Ps " p
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-291/main.c new/xterm-292/main.c
--- old/xterm-291/main.c 2013-02-04 00:10:05.000000000 +0100
+++ new/xterm-292/main.c 2013-04-17 10:55:20.000000000 +0200
@@ -1,4 +1,4 @@
-/* $XTermId: main.c,v 1.716 2013/02/03 23:10:05 tom Exp $ */
+/* $XTermId: main.c,v 1.719 2013/04/17 08:55:20 tom Exp $ */
/*
* Copyright 2002-2012,2013 by Thomas E. Dickey
@@ -2605,7 +2605,9 @@
{
int result = 1;
-#if defined(HAVE_POSIX_OPENPT) && defined(HAVE_PTSNAME) &&
defined(HAVE_GRANTPT_PTY_ISATTY)
+#if defined(USE_OPENPTY)
+ result = openpty(pty, &opened_tty, ttydev, NULL, NULL);
+#elif defined(HAVE_POSIX_OPENPT) && defined(HAVE_PTSNAME) &&
defined(HAVE_GRANTPT_PTY_ISATTY)
if ((*pty = posix_openpt(O_RDWR)) >= 0) {
char *name = ptsname(*pty);
if (name != 0) {
@@ -2619,19 +2621,11 @@
}
#endif
#elif defined(PUCC_PTYD)
-
result = ((*pty = openrpty(ttydev, ptydev,
(resource.utmpInhibit ? OPTY_NOP : OPTY_LOGIN),
save_ruid, from)) < 0);
-
-#elif defined(USE_OPENPTY)
-
- result = openpty(pty, &opened_tty, ttydev, NULL, NULL);
-
#elif defined(__QNXNTO__)
-
result = pty_search(pty);
-
#else
#if defined(USE_USG_PTYS) || defined(__CYGWIN__)
#ifdef __GLIBC__ /* if __GLIBC__ and USE_USG_PTYS, we know glibc
>= 2.1 */
@@ -2780,6 +2774,11 @@
} else {
result = -1;
}
+ TRACE(("get_pty(ttydev=%s, ptydev=%s) %s fd=%d (utmp setgid)\n",
+ ttydev != 0 ? ttydev : "?",
+ ptydev != 0 ? ptydev : "?",
+ result ? "FAIL" : "OK",
+ pty != 0 ? *pty : -1));
return result;
}
#endif
@@ -3053,7 +3052,7 @@
TRACE_IDS;
TRACE(("set_owner(%s, uid=%d, gid=%d, mode=%#o\n",
- device, uid, gid, (unsigned) mode));
+ device, (int) uid, (int) gid, (unsigned) mode));
if (chown(device, uid, gid) < 0) {
why = errno;
@@ -3076,7 +3075,7 @@
(unsigned long) mode,
(unsigned long) (sb.st_mode & 0777U));
TRACE(("...stat uid=%d, gid=%d, mode=%#o\n",
- sb.st_uid, sb.st_gid, (unsigned) sb.st_mode));
+ (int) sb.st_uid, (int) sb.st_gid, (unsigned)
sb.st_mode));
}
}
TRACE(("...chmod failed: %s\n", strerror(why)));
@@ -3541,6 +3540,7 @@
TTYSIZE_COLS(ts), i));
#endif /* TTYSIZE_STRUCT */
+#if !defined(USE_OPENPTY)
#if defined(USE_USG_PTYS) || defined(HAVE_POSIX_OPENPT)
/*
* utempter checks the ownership of the device; some implementations
@@ -3552,6 +3552,7 @@
unlockpt(screen->respond);
TRACE_TTYSIZE(screen->respond, "after unlockpt");
#endif
+#endif /* !USE_OPENPTY */
added_utmp_entry = False;
#if defined(USE_UTEMPTER)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-291/main.h new/xterm-292/main.h
--- old/xterm-291/main.h 2012-06-05 02:37:22.000000000 +0200
+++ new/xterm-292/main.h 2013-04-24 10:52:20.000000000 +0200
@@ -1,7 +1,7 @@
-/* $XTermId: main.h,v 1.58 2012/06/05 00:37:22 tom Exp $ */
+/* $XTermId: main.h,v 1.61 2013/04/24 08:52:20 tom Exp $ */
/*
- * Copyright 2000-2011,2012 by Thomas E. Dickey
+ * Copyright 2000-2012,2013 by Thomas E. Dickey
*
* All Rights Reserved
*
@@ -145,8 +145,8 @@
#define DEF_BACKARO_ERASE False
#endif
-#ifndef DEF_BACKARO_DEL
-#define DEF_BACKARO_DEL True
+#ifndef DEF_BACKARO_BS
+#define DEF_BACKARO_BS True
#endif
#ifndef DEF_ALT_SENDS_ESC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-291/minstall.in new/xterm-292/minstall.in
--- old/xterm-291/minstall.in 2013-01-01 02:18:24.000000000 +0100
+++ new/xterm-292/minstall.in 2013-04-21 20:58:54.000000000 +0200
@@ -1,5 +1,5 @@
#!/bin/sh
-# $XTermId: minstall.in,v 1.18 2013/01/01 01:18:24 tom Exp $
+# $XTermId: minstall.in,v 1.19 2013/04/21 18:58:54 Andres.Perera Exp $
# -----------------------------------------------------------------------------
# this file is part of xterm
#
@@ -147,8 +147,8 @@
-e s%__default_termid__%@default_termid@% \
-e s%__alt_sends_esc__%@alt_sends_esc@% \
-e s%__meta_sends_esc__%@meta_sends_esc@% \
- -e s%__backarrow_key_is_del__%@backarrow_is_del@% \
- -e s%__backarrow_key_erase__%@backarrow_is_erase@% \
+ -e s%__backarrow_is_bs__%@backarrow_is_bs@% \
+ -e s%__backarrow_is_erase__%@backarrow_is_erase@% \
-e s%__delete_is_del__%@delete_is_del@% \
-e s%__default_class__%$APP_TYPE% \
-e s%__apploaddir__%$APPS_DIR% \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-291/package/debian/changelog new/xterm-292/package/debian/changelog
--- old/xterm-291/package/debian/changelog 2013-02-27 01:10:25.000000000
+0100
+++ new/xterm-292/package/debian/changelog 2013-03-27 00:11:19.000000000
+0100
@@ -1,3 +1,9 @@
+xterm-dev (292) unstable; urgency=low
+
+ * Miscellaneous fixes.
+
+ -- Thomas E. Dickey <dic...@invisible-island.net> Tue, 26 Mar 2013 19:11:17
-0400
+
xterm-dev (291) unstable; urgency=low
* Fix a different #282 change (Redhat #874327).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-291/package/freebsd/Makefile new/xterm-292/package/freebsd/Makefile
--- old/xterm-291/package/freebsd/Makefile 2013-02-27 01:09:35.000000000
+0100
+++ new/xterm-292/package/freebsd/Makefile 2013-03-27 00:12:06.000000000
+0100
@@ -5,7 +5,7 @@
# and "make makesum".
PORTNAME= xterm
-PORTVERSION= 291
+PORTVERSION= 292
CATEGORIES= x11
MASTER_SITES= ftp://invisible-island.net/xterm/ \
CRITICAL
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-291/package/xterm.spec new/xterm-292/package/xterm.spec
--- old/xterm-291/package/xterm.spec 2013-02-27 01:09:35.000000000 +0100
+++ new/xterm-292/package/xterm.spec 2013-03-27 00:10:40.000000000 +0100
@@ -1,7 +1,7 @@
-# $XTermId: xterm.spec,v 1.45 2013/02/27 00:09:35 tom Exp $
+# $XTermId: xterm.spec,v 1.46 2013/03/26 23:10:40 tom Exp $
Summary: X terminal emulator (development version)
Name: xterm-dev
-Version: 291
+Version: 292
Release: 1
License: X11
Group: User Interface/X
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-291/ptyx.h new/xterm-292/ptyx.h
--- old/xterm-291/ptyx.h 2013-02-13 01:42:21.000000000 +0100
+++ new/xterm-292/ptyx.h 2013-04-24 10:57:46.000000000 +0200
@@ -1,4 +1,4 @@
-/* $XTermId: ptyx.h,v 1.762 2013/02/13 00:42:21 tom Exp $ */
+/* $XTermId: ptyx.h,v 1.764 2013/04/24 08:57:46 tom Exp $ */
/*
* Copyright 1999-2012,2013 by Thomas E. Dickey
@@ -1770,6 +1770,7 @@
Boolean visualbell; /* visual bell mode */
Boolean poponbell; /* pop on bell mode */
+ Boolean allowPasteControls; /* PasteControls mode */
Boolean allowColorOps; /* ColorOps mode */
Boolean allowFontOps; /* FontOps mode */
Boolean allowSendEvents;/* SendEvent mode */
@@ -2727,8 +2728,9 @@
#define AllowTitleOps(w) AllowXtermOps(w, allowTitleOps)
+#define SpecialWindowOps(w,name) (!TScreenOf(w)->disallow_win_ops[name])
#define AllowWindowOps(w,name) (AllowXtermOps(w, allowWindowOps) || \
- !TScreenOf(w)->disallow_win_ops[name])
+ SpecialWindowOps(w,name))
#if OPT_TOOLBAR
#define ToolbarHeight(w) ((resource.toolBar) \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-291/screen.c new/xterm-292/screen.c
--- old/xterm-291/screen.c 2013-02-13 01:42:30.000000000 +0100
+++ new/xterm-292/screen.c 2013-04-23 11:50:23.000000000 +0200
@@ -1,4 +1,4 @@
-/* $XTermId: screen.c,v 1.475 2013/02/13 00:42:30 tom Exp $ */
+/* $XTermId: screen.c,v 1.477 2013/04/23 09:50:23 Bertram.Felgenhauer Exp $ */
/*
* Copyright 1999-2012,2013 by Thomas E. Dickey
@@ -407,7 +407,7 @@
#if OPT_FIFO_LINES
LineData *src;
- if ((screen->saved_fifo - extra) <= 0) {
+ if (extra > screen->saved_fifo || extra > screen->savelines) {
TRACE(("...FIXME: must clear text!\n"));
continue;
}
@@ -2034,8 +2034,7 @@
/* free up storage in fifo from the copied lines */
while (unsave_fifo-- > 0) {
- deleteScrollback(screen, -1);
- screen->saved_fifo--;
+ deleteScrollback(screen);
}
#else
amount = (screen->savelines - (int) move_down);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-291/scrollback.c new/xterm-292/scrollback.c
--- old/xterm-291/scrollback.c 2011-09-11 16:59:40.000000000 +0200
+++ new/xterm-292/scrollback.c 2013-04-23 11:57:05.000000000 +0200
@@ -1,7 +1,7 @@
-/* $XTermId: scrollback.c,v 1.15 2011/09/11 14:59:40 tom Exp $ */
+/* $XTermId: scrollback.c,v 1.16 2013/04/23 09:57:05 Bertram.Felgenhauer Exp $
*/
/*
- * Copyright 2009-2010,2011 by Thomas E. Dickey
+ * Copyright 2009-2011,2013 by Thomas E. Dickey
*
* All Rights Reserved
*
@@ -32,7 +32,7 @@
#include <xterm.h>
-#define REAL_ROW(screen, row) ((row) + 1 + (screen)->saved_fifo)
+#define REAL_ROW(screen, row) ((row) + (screen)->saved_fifo)
#define ROW2FIFO(screen, row) \
(unsigned) (REAL_ROW(screen, row) % (screen)->savelines)
@@ -70,7 +70,6 @@
Char *block;
if (screen->saveBuf_index != 0) {
- screen->saved_fifo++;
TRACE(("addScrollback %lu\n", screen->saved_fifo));
/* first, see which index we'll use */
@@ -90,6 +89,9 @@
free(prior->attribs);
prior->attribs = 0;
}
+ if (screen->saved_fifo > 2 * screen->savelines) {
+ screen->saved_fifo -= screen->savelines;
+ }
}
/* allocate the new data */
@@ -101,14 +103,15 @@
TRACE(("...storing new FIFO data in slot %d: %p->%p\n",
which, (void *) where, block));
+ screen->saved_fifo++;
}
return (LineData *) where;
}
void
-deleteScrollback(TScreen * screen, int row)
+deleteScrollback(TScreen * screen)
{
- unsigned which = ROW2FIFO(screen, row);
+ unsigned which = ROW2FIFO(screen, -1);
ScrnBuf where = scrnHeadAddr(screen, screen->saveBuf_index, which);
LineData *prior = (LineData *) where;
/*
@@ -121,4 +124,5 @@
free(prior->attribs);
prior->attribs = 0;
}
+ screen->saved_fifo--;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-291/trace.c new/xterm-292/trace.c
--- old/xterm-291/trace.c 2013-02-06 10:51:17.000000000 +0100
+++ new/xterm-292/trace.c 2013-04-21 02:37:00.000000000 +0200
@@ -1,4 +1,4 @@
-/* $XTermId: trace.c,v 1.145 2013/02/06 09:51:17 tom Exp $ */
+/* $XTermId: trace.c,v 1.146 2013/04/21 00:37:00 tom Exp $ */
/*
* Copyright 1997-2012,2013 by Thomas E. Dickey
@@ -86,6 +86,7 @@
trace_out = trace_who;
if (!trace_fp) {
+ unsigned oldmask = umask(077);
char name[BUFSIZ];
#if 0 /* usually I do not want unique names */
int unique;
@@ -111,6 +112,7 @@
xtermWarning("Cannot open \"%s\"\n", name);
exit(EXIT_FAILURE);
}
+ (void) umask(oldmask);
}
va_start(ap, fmt);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-291/version.h new/xterm-292/version.h
--- old/xterm-291/version.h 2013-02-27 00:48:28.000000000 +0100
+++ new/xterm-292/version.h 2013-04-26 00:53:22.000000000 +0200
@@ -1,4 +1,4 @@
-/* $XTermId: version.h,v 1.360 2013/02/26 23:48:28 tom Exp $ */
+/* $XTermId: version.h,v 1.362 2013/04/25 22:53:22 tom Exp $ */
/*
* Copyright 1998-2012,2013 by Thomas E. Dickey
@@ -38,8 +38,8 @@
* version of X to which this version of xterm has been built. The resulting
* number in parentheses is my patch number (Thomas E. Dickey).
*/
-#define XTERM_PATCH 291
-#define XTERM_DATE 2013-02-26
+#define XTERM_PATCH 292
+#define XTERM_DATE 2013-04-25
#ifndef __vendorversion__
#define __vendorversion__ "XTerm"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-291/xterm.h new/xterm-292/xterm.h
--- old/xterm-291/xterm.h 2013-02-04 00:21:00.000000000 +0100
+++ new/xterm-292/xterm.h 2013-04-24 10:55:50.000000000 +0200
@@ -1,4 +1,4 @@
-/* $XTermId: xterm.h,v 1.716 2013/02/03 23:21:00 tom Exp $ */
+/* $XTermId: xterm.h,v 1.718 2013/04/24 08:55:50 tom Exp $ */
/*
* Copyright 1999-2012,2013 by Thomas E. Dickey
@@ -353,6 +353,7 @@
#define XtNallowC1Printable "allowC1Printable"
#define XtNallowColorOps "allowColorOps"
#define XtNallowFontOps "allowFontOps"
+#define XtNallowPasteControls "allowPasteControls"
#define XtNallowScrollLock "allowScrollLock"
#define XtNallowSendEvents "allowSendEvents"
#define XtNallowTcapOps "allowTcapOps"
@@ -538,6 +539,7 @@
#define XtCAllowC1Printable "AllowC1Printable"
#define XtCAllowColorOps "AllowColorOps"
#define XtCAllowFontOps "AllowFontOps"
+#define XtCAllowPasteControls "AllowPasteControls"
#define XtCAllowScrollLock "AllowScrollLock"
#define XtCAllowSendEvents "AllowSendEvents"
#define XtCAllowTcapOps "AllowTcapOps"
@@ -1261,7 +1263,7 @@
/* scrollback.c */
extern LineData *getScrollback (TScreen * /* screen */, int /* row */);
extern LineData *addScrollback (TScreen * /* screen */);
-extern void deleteScrollback (TScreen * /* screen */, int /* row */);
+extern void deleteScrollback (TScreen * /* screen */);
/* scrollbar.c */
extern void DoResizeScreen (XtermWidget /* xw */);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-291/xterm.log.html new/xterm-292/xterm.log.html
--- old/xterm-291/xterm.log.html 2013-02-27 01:19:22.000000000 +0100
+++ new/xterm-292/xterm.log.html 2013-04-26 00:53:40.000000000 +0200
@@ -31,7 +31,7 @@
* sale, use or other dealings in this Software without prior written *
* authorization. *
*****************************************************************************
- $XTermId: xterm.log.html,v 1.1319 2013/02/27 00:19:22 tom Exp $
+ $XTermId: xterm.log.html,v 1.1335 2013/04/25 22:53:40 tom Exp $
-->
<html>
@@ -49,9 +49,9 @@
<body>
<hr>
- <a href=
- "http://invisible-island.net/";>http://invisible-island.net/</a><a
href="http://invisible-island.net/xterm/";>xterm/</a><br>
-
+ <a href="http://invisible-island.net/"; target=
+ "_top">http://invisible-island.net/</a><a href=
+ "http://invisible-island.net/xterm/"; target="_top">xterm/</a><br>
Copyright © 1997-2012,2013 by <a href=
"mailto:dic...@invisible-island.net";>Thomas E. Dickey</a>
<hr>
@@ -66,10 +66,12 @@
Until mid-2006, most of these were summarized in the XFree86
CHANGELOG (found in the unbundled tree,
xc/programs/Xserver/hw/xfree86). <a href=
- "http://invisible-island.net/xterm/xterm.log.html";>Here</a> is
- the latest version of this file.</p>
+ "http://invisible-island.net/xterm/xterm.log.html"; target=
+ "_parent">Here</a> is the latest version of this file.</p>
<ul>
+ <li><a href="#xterm_292">Patch #292 - 2013/04/25</a></li>
+
<li><a href="#xterm_291">Patch #291 - 2013/02/26</a></li>
<li><a href="#xterm_290">Patch #290 - 2013/02/12</a></li>
@@ -865,6 +867,50 @@
<li><a href="#xterm_01">Patch #1 - 1996/1/6</a></li>
</ul>
+ <h1><a name="xterm_292" id="xterm_292">Patch #292 -
+ 2013/04/25</a></h1>
+
+ <ul>
+ <li>add limit-check when double-click selects a word; if the
+ saved-lines were scrolled back and the word selected wrapped at
+ the screen's lower right corner, an assertion was triggered
+ (patch by Taketo Kabe).</li>
+
+ <li>correct limit-check in <code>unsaveEditBufLines</code>,
+ fixing a case where enlarging the terminal size could show a
+ blank line where there actually is available text (patch by
+ Bertram Felgenhauer).</li>
+
+ <li>add <code>PasteControls</code> feature to
+ <code>allowWindowOps</code> which by default disallows pasting
+ control characters other than formatting such as carriage
+ return (discussion with Hayaki Saito).</li>
+
+ <li>fix typo in ctlseqs.ms for DECRQM response (patch by
+ Emanuele Giaquinta).</li>
+
+ <li>update default shown in configure <code>--help</code>
+ message for <code>--with-terminal-id</code> option (patch by
+ Andres Perera).</li>
+
+ <li>rename script/preprocessor variables used for substituting
+ the <code>backarrowKey</code> default value for consistency
+ (patch by Andres Perera).</li>
+
+ <li>set umask to 077 before creating debugging-trace
+ files.</li>
+
+ <li>add configure option <code>--disable-openpty</code> to
+ control whether openpty() may be used in preference to
+ posix_openpt().</li>
+
+ <li>improve workaround from <a href="#xterm_279">patch #279</a>
+ for BSD systems which do not complete initialization until both
+ sides of the pseudoterminal are opened, by preferring openpty()
+ function over posix_openpt() when available (report by
+ Christian Weisgerber).</li>
+ </ul>
+
<h1><a name="xterm_291" id="xterm_291">Patch #291 -
2013/02/26</a></h1>
@@ -6690,7 +6736,7 @@
version (Egbert Eich).</li>
</ul>
- <h1><a name="xterm_166" id="xterm_166">Patch #166 - 2002/03/25 -
+ <h1><a name="xterm_166" id="xterm_166">Patch #166 - 2002/3/25 -
XFree86 4.2.0</a></h1>
<ul>
@@ -6764,7 +6810,7 @@
</li>
</ul>
- <h1><a name="xterm_165" id="xterm_165">Patch #165 - 2002/01/05 -
+ <h1><a name="xterm_165" id="xterm_165">Patch #165 - 2002/1/5 -
XFree86 4.1.0</a></h1>
<ul>
@@ -8665,15 +8711,15 @@
<li>add support for DEC Locator control sequences for xterm
(integrated patch by Steve Wall):
<pre>
-
DECEFR, "Enable Filter Rectangle"
DECELR, "Enable Locator Reports"
DECSLE, "Select Locator Events"
DECRQLP, "Request Locator Position"
-
-</pre>This allows the xterm mouse to be used with applications that
-use the DEC Locator sequences, such as VAX Tpu, or SMG$ based
-applications.
+</pre>
+
+ <p>This allows the xterm mouse to be used with applications
+ that use the DEC Locator sequences, such as VAX Tpu, or SMG$
+ based applications.</p>
</li>
<li>improve print action (patch by Matthias Baake). From his
@@ -9815,7 +9861,7 @@
</ul>
<h1><a name="xterm_84" id="xterm_84">Patch #84 - 1998/10/9 -
- XFree86 3.9Ni</a> and 3.3.2e</h1>
+ XFree86 3.9Ni and 3.3.2e</a></h1>
<p>Several small fixes and enhancements, including a patch from
Bjorn Helgaas:</p>
@@ -10696,14 +10742,15 @@
receives a segmentation fault on <Btn2Up> after
scrolling:
<pre>
-
*XTerm*VT100*translations: #override \
~Shift~Ctrl<Btn2Up>: insert-selection(PRIMARY,
CUT_BUFFER0)\n\
Shift~Ctrl<Btn2Up>: insert-selection(CLIPBOARD,
CUT_BUFFER1)\n\
~Shift<BtnUp>: select-end(PRIMARY, CUT_BUFFER0)\n\
Shift<BtnUp>: select-end(CLIPBOARD, CUT_BUFFER1)
-</pre>(The above resources intention is to be able to paste the
-latest selection even if the xterm was cleared.)
+</pre>
+
+ <p>(The above resources intention is to be able to paste the
+ latest selection even if the xterm was cleared.)</p>
<p>And here is how it works (and a fix!): The widget given to
the action handler as first argument is not guaranteed to be a
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-291/xterm.man new/xterm-292/xterm.man
--- old/xterm-291/xterm.man 2013-02-13 01:47:18.000000000 +0100
+++ new/xterm-292/xterm.man 2013-04-24 10:53:38.000000000 +0200
@@ -1,7 +1,7 @@
'\" t
-.\" $XTermId: xterm.man,v 1.556 2013/02/13 00:47:18 tom Exp $
+.\" $XTermId: xterm.man,v 1.559 2013/04/24 08:53:38 tom Exp $
.\"
-.\" Copyright 1996-2011,2012 by Thomas E. Dickey
+.\" Copyright 1996-2012,2013 by Thomas E. Dickey
.\"
.\" All Rights Reserved
.\"
@@ -1247,7 +1247,7 @@
together by setting the DECBKM state according to whether the initial value of
\fIstty\fP erase is a backspace (8) or delete (127) character.
A \*(``false\*('' value disables this feature.
-The default is \*(``__backarrow_key_erase__\*(''.
+The default is \*(``__backarrow_is_erase__\*(''.
.TP 8
.B "fullscreen (\fPclass\fB Fullscreen)"
Specifies whether or not \fI\*n\fP should ask the window manager to
@@ -1708,6 +1708,15 @@
.B "allowFontOps (\fPclass\fB AllowFontOps)"
Specifies whether control sequences that set/query the font should be allowed.
The default is \*(``true\*(''.
+.TP 5
+.B "allowPasteControls (\fPclass\fB AllowPasteControls)"
+If true, allow control characters such as BEL and CAN to be pasted.
+Formatting characters (tab, newline) are always allowed.
+Other C0 control characters are suppressed unless this resource is enabled.
+The exact set of control characters (C0 and C1)
+depends upon whether UTF-8 encoding is used,
+as well as the \fBallowC1Printable\fP resource.
+The default is \*(``false\*(''.
.TP 8
.B "allowScrollLock (\fPclass\fB AllowScrollLock)"
Specifies whether control sequences that set/query
@@ -1903,7 +1912,7 @@
or delete (127) character.
This corresponds to the DECBKM control sequence.
A \*(``true\*('' value specifies backspace.
-The default is \*(``__backarrow_key_is_del__\*(''.
+The default is \*(``__backarrow_is_bs__\*(''.
Pressing the control key toggles this behavior.
.TP 8
.B "background (\fPclass\fB Background)"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xterm-291/xtermcfg.hin new/xterm-292/xtermcfg.hin
--- old/xterm-291/xtermcfg.hin 2013-02-03 23:58:03.000000000 +0100
+++ new/xterm-292/xtermcfg.hin 2013-04-21 20:58:54.000000000 +0200
@@ -1,4 +1,4 @@
-/* $XTermId: xtermcfg.hin,v 1.197 2013/02/03 22:58:03 tom Exp $ */
+/* $XTermId: xtermcfg.hin,v 1.198 2013/04/21 18:58:54 Andres.Perera Exp $ */
/*
* Copyright 1997-2012,2013 by Thomas E. Dickey
@@ -42,7 +42,7 @@
#undef DECL_ERRNO /* CF_ERRNO */
#undef DEFDELETE_DEL /* AC_ARG_ENABLE(delete-is-del) */
#undef DEF_ALT_SENDS_ESC /* CF_ARG_ENABLE(alt-sends-esc) */
-#undef DEF_BACKARO_DEL /* CF_ARG_DISABLE(backarrow-is-del) */
+#undef DEF_BACKARO_BS /* CF_ARG_DISABLE(backarrow-key) */
#undef DEF_BACKARO_ERASE /* CF_ARG_ENABLE(backarrow-is-erase) */
#undef DEF_META_SENDS_ESC /* CF_ARG_ENABLE(meta-sends-esc) */
#undef DFT_COLORMODE /* AC_ARG_WITH(default-color-mode) */
++++++ xterm-disallow-window-and-fonts-ops.patch ++++++
--- /var/tmp/diff_new_pack.duupOe/_old 2013-05-02 12:07:48.000000000 +0200
+++ /var/tmp/diff_new_pack.duupOe/_new 2013-05-02 12:07:48.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- XTerm.ad.orig
+++ XTerm.ad
-@@ -258,6 +258,11 @@
+@@ -263,6 +263,11 @@
! Alternatively,
!*on2Clicks: regex
[[:alpha:]]+://([[:alnum:]!#+,./=?@_~-]|(%[[:xdigit:]][[:xdigit:]]))+
@@ -18,12 +18,12 @@
===================================================================
--- xterm.man.orig
+++ xterm.man
-@@ -1515,7 +1515,7 @@ The default is \*(``true.\*(''
+@@ -1707,7 +1707,7 @@ The default is \*(``true\*(''.
.TP
.B "allowFontOps (\fPclass\fB AllowFontOps)"
Specifies whether control sequences that set/query the font should be allowed.
-The default is \*(``true\*(''.
+The default is \*(``false\*(''.
- .TP 8
- .B "allowScrollLock (\fPclass\fB AllowScrollLock)"
- Specifies whether control sequences that set/query
+ .TP 5
+ .B "allowPasteControls (\fPclass\fB AllowPasteControls)"
+ If true, allow control characters such as BEL and CAN to be pasted.
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
