From: "Bart Schaefer" <schaefer@brasslantern.com>
To: zsh-workers@sunsite.dk
Subject: PATCH: (?) Other misc. I'd like to commit
Date: Mon, 27 Jan 2003 01:44:51 +0000 [thread overview]
Message-ID: <1030127014451.ZM24326@candle.brasslantern.com> (raw)
These are edits I've made locally but never committed. Objections to any
of them?
- Patch discussed in zsh-workers/17989,17993,18000-18003 (long form)
(I never got a response to 18003)
- Patch discussed in zsh-workers/17755 to allow %{ %} to put bounds
around a prompt truncation
- Fix a couple of minor typos in zshconfig.ac
diff -ru -x CVS ../zsh-forge/current/Src/init.c ./Src/init.c
--- ../zsh-forge/current/Src/init.c Thu Nov 14 08:23:06 2002
+++ ./Src/init.c Sat Dec 7 09:41:51 2002
@@ -897,7 +897,10 @@
signal_ignore(SIGQUIT);
#endif
- install_handler(SIGHUP);
+ if (signal_ignore(SIGHUP) == SIG_IGN)
+ opts[HUP] = 0;
+ else
+ install_handler(SIGHUP);
install_handler(SIGCHLD);
#ifdef SIGWINCH
install_handler(SIGWINCH);
diff -ru -x CVS ../zsh-forge/current/Src/prompt.c ./Src/prompt.c
--- ../zsh-forge/current/Src/prompt.c Wed Aug 7 09:27:32 2002
+++ ./Src/prompt.c Tue Oct 1 23:52:21 2002
@@ -93,6 +93,10 @@
static int dontcount;
+/* Level of %{ / %} surrounding a truncation segment. */
+
+static int trunccount;
+
/* Strings to use for %r and %R (for the spelling prompt). */
static char *rstring, *Rstring;
@@ -465,6 +469,8 @@
}
break;
case /*{*/ '}':
+ if (trunccount && trunccount >= dontcount)
+ return *fm;
if (dontcount && !--dontcount) {
addbufspc(1);
*bp++ = Outpar;
@@ -868,7 +874,9 @@
bp = ptr;
w = bp - buf;
fm++;
+ trunccount = dontcount;
putpromptchar(doprint, endchar);
+ trunccount = 0;
ptr = buf + w; /* putpromptchar() may have realloc()'d */
*bp = '\0';
diff -ru -x CVS ../zsh-forge/current/zshconfig.ac ./zshconfig.ac
--- ../zsh-forge/current/zshconfig.ac Sat May 4 13:14:24 2002
+++ ./zshconfig.ac Fri Sep 13 10:48:49 2002
@@ -1,5 +1,5 @@
dnl
-dnl configure.in: Configure template for zsh.
+dnl zshconfig.ac: Configure template for zsh.
dnl Process this file with autoconf to produce a configure script.
dnl
dnl Copyright (c) 1995-1997 Richard Coleman
@@ -1999,7 +2010,7 @@
AC_SUBST_FILE(VERSION_MK)dnl
AC_OUTPUT(Config/defs.mk Makefile Doc/Makefile Etc/Makefile Src/Makefile \
-Test/Makefile, \
+Test/Makefile,
[test -z "$CONFIG_HEADERS" || echo > stamp-h])
eval "zshbin1=${bindir}"
--
Bart Schaefer Brass Lantern Enterprises
http://www.well.com/user/barts http://www.brasslantern.com
Zsh: http://www.zsh.org | PHPerl Project: http://phperl.sourceforge.net
next reply other threads:[~2003-01-27 1:45 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-01-27 1:44 Bart Schaefer [this message]
2003-01-27 15:24 ` Peter Stephenson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1030127014451.ZM24326@candle.brasslantern.com \
--to=schaefer@brasslantern.com \
--cc=zsh-workers@sunsite.dk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).