zsh-workers
 help / color / mirror / code / Atom feed
* Re: 3.1.6-pws-5
@ 1999-09-20 14:12 Sven Wischnowsky
  0 siblings, 0 replies; 3+ messages in thread
From: Sven Wischnowsky @ 1999-09-20 14:12 UTC (permalink / raw)
  To: zsh-workers


Peter Stephenson wrote:

> I had to apply a couple of patches to _path_files by hand.  It didn't look
> like the code was too far out from what the patches were expecting, though.
> Partly as a consequence (i.e. I got confused), 7945 isn't listed in the
> ChangeLog, but has been applied (it is listed below).

My apologies for that.

This should fix the last bits...

Bye
 Sven

diff -u -r oldcompletion/Core/_path_files Completion/Core/_path_files
--- oldcompletion/Core/_path_files	Mon Sep 20 16:04:04 1999
+++ Completion/Core/_path_files	Mon Sep 20 16:12:33 1999
@@ -364,31 +364,31 @@
       if [[ -n $menu ]]; then
         [[ -n "$compconfig[path_cursor]" ]] && compstate[to_end]=''
         if [[ "$tmp3" = */* ]]; then
-	  compadd -QUf -p "$linepath${testpath:q}" -s "/${tmp3#*/}" \
+	  compadd -Qf -p "$linepath${testpath:q}" -s "/${tmp3#*/}" \
 	          -W "$prepath$realpath$testpath" "$ignore[@]" \
 		  "$addpfx[@]" "$addsfx[@]" "$remsfx[@]" -M 'r:|/=* r:|=*' \
-+ 		  "$group[@]" "$expl[@]" \
+		  "$group[@]" "$expl[@]" \
 		  - "${(@)${(@)tmp1%%/*}:q}"
 	else
-	  compadd -QUf -p "$linepath${testpath:q}" \
+	  compadd -Qf -p "$linepath${testpath:q}" \
 	          -W "$prepath$realpath$testpath" "$ignore[@]" \
-		   "$addpfx[@]" "$addsfx[@]" "$remsfx[@]" \
+		   "$addpfx[@]" "$addsfx[@]" "$remsfx[@]" -M 'r:|/=* r:|=*' \
 		   "$group[@]" "$expl[@]" \
 		   - "${(@)tmp1:q}"
 	fi
       else
         if [[ "$tmp3" = */* ]]; then
           for i in "$tmp1[@]"; do
-	    compadd -QUf -p "$linepath${testpath:q}" -s "/${${i#*/}:q}" \
+	    compadd -Qf -p "$linepath${testpath:q}" -s "/${${i#*/}:q}" \
 		    -W "$prepath$realpath$testpath" "$ignore[@]" \
 		    "$addpfx[@]" "$addsfx[@]" "$remsfx[@]" -M 'r:|/=* r:|=*' \
 		    "$group[@]" "$expl[@]" \
 		    - "${${i%%/*}:q}"
 	  done
         else
-	  compadd -QUf -p "$linepath${testpath:q}" \
+	  compadd -Qf -p "$linepath${testpath:q}" \
 		  -W "$prepath$realpath$testpath" "$ignore[@]" \
-		  "$addpfx[@]" "$addsfx[@]" "$remsfx[@]" \
+		  "$addpfx[@]" "$addsfx[@]" "$remsfx[@]" -M 'r:|/=* r:|=*' \
 		  "$group[@]" "$expl[@]" \
 		  - "${(@)tmp1:q}"
         fi
@@ -415,12 +415,12 @@
     tmp3="${tmp3#*/}"
   done
 
-  if [[ -z "$tmp4" ]]; then 
-     PREFIX="${opre}${osuf}"
-     SUFFIX=""
-     compadd -QUf -p "$linepath${testpath:q}" \
+  if [[ -z "$tmp4" ]]; then
+    PREFIX="${opre}${osuf}"
+    SUFFIX=""
+    compadd -Qf -p "$linepath${testpath:q}" \
 	    -W "$prepath$realpath$testpath" "$ignore[@]" \
-	    "$addpfx[@]" "$addsfx[@]" "$remsfx[@]" \
+	    "$addpfx[@]" "$addsfx[@]" "$remsfx[@]" -M 'r:|/=* r:|=*' \
 	    "$group[@]" "$expl[@]" \
 	    - "${(@)tmp1:q}"
   fi
@@ -434,9 +434,9 @@
 
 if [[ -n "$compconfig[path_expand]" &&
       $#exppaths -gt 0 && nm -eq compstate[nmatches] ]]; then
-   PREFIX="${opre}${osuf}"
-   SUFFIX=""
-   compadd -Q -S '' "$group[@]" "$expl[@]" \
+  PREFIX="${opre}${osuf}"
+  SUFFIX=""
+  compadd -Q -S '' "$group[@]" "$expl[@]" \
           -M 'r:|/=* r:|=*' -p "$linepath" - "$exppaths[@]"
 fi
 
diff -u od/Zsh/compsys.yo Doc/Zsh/compsys.yo
--- od/Zsh/compsys.yo	Mon Sep 20 16:03:38 1999
+++ Doc/Zsh/compsys.yo	Mon Sep 20 16:05:00 1999
@@ -1153,6 +1153,29 @@
 this is not set by the user, it will automatically be set to a list
 of group names taken from the YP database or the file `tt(/etc/group)'.
 )
+item(tt(hosts))(
+An array holding the names of hosts that should be completed. If this
+is not set by the user it will automatically be set to a list of the
+hostnames in `tt(/etc/hosts)'.
+)
+item(tt(ports))(
+An array holding the service names of ports to complete. If this is
+not set by the user, it will be set to a list of the service names
+from `tt(/etc/services)'.
+)
+item(tt(telnet_hosts_ports_users))(
+This array is used by the completion function for tt(telnet). It
+should contain elements of the form
+`var(host)tt(:)var(port)tt(:)var(user)'. These triples will be used to 
+complete names of hosts, ports, and usernames depending on the
+information already on the line, so that if, for example, the hostname 
+is already typed, only those ports and usernames will be completed for 
+which triples with the hostname from the line exist.
+)
+item(tt(socket_hosts_ports))(
+Like tt(telnet_hosts_ports_users), but used for the tt(socket) command 
+and containing pairs of hostnames and ports.
+)
 enditem()
 
 subsect(Configuration keys)

--
Sven Wischnowsky                         wischnow@informatik.hu-berlin.de


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: 3.1.6-pws-5
  1999-09-20 12:22 3.1.6-pws-5 Peter Stephenson
@ 1999-09-20 22:17 ` Adam Spiers
  0 siblings, 0 replies; 3+ messages in thread
From: Adam Spiers @ 1999-09-20 22:17 UTC (permalink / raw)
  To: Zsh hackers list

Peter Stephenson (pws@ibmth.df.unipi.it) wrote:
> http://www.ifh.de/~pws/computing/zsh-3.1.6-pws-5.tar.gz

Cool, thanks Peter.  Now I can see how badly wrong I got my CVS
tracking ...

> 	* Adam: 7892: Completion/User/_webbrowser: initial
> 	  implementation of completion for web browsers.

Much as I'd like to be producing as many patches as Tanaka, I can't
take credit for this one of his :-)


^ permalink raw reply	[flat|nested] 3+ messages in thread

* 3.1.6-pws-5
@ 1999-09-20 12:22 Peter Stephenson
  1999-09-20 22:17 ` 3.1.6-pws-5 Adam Spiers
  0 siblings, 1 reply; 3+ messages in thread
From: Peter Stephenson @ 1999-09-20 12:22 UTC (permalink / raw)
  To: Zsh hackers list

http://www.ifh.de/~pws/computing/zsh-3.1.6-pws-5.tar.gz

This contains some quite significant changes, even outside the completion
system, with floating point support and match variables for patterns.

I had to apply a couple of patches to _path_files by hand.  It didn't look
like the code was too far out from what the patches were expecting, though.
Partly as a consequence (i.e. I got confused), 7945 isn't listed in the
ChangeLog, but has been applied (it is listed below).


1999-09-20  Peter Stephenson  <pws@ibmth.df.unipi.it>

	* pws: Config/version.mk: version 3.1.6-pws-5

	* Sven: 7953: Completion/Commands/_expand_word,
	  Completion/Core/_expand, Doc/Zsh/compsys.yo: expand_completions
	  configuration key.

	* pws: 7952: Completion/X/_xutils: xrdb should complete file
	  arguments.

	* Sven: 7951: Src/subst.c, Doc/Zsh/expn.yo: parameter expansion flags
	  for quoting with single or double quotes.

	* Sven: 7950: Src/utils.c, Src/Zle/complist.c: more careful
	  with VARARR's.

	* Sven: 7949: 7949: Completion/X/_x_color,
	  Completion/X/_x_extension, Completion/X/_x_window,
	  Completion/X/_xutils: completion for standard X utilities.

	* pws: 7948: Src/glob.c, Src/pattern.c: indexes weren't
	  calculate properly in $mbegin, $mend, $MBEGIN, $MEND because
	  of Meta bytes.

	* Sven: 7947: Src/Zle/zle_tricky.c, Doc/Zsh/compwid.yo:
	  compstate[insert] can be all to insert all matches.

	* Sven: 7945: Src/Zle/zle_tricky.c, Completion/Core/_multi_parts,
	  Completion/Core/_path_files: better path completion with braces

	* Sven: 7944: Src/Zle/zle_tricky.c, Completion/Core/_multi_parts,
	  Completion/Core/_path_files, Completion/Core/_sep_parts:
	  new heuristic for deciding whether to add strings under match
	  control or if they are too ambiguous to be useful.

	* Sven: 7943: Doc/Zsh/compsys.yo: docs for long args syntax
	  in _arguments.

	* Bart: zsh-users/2610: Completion/Builtins/_kill,
	  Completion/Builtins/_wait, Completion/User/_gdb: split words
	  for ps arguments (replaces 2609).

	* Bart: 7938: Completion/Base/_arg_compile, Completion/Base/_describe:
	  pre-compiler for _arguments and typo in describe.

	* Tanaka Akira: 7937: Completion/User/_cvs, Completion/User/_lynx,
	  Completion/User/_wget: it's good to have _values.

	* Bart: 7934: Completion/User/_telnet: improvement.

	* Bart: 7932: Completion/User/_mailboxes: more generic.

	* Bart: 7929: Src/hist.c, Src/Zle/zle_tricky.c: handle gaps
	  in history when scanning through it.

	* Bart: 7928: Doc/Zsh/builtins.yo: typo in float stuff.

	* Bart: 7925: Functions/Misc/run-help: various functions and
	  builtins in manual pages other than zshbuiltins.

	* Adam: 7923: Completion/Core/compinit: compconf quoting tweak.

1999-09-17  Peter Stephenson  <pws@ibmth.df.unipi.it>

	* pws: 7921: Src/glob.c: bad test in rarely used
	  (string/)# globbing construct.

	* Oliver: 7919: Completion/User/_man: try to find a manpath if
	  none (slightly adapted).

	* Sven: 7917: Src/loop.c: hunk missed from 7915.

	* pws: 7915: Doc/Zsh/arith.yo, Doc/Zsh/builtins.yo,
	  Src/Modules/parameter.c, Src/builtin.c, Src/cond.c, Src/exec.c,
	  Src/math.c, Src/mem.c, Src/params.c, Src/subst.c, Src/zsh.h,
	  configure.in:  Floating point support via typeset -F and
	  typeset -E for variables and in matheval().  mnumber struct
	  passes around float or integer.

	* Sven: 7903: Completion/Builtins/_cd: more careful with
	  things from cdablevars.

	* Sven: 7902, 7912: Completion/Base/_arguments,
	  Doc/Zsh/compsys.yo: autodescribe_options.

	* Sven: 7900: Completion/Commands/_history_complete_word,
	  Doc/Zsh/compsys.yo:  history_stop config opt stops history
	  cycling past end.

	* Sven: 7896: Src/Zle/zle_tricky.c: cursor positioning.

	* Adam: 7892: Completion/User/_webbrowser: initial
	  implementation of completion for web browsers.

	* Adam: 7891: Completion/Core/compinit: error message in compdef.

	* Tanaka Akira: 7888: Completion/User/_wget: completion for wget.

	* Tanaka Akira; 7887: Completion/User/_telnet: try to get
	  valid telnet options.

	* Tanaka Akira: 7886: Completion/Base/_describe,
	  Completion/Debian/_apt, Completion/User/_cvs: -d option for
	  descriptions.

	* Adam: 7882: Doc/Zsh/expn.yo: parentheses.

1999-09-16  Peter Stephenson  <pws@ibmth.df.unipi.it>

	* Adam: 7871: Completion/User/_perl_basepods,
	  Completion/User/_perl_builtin_funcs,
	  Completion/User/_perl_modules, Completion/User/_perldoc:
	  perl completion.

	* Sven: 7864: Src/Zle/zle_tricky.c: crash when browsing
	  directory hierarchies with select and selecting an entry.

	* Sven: 7863: Doc/Zsh/mod_parameter.yo, Src/Modules/parameter.c,
	  Src/Modules/parameter.mdd: $dirstack and $modules special
	  parameters.
	
	* Sven: 7866: Doc/Zsh/compsys.yo, Completion/User/_mutt:
	  action necessary.

	* Sven: 7862: Completion/Base/_arguments, Completion/User/_gcc,
	  Doc/Zsh/compsys.yo, Src/Zle/zle_tricky.c: completion for gcc,
	  -M match spec for _arguments, remove duplicate matches.

	* Clint: 7860: Completion/User/_mailboxes, Completion/User/_mutt:
	  mutt support.

1999-09-15  Peter Stephenson  <pws@ibmth.df.unipi.it>

	* pws: 7855: Doc/Zsh/zftpsys.yo, Functions/Zftp/zfopen:
	  failed zfopen with arguments deletes the stored open parameters.

	* Oliver: 7852: Completion/Builtins/_compdef,
	  Completion/User/_man: new compdef support, _man works for whatis
	  and apropos.

	* Sven: 7850: Completion/Base/_arguments: minor cleanup.

	* Sven: 7844: Src/Zle/complist.c, Src/Zle/zle_tricky.c,
	  Doc/Zsh/compsys.yo, Etc/completion-style-guide,
	  Completion/Base/_arguments, Completion/Base/_describe,
	  Completion/Base/_subscript, Completion/Base/_tilde,
	  Completion/Base/_values, Completion/Builtins/_cd,
	  Completion/Builtins/_kill, Completion/Builtins/_wait,
	  Completion/Core/_approximate, Completion/Core/_expand,
	  Completion/User/_gdb: various matching display bugs
	  (with compadd -d) and enhancements to correction and
	  approximation keys.

	* Tanaka Akira: 7840: Completion/Base/_tilde,
	  Completion/Builtins/_cd: use compadd -d.

	* pws: 7836: Src/Modules/zftp.c: bug from 7767: zftp rmsession
	  incremented node pointer wrongly and assigned new session
	  wrongly.

	* pws: 7834: Src/pattern.c: bug from 7825, pure string path
	  segments wouldn't approximate.

1999-09-14  Peter Stephenson  <pws@ibmth.df.unipi.it>

	* Sven: 7827: Src/Zle/comp.h, Src/Zle/compctl.c,
	  Src/Zle/complist.c, Src/Zle/zle_tricky.c, Doc/Zsh/compsys.yo,
	  Doc/Zsh/compwid.yo, Completion/Base/_arguments,
	  Completion/Base/_values, Completion/Core/_display,
	  Completion/User/_mount: compadd -d for list of elements
	  to display instead of matches, -l to show one per line,
	  plus changes in _display and uses thereof; typos in _mount.

	* pws: 7825, 7848: Doc/Zsh/expn.yo, Src/glob.c, Src/pattern.c,
	  Src/subst.c, Src/zsh.h: (#b) and (#m) globbing flags and
	  inverses; speed up compilation of pure string patterns.

	* Sven: 7823: Src/Zle/zle_tricky.c: improve joining of completion
	  strings with different match control behaviour.

	* Sven: 7824: Completion/Base/_arguments, Completion/Core/_message:
	  improve `no more arguments' message.

	* Sven: 7819: Completion/Base/_arguments, Doc/Zsh/compsys.yo:
	  use of $options for single character options.

	* Tanaka Akira: 7817: Completion/Debian/_apt,
	  Completion/User/_socket, Completion/User/_perl_builtin_funcs:
	  several improvements.

	* Tanaka Akira: 7815: Completion/User/_combination,
	  Completion/User/_ports, Completion/User/_socket,
	  Completion/User/_telnet: more sophisticated port/user
	  combinations via general combination mechanism.

	* Bart: 7813: Src/subst.c: correct incorrect application of
	  correction in 7697.

	* Tanaka Akira: 7740: Completion/User/_man: handle gzipped and
	  SGML manual pages.

1999-09-13  Peter Stephenson  <pws@ibmth.df.unipi.it>

	* pws: zsh-users/2598: Functions/Zle/incarg: zle function to
	  increment number under cursor.

	* pws: 7812: Completion/X/_xrdb: now exists.

	* Tanaka Akira: 7809: Completion/Debian/_apt, Completion/User/_patch:
	  new apt options and typo in _patch.

	* Sven: 7808: Completion/Base/_arguments: don't add long options
	  sometimes.

-- 
Peter Stephenson <pws@ibmth.df.unipi.it>       Tel: +39 050 844536
WWW:  http://www.ifh.de/~pws/
Dipartimento di Fisica, Via Buonarroti 2, 56127 Pisa, Italy


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~1999-09-20 22:18 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
1999-09-20 14:12 3.1.6-pws-5 Sven Wischnowsky
  -- strict thread matches above, loose matches on Subject: below --
1999-09-20 12:22 3.1.6-pws-5 Peter Stephenson
1999-09-20 22:17 ` 3.1.6-pws-5 Adam Spiers

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).