Module Name: xsrc
Committed By: mrg
Date: Tue Nov 23 09:18:19 UTC 2010
Modified Files:
xsrc/external/mit/xterm/dist: misc.c xterm.man
Log Message:
merge xterm 267
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xterm/dist/misc.c \
xsrc/external/mit/xterm/dist/xterm.man
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xterm/dist/misc.c
diff -u xsrc/external/mit/xterm/dist/misc.c:1.6 xsrc/external/mit/xterm/dist/misc.c:1.7
--- xsrc/external/mit/xterm/dist/misc.c:1.6 Sun Nov 21 06:20:30 2010
+++ xsrc/external/mit/xterm/dist/misc.c Tue Nov 23 09:18:19 2010
@@ -1,4 +1,4 @@
-/* $XTermId: misc.c,v 1.510 2010/10/11 08:33:33 tom Exp $ */
+/* $XTermId: misc.c,v 1.511 2010/11/10 00:56:29 tom Exp $ */
/*
* Copyright 1999-2009,2010 by Thomas E. Dickey
@@ -1991,7 +1991,7 @@
res->value = TScreenOf(xw)->Tcolors[TEXT_FG].value;
res->mode = -True;
fprintf(stderr,
- "%s: Cannot allocate color %s\n",
+ "%s: Cannot allocate color \"%s\"\n",
xterm_name,
NonNull(res->resource));
}
Index: xsrc/external/mit/xterm/dist/xterm.man
diff -u xsrc/external/mit/xterm/dist/xterm.man:1.6 xsrc/external/mit/xterm/dist/xterm.man:1.7
--- xsrc/external/mit/xterm/dist/xterm.man:1.6 Sun Nov 21 06:20:30 2010
+++ xsrc/external/mit/xterm/dist/xterm.man Tue Nov 23 09:18:19 2010
@@ -1,5 +1,5 @@
'\" t
-.\" $XTermId: xterm.man,v 1.467 2010/10/11 00:36:08 tom Exp $
+.\" $XTermId: xterm.man,v 1.469 2010/11/11 11:57:07 tom Exp $
.\"
.\" Copyright 1996-2009,2010 by Thomas E. Dickey
.\"
@@ -1075,9 +1075,13 @@
used for the pseudo-terminal name from the file descriptor.
Otherwise, exactly two characters are used from the option for
the pseudo-terminal name, the remainder is the file descriptor.
-Examples:
+Examples
+(the first two are equivalent
+since the descriptor follows the last \*(``/\*(''):
+.sp
.nf
.RS 15
+-S/dev/pts/123/45
-S123/45
-Sab34
.RE
@@ -4731,6 +4735,12 @@
It is also invoked from the \fBclearsavedlines\fP entry in \fIvtMenu\fP.
The effect is identical to a hardware reset (RIS) control sequence.
.TP 8
+.B "copy-selection(\fIdestname\fP [, ...])"
+This action puts the currently selected text into all of the selections or
+cutbuffers specified by \fIdestname\fP.
+Unlike \fBselect-end\fP, it does not send a mouse position or otherwise
+modify the internal selection state.
+.TP 8
.B "create-menu(\fIm/v/f/t\fP)"
This action creates one of the menus used by \fIxterm\fP,
if it has not been previously created.
@@ -4974,6 +4984,8 @@
.B "select-end(\fIdestname\fP [, ...])"
This action puts the currently selected text into all of the selections or
cutbuffers specified by \fIdestname\fP.
+It also sends a mouse position and updates the internal selection state
+to reflect the end of the selection process.
.TP 8
.B "select-extend()"
This action tracks the pointer and extends the selection.
