From faa95e719795e0310c813b04ef36fa364ceb4ad0 Mon Sep 17 00:00:00 2001 From: Michael Jennings Date: Thu, 2 Jun 2005 17:39:07 +0000 Subject: [PATCH] Thu Jun 2 13:36:23 2005 Michael Jennings (mej) A couple small fixes from Yasufumi Haga to the man page and the handling of multi-byte fonts. ---------------------------------------------------------------------- SVN revision: 15062 --- ChangeLog | 5 +++++ doc/Eterm.1.in | 2 +- src/options.c | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8d57960..9611c19 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5389,3 +5389,8 @@ Sat May 14 18:56:55 2005 Michael Frysinger (vapier) Twin 0.4.6 and 0.5.1 install the header 'Tw/Tw1.h', not 'Tw/Tw_1.h'. ---------------------------------------------------------------------- +Thu Jun 2 13:36:23 2005 Michael Jennings (mej) + +A couple small fixes from Yasufumi Haga to +the man page and the handling of multi-byte fonts. +---------------------------------------------------------------------- diff --git a/doc/Eterm.1.in b/doc/Eterm.1.in index 6b9fc81..9c3ca42 100644 --- a/doc/Eterm.1.in +++ b/doc/Eterm.1.in @@ -2185,7 +2185,7 @@ terminal window. .I buffer is either a number .BR 0 - 7 , -in which case the selection is copied to the cut buffer specified, or +in which case the selection is pasted from the cut buffer specified, or one of the words .BR clipboard ", " primary ", or " secondary (or any initial substring thereof), in which case the contents of the diff --git a/src/options.c b/src/options.c index 3fbd712..7c7de59 100644 --- a/src/options.c +++ b/src/options.c @@ -2688,7 +2688,7 @@ post_parse(void) eterm_font_add(&etmfonts, rs_mfont[i], ((i == 0) ? def_font_idx : ((i <= def_font_idx) ? (i - 1) : i))); RESET_AND_ASSIGN(rs_mfont[i], NULL); } - } else { + } else if (etmfonts[i] == NULL) { eterm_font_add(&etmfonts, etfonts[i], i); } #endif