zsh-workers
 help / color / mirror / code / Atom feed
From: "Bart Schaefer" <schaefer@candle.brasslantern.com>
To: zsh-workers@sunsite.auc.dk
Subject: Re: PATCH: 3.1.6-dev-20: Style and Tags Index
Date: Mon, 27 Mar 2000 09:22:53 +0000	[thread overview]
Message-ID: <1000327092253.ZM6831@candle.brasslantern.com> (raw)
In-Reply-To: <1000327084242.ZM6748@candle.brasslantern.com>

On Mar 27,  8:42am, Bart Schaefer wrote:
} Subject: PATCH: 3.1.6-dev-20: Style and Tags Index
}
} Once again this conflicts with 10230 (and also 10231, this time).  I'll
} produce a separate patch to fix things up, unless Sven beats me to it.

This patch fixes the conflicts, assuming you applied Sven's 10230 & 10231
BEFORE you applied my 10263.  Note that you should also manually delete
the duplicate users-hosts-ports entry from compsys.yo.

If you applied my patch first and can't figure out how to fix the rejects
when applying Sven's, mail me and I'll help out.

--- ../patched/zsh-3.1.6-dev-20/Doc/Zsh/compsys.yo	Mon Mar 27 01:09:54 2000
+++ Doc/Zsh/compsys.yo	Mon Mar 27 00:59:29 2000
@@ -1397,6 +1397,7 @@
 file (if it can be found) will be used as the default if the style is
 not set.
 )
+kindex(ports, completion style)
 item(tt(ports))(
 A style holding the service names of ports to complete. If this is
 not set by the user, the service names from `tt(/etc/services)' will
@@ -1516,6 +1517,7 @@
 substitution will be performed only if given an explicit numeric
 argument other than `tt(1)', as by typing `tt(ESC 2 TAB)'.
 )
+kindex(tag-aliases, completion style)
 item(tt(tag-aliases))(
 This allows to give aliases for tags that are to be used whenever the
 tag this style is set for is used (see the tt(tag-order) style below

-- 
Bart Schaefer                                 Brass Lantern Enterprises
http://www.well.com/user/barts              http://www.brasslantern.com


  parent reply	other threads:[~2000-03-27  9:23 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2000-03-27  8:42 Bart Schaefer
2000-03-26 22:18 ` Peter Stephenson
2000-03-27  9:22 ` Bart Schaefer [this message]
2000-03-28  7:58 Sven Wischnowsky

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=1000327092253.ZM6831@candle.brasslantern.com \
    --to=schaefer@candle.brasslantern.com \
    --cc=zsh-workers@sunsite.auc.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).