Re: PATCH: prompt theme system improvements

Re: PATCH: prompt theme system improvements

[Sven Wischnowsky]

Oliver Kiddle wrote:

> ...
> 
> With respect to colour themes. It would be good to have a single way
> for defining colours across zsh. ZLS_COLOURS may be compatible with
> GNU ls but it isn't exactly the most readable way.

Ah. See? I suggested then when I first started participating in the
coloured-completion-lists discussion.

> One possible way would be to use an associative array for colours where the keys specify the context and the values specify the attributes. So for example, you might define:
> zsh_colours[ls_directories]="bold blue on white"
> zsh_colours[prompt_currentdir]="underlined green"

Ick. Maybe we should keep the parameter side more standard and just
use `bold:blue:white' or `bold:fg=blue:bg=white' or something. And
then add a function that uses a mini-language... err, wait, where have 
I heard that before.

I have almost given up dreaming about it, but: stuff like this always
reminds how nice it would be to generalise some of the completion-setup 
stuff to a more general package system. And then allow something like: 
`zstyle 'prompt:...:foreground' bold blue'.

> If different prompt themes use the same context words, you could share colour selections across prompts. It might also lead to a mechanism for defining the colours for different types of completion matches in the lists - not just for files.

...which complist currently can't do because it uses ZLS_* only for
files. But I have already asked: should we change it to allow using
pattern-capabilities for normal matches, too? The only problem I have
with that is that I would like to be able to give such specs per group 
of matches added. And that would require changes to compadd which
doesn't (and, in my opinion, shouldn't) know about complist. Hrm.

Bye
 Sven


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

Re: PATCH: prompt theme system improvements

[Sven Wischnowsky]

Tanaka Akira wrote:

> And this is my consistency checker between .distfiles and CVS/Entries.
> Currently, this reports only one problem: _funcall is forgotten.

I see... I hope I remember that in the future.

Bye
 Sven

diff -u oldcompletion/Core/.distfiles Completion/Core/.distfiles
--- oldcompletion/Core/.distfiles	Fri Nov 19 11:59:53 1999
+++ Completion/Core/.distfiles	Fri Nov 19 12:00:16 1999
@@ -1,7 +1,7 @@
 DISTFILES_SRC='
     .distfiles
     _alternative _approximate _compalso _complete _correct _description
-    _expand _files _list _main_complete _match _menu _multi_parts
+    _expand _files _funcall _list _main_complete _match _menu _multi_parts
     _message _normal _oldlist _options _parameters _path_files _requested
     _sep_parts _set_options _sort_tags _style _tags _unset_options _wanted
     compdump compinit compinstall

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

Re: PATCH: prompt theme system improvements

[Sven Wischnowsky]

Tanaka Akira wrote:

> ...
> 
> Usually, my script adds new files automatically.  So I don't need such
> notices.  However, file removing/moving/reverting requires some manual
> work and sometimes I forget them...

while we're at it... does the automatic updating of .distfiles work?
Or do you need patches like the one below which Sven constantly keeps
forgetting to build?

Bye
 Sven

diff -u oldcompletion/Builtins/.distfiles Completion/Builtins/.distfiles
--- oldcompletion/Builtins/.distfiles	Fri Nov 19 09:55:55 1999
+++ Completion/Builtins/.distfiles	Fri Nov 19 11:32:28 1999
@@ -4,4 +4,5 @@
     _compdef _disable _echotc _enable _fc _fg_jobs _functions _hash _kill
     _limits _nothing _pids _popd _sched _set _setopt _source _stat _trap
     _unhash _unsetopt _vars _vars_eq _wait _which _zftp _zle _zmodload
+    _signals
 '

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

Re: PATCH: prompt theme system improvements

[Tanaka Akira]

In article <199911191034.LAA02428@beta.informatik.hu-berlin.de>,
  Sven Wischnowsky <wischnow@informatik.hu-berlin.de> writes:

> while we're at it... does the automatic updating of .distfiles work?
> Or do you need patches like the one below which Sven constantly keeps
> forgetting to build?

.distfiles are handled as usual files.  So it is not updated
automatically.  I don't plan automatic update for .distfiles.  But if
patches for .distfiles are posted as well as for other files, it is
useful to check consistency of the repository.  Also, package makers
need up-to-date .distfiles, I think.

And this is my consistency checker between .distfiles and CVS/Entries.
Currently, this reports only one problem: _funcall is forgotten.

#!/bin/sh

tmp1=/tmp/z-cd-distfiles.$$
tmp2=/tmp/z-cd-cvs.$$
trap  'rm -f $tmp1 $tmp2' 0 1 2 3 15

find . -name .distfiles -print |sort |
while read f; do
d="`dirname $f`"
. $f

GENERATED_SRC=
case "$d" in
".") GENERATED_SRC='
  META-FAQ config.h.in configure stamp-h.in' ;;
"./Doc") GENERATED_SRC='
  version.yo zsh.1 zsh.texi zshall.1 zshbuiltins.1 zshcompctl.1
  zshcompsys.1 zshcompwid.1 zshexpn.1 zshmisc.1 zshmodules.1
  zshoptions.1 zshparam.1 zshzftpsys.1 zshzle.1';;
"./Etc") GENERATED_SRC='
  FAQ';;
*) GENERATED_SRC= ;;
esac

echo $DISTFILES_SRC|awk '{for(i=1;i<=NF;i++)print $i}'|sort>$tmp1
(
  echo $GENERATED_SRC|awk '{for(i=1;i<=NF;i++)print $i}'
  awk -F/ '/^\// {print $2}' $d/CVS/Entries
)|sort>$tmp2
diff -u -L "$f" -L "$d/CVS/Entries" $tmp1 $tmp2
done
-- 
Tanaka Akira

PATCH: prompt theme system improvements

[Adam Spiers]

OK, finally here's a patch to the prompt system which vastly improves
it.  After applying the patch, you should remove the following from
Functions/Prompts:

  prompt_{white,red,green,yellow,blue,cyan,magenta,combo}_setup

if the patch didn't succeed in getting rid of them.  (The patch was
made for copies of Tanaka's CVS archive, by the way.)

To get a very quick feeling of the changes, fire up a black background
terminal, preferably with the `nexus' or `vga' font or similar, type
`prompt -p' and gasp in horror at the tasteless colour combinations.


Changes in full gory detail:
----------------------------

  - Colours are now all in assoc arrays.

  - `prompt -c' shows current theme (with parameters if any).

  - All the {red,green,blue,...} themes merged into one fully
    colour-scheme-able `fade' theme.

  - `combo' theme converted to colour-scheme-able `bigfade' theme.

  - `adam1', `fire', `elite' and `elite2' made colour-scheme-able.

  - Added some more help texts for individual themes.

  - Mentioned that dark backgrounds work best in help texts.
  
  - If a theme defines a prompt_$themename_preview function, when that
    theme is being previewed, that function gets invoked rather than
    the normal previewing, which allows a colour-scheme-able theme to
    show more than one colour scheme for its preview.

  - Previewing semantics changed:
      + If no words specified after `-p', preview all themes.
      + If words specified after `-p', treat each word as a theme plus
        its arguments, and preview it accordingly.

  - Use of $'' instead of $(echo -n "") hack wherever possible.

  - Needless use of $(echo "") elsewhere removed.

  - Added zefram's prompt.

  - Fixed bug in Oliver's prompt; it doesn't work if you don't set up
    anything relating to it.  The guilty line is:

      local pcol="$'\e['${1:-${pcolour[${HOST:=`hostname`}]:-33}}m"

    If pcolour is non-existent or not declared as associative, the
    ${pcolour}[${HOST:=`hostname`}] bit barfs if ${HOST:=`hostname`}
    contains a `.' in it, which is quite likely.  So you need check
    the value of ${(t)pcolour} before doing this assignment.  This
    applies to tcolour too, of course.

  - There is now a pseudo-theme called `random'.  It defaults to
    picking randomly from all available themes (but without any
    supplied parameters to any), but if you give it arguments, each
    argument word will be treated as a theme with arguments.  For
    example:

      % prompt random "elite2 green" "elite2 blue" fire

    The `random' theme does not work in preview mode.

  - Other improvements I can't remember.


Known bugs:
-----------

  - I notice that the _prompt completion function no longer works,
    presumably through one of the many changes to arguments.  I'll try
    to fix this unless someone gets there first.

  - Some of the colours are tasteless.  Beauty is in the eye of the
    beholder ...  Contributions from graphic designers/artists welcome :-)

  - It would be nice to be able control the `bold-ness' of the colours
    provided as theme provided.

  - precmd and preexec still get stomped on.  I think the solution to
    this is to use Bart's addprecmd to add a hook to them both which
    calls prompt_pre{cmd,exec} respectively the first time promptinit
    is run, and then subsequent theme changes can alter these hook
    functions without messing up the original pre{cmd,exec}.  Does
    that sound reasonable?


Unknown bugs: 
-------------

  - There are many changes here, so there may be a few problems
    created.  Please test!

Adam

begin 664 promptpatch.gz
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
KL=:Q7HFZL?+7M0LAO`A])+H7H6*2&N6'O`@]:XTBBQ2I_`\D6KQ<K:``````
`
end

Re: PATCH: prompt theme system improvements

[Adam Spiers]

Adam Spiers, on thelonious (adam@thelonious.new.ox.ac.uk) wrote:
> OK, finally here's a patch to the prompt system which vastly improves
> it.

I forgot Misc/bash2zshprompt.  Doh.

Index: Misc/bash2zshprompt
===================================================================
RCS file: /projects/zsh/zsh/Misc/bash2zshprompt,v
retrieving revision 1.1.1.3
diff -u -r1.1.1.3 bash2zshprompt
--- Misc/bash2zshprompt	1999/10/15 13:07:14	1.1.1.3
+++ Misc/bash2zshprompt	1999/11/18 15:42:04
@@ -10,7 +10,7 @@
 my @colours = qw/grey red green yellow blue magenta cyan white/;
 
 my @codes = ();
-my %bold;
+my %boldp;
 my $out = '';
 
 print "# Converted to zsh prompt theme by bash2zshprompt, written by <adam\@spiers.net>\n";
@@ -80,21 +80,22 @@
               ($p[1] eq '4') ? 'bg' :
               '???');
 
-  $bold{$fgbg} ||= '';
+  $boldp{$fgbg} ||= '';
 
   if ($p[0] =~ /^0?0$/) {
-    $bold{$fgbg} = '';
+    $boldp{$fgbg} = '';
     return '$reset_color';
   }
   
   if ($p[0] =~ /^0?1$/) {
-    $bold{$fgbg} = 'bold_';
+    $boldp{$fgbg} = 'bold_';
     return '$bold_color';
   }
 
   return '$' .
-         "${fgbg}_$bold{$fgbg}" .
-         $colours[$p[2]];
+         "${fgbg}$boldp{$fgbg}\[" .
+         $colours[$p[2]] .
+         ']';
 }
 
 sub split_codes {

Re: PATCH: prompt theme system improvements

[Bart Schaefer]

On Nov 18,  2:53pm, Adam Spiers wrote:
} Subject: PATCH: prompt theme system improvements
}
} OK, finally here's a patch to the prompt system which vastly improves
} it.

I was just fooling with this, and after running

	prompt -p

I get the message

	set_prompt: command not found: prompt__setup [71]

and I'm left with the "adam1 theme" prompt, which happens to be the last
one previewed.

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

Re: PATCH: prompt theme system improvements

[Adam Spiers]

Bart Schaefer (schaefer@candle.brasslantern.com) wrote:
> On Nov 18,  2:53pm, Adam Spiers wrote:
> } Subject: PATCH: prompt theme system improvements
> }
> } OK, finally here's a patch to the prompt system which vastly improves
> } it.
> 
> I was just fooling with this, and after running
> 
> 	prompt -p
> 
> I get the message
> 
> 	set_prompt: command not found: prompt__setup [71]

Doh.  The

    p) if (( ! $+prompt_theme )); then
         print "Cannot preview; current prompt is non-themeable and would"
         print "be destroyed."
         return
       fi

bit should have caught this, but I'd already declared prompt_theme so
the test went wrong.

However, it's pretty bad that you can't preview any themes until
you're using one, so this patch changes that, and restores PS[1-4],
RPS1 and pre{cmd,exec} to their original values after the preview if
$prompt_theme wasn't set.

It also fixes some other bugs I found.

N.B. I forgot to mention that that last patch added the following files:

  Functions/Prompts/prompt_bigfade_setup
  Functions/Prompts/prompt_fade_setup
  Functions/Prompts/prompt_zefram_setup

Tanaka, can you please add them to the CVS repository?  Sorry!  The
following patch also fixes the relevant .distfiles.

Index: Functions/Prompts/.distfiles
===================================================================
RCS file: /projects/zsh/zsh/Functions/Prompts/.distfiles,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 .distfiles
--- Functions/Prompts/.distfiles	1999/11/03 09:06:29	1.1.1.2
+++ Functions/Prompts/.distfiles	1999/11/19 01:46:15
@@ -1,9 +1,8 @@
 DISTFILES_SRC='
     .distfiles
-    prompt_elite2_setup prompt_red_setup prompt_adam1_setup
+    prompt_elite2_setup prompt_adam1_setup prompt_fade_setup
     prompt_elite_setup prompt_redhat_setup prompt_adam2_setup
-    prompt_fire_setup prompt_suse_setup prompt_blue_setup
-    prompt_green_setup prompt_white_setup prompt_combo_setup
-    prompt_magenta_setup prompt_yellow_setup prompt_cyan_setup
-    prompt_oliver_setup prompt_off_setup promptinit
+    prompt_fire_setup prompt_suse_setup prompt_bigfade_setup
+    prompt_oliver_setup prompt_off_setup prompt_zefram_setup
+    promptinit
 '
Index: Functions/Prompts/prompt_adam2_setup
===================================================================
RCS file: /projects/zsh/zsh/Functions/Prompts/prompt_adam2_setup,v
retrieving revision 1.1.1.3
diff -u -r1.1.1.3 prompt_adam2_setup
--- Functions/Prompts/prompt_adam2_setup	1999/11/18 15:15:27	1.1.1.3
+++ Functions/Prompts/prompt_adam2_setup	1999/11/19 01:46:16
@@ -46,20 +46,17 @@
   # This is a cute hack.  Well I like it, anyway.
   prompt_gfx_bbox_to_mbox=$(print -n "%{\e[A\r$fg_bold[$prompt_adam2_color1]${prompt_gfx_mlc}$fg_no_bold[$prompt_adam2_color1]${prompt_gfx_hyphen}\e[B%}")
 
-  prompt_l_paren=$'%{$fg_bold[grey]%}('
-  prompt_r_paren=$'%{$fg_bold[grey]%})'
+  prompt_l_paren="%{$fg_bold[grey]%}("
+  prompt_r_paren="%{$fg_bold[grey]%})"
 
-  prompt_l_bracket=$'%{$fg_bold[grey]%}['
-  prompt_r_bracket=$'%{$fg_bold[grey]%}]'
-
   prompt_machine="%{$fg_no_bold[$prompt_adam2_color3]%}%n%{$fg_bold[$prompt_adam2_color3]%}@%{$fg_no_bold[$prompt_adam2_color3]%}%m"
 
   prompt_padding_text=`perl -e "print qq{${prompt_gfx_hyphen}} x 200"`
 
   prompt_line_1a="$prompt_gfx_tbox$prompt_l_paren%{$fg_bold[$prompt_adam2_color2]%}%~$prompt_r_paren%{$fg_no_bold[$prompt_adam2_color1]%}"
-  prompt_line_1a_no_color=$(echo "$prompt_line_1a" | perl -pe "s/%{.*?%}//g")
+  prompt_line_1a_no_color=$(echo "$prompt_line_1a" | perl -pe 's/%{.*?%}//g')
   prompt_line_1b="$prompt_l_paren$prompt_machine$prompt_r_paren%{$fg_no_bold[$prompt_adam2_color1]%}${prompt_gfx_hyphen}"
-  prompt_line_1b_no_color=$(echo "$prompt_line_1b" | perl -pe "s/%{.*?%}//g")
+  prompt_line_1b_no_color=$(echo "$prompt_line_1b" | perl -pe 's/%{.*?%}//g')
 
   prompt_line_2="$prompt_gfx_bbox${prompt_gfx_hyphen}%{$fg_bold[white]%}"
 
Index: Functions/Prompts/prompt_fire_setup
===================================================================
RCS file: /projects/zsh/zsh/Functions/Prompts/prompt_fire_setup,v
retrieving revision 1.1.1.3
diff -u -r1.1.1.3 prompt_fire_setup
--- Functions/Prompts/prompt_fire_setup	1999/11/18 15:15:27	1.1.1.3
+++ Functions/Prompts/prompt_fire_setup	1999/11/19 01:46:16
@@ -43,7 +43,7 @@
   local COLOR6="%{$bold_color$fg[$date]$bg[grey]%}"
   local GRAD0="%{$reset_color%}"
 
-  PS1=$COLOR1$GRAD1$COLOR2'%n@%m'$COLOR3$GRAD2$COLOR4$GRAD1$COLOR6' %D{%a %b %d} %D{%I:%M:%S%P} '$NONE'$prompt_newline'$COLOR5'%~/'$GRAD0' '
+  PS1=$COLOR1$GRAD1$COLOR2'%n@%m'$COLOR3$GRAD2$COLOR4$GRAD1$COLOR6' %D{%a %b %d} %D{%I:%M:%S%P} '$NONE$prompt_newline$COLOR5'%~/'$GRAD0' '
   PS2=$COLOR1$GRAD1$COLOR3$GRAD2$COLOR4$GRAD1$COLOR5'>'$GRAD0' '
 
   precmd () { setopt promptsubst }
Index: Functions/Prompts/promptinit
===================================================================
RCS file: /projects/zsh/zsh/Functions/Prompts/promptinit,v
retrieving revision 1.1.1.8
diff -u -r1.1.1.8 promptinit
--- Functions/Prompts/promptinit	1999/11/18 15:15:27	1.1.1.8
+++ Functions/Prompts/promptinit	1999/11/19 01:46:28
@@ -81,10 +81,11 @@
        print $prompt_themes
        return
        ;;
-    p) if (( ! $+prompt_theme )); then
-         print "Cannot preview; current prompt is non-themeable and would"
-         print "be destroyed."
-         return
+    p) if [[ -z "$prompt_theme[1]" ]]; then
+         # Not using a prompt theme; save settings
+         prompt_non_theme=( "$PS1" "$PS2" "$PS3" "$PS4" "$RPS1" )
+         prompt_old_precmd="$(functions precmd)"
+         prompt_old_preexec="$(functions preexec)"
        fi
        preview=( $prompt_themes )
        (( $#* > 1 )) && preview=( "$@[2,-1]" )
@@ -97,10 +98,10 @@
          fi
          print
 
-	 # The next line is a bit ugly.  It (perhaps unnecessarily)
-	 # runs the prompt theme setup function to ensure that if
-	 # the theme has a _preview function that it's been autoloaded.
-	 prompt_${theme_args[1]}_setup
+         # The next line is a bit ugly.  It (perhaps unnecessarily)
+         # runs the prompt theme setup function to ensure that if
+         # the theme has a _preview function that it's been autoloaded.
+         prompt_${theme_args[1]}_setup
 
          if functions prompt_${theme_args[1]}_preview >&/dev/null; then
            prompt_${theme_args[1]}_preview "${(@)theme_args[2,-1]}"
@@ -109,7 +110,25 @@
          fi
        done
        print
-       prompt_${prompt_theme[1]}_setup "${(@)prompt_theme[2,-1]}"
+       if [[ -z "$prompt_theme[1]" ]]; then
+         PS1="$prompt_non_theme[1]"
+         PS2="$prompt_non_theme[2]"
+         PS3="$prompt_non_theme[3]"
+         PS4="$prompt_non_theme[4]"
+         RPS1="$prompt_non_theme[5]"
+         if [[ -z "$prompt_old_precmd" ]]; then
+           precmd () { }
+         else
+           eval "$prompt_old_precmd"
+         fi
+         if [[ -z "$prompt_old_preexec" ]]; then
+           preexec () { }
+         else
+           eval "$prompt_old_preexec"
+         fi
+       else
+         prompt_${prompt_theme[1]}_setup "${(@)prompt_theme[2,-1]}"
+       fi
        ;;
     s) print "Set and save not yet implemented.  Please ensure your ~/.zshrc"
        print "contains something similar to the following:\n"
@@ -118,12 +137,12 @@
        print "  prompt $*[2,-1]"
        ;;
     *) if [[ "$1" == 'random' ]]; then
-	 local random_themes
-	 if (( $#* == 1 )); then
-	   random_themes=( $prompt_themes )
-	 else
-	   random_themes=( "$@[2,-1]" )
-	 fi
+         local random_themes
+         if (( $#* == 1 )); then
+           random_themes=( $prompt_themes )
+         else
+           random_themes=( "$@[2,-1]" )
+         fi
          local i=$(( ( $RANDOM % $#random_themes ) + 1 ))
          argv=( "${=random_themes[$i]}" )
        fi

Re: PATCH: prompt theme system improvements

[Tanaka Akira]

In article <19991119015143.A29956@thelonious.new.ox.ac.uk>,
  Adam Spiers <adam@thelonious.new.ox.ac.uk> writes:

> N.B. I forgot to mention that that last patch added the following files:
> 
>   Functions/Prompts/prompt_bigfade_setup
>   Functions/Prompts/prompt_fade_setup
>   Functions/Prompts/prompt_zefram_setup
> 
> Tanaka, can you please add them to the CVS repository?  Sorry!  The
> following patch also fixes the relevant .distfiles.

Usually, my script adds new files automatically.  So I don't need such
notices.  However, file removing/moving/reverting requires some manual
work and sometimes I forget them...

In reality, I have a directory which contains latest zsh and is *not*
maintained by cvs.  The directory is updated by patches from
zsh-workers and zsh-users and the repository is updated by `cvs
import' for each patch.  So, new files are automatically appeared on
main trunc when a patch create these files.  When some files are
removed, `cvs rm' is needed.  When some files are moved, these files
must be moved manually and `cvs import' is needed.  Sometimes I omit
the `cvs import' because it'll be executed with next patch, though.
When some files are reverted, `cvs add' and `cvs admin -b1.1.1' is
needed.
-- 
Tanaka Akira

Re: PATCH: prompt theme system improvements

[Oliver Kiddle]

Adam Spiers wrote:

> Changes in full gory detail:
> ----------------------------
> 
>   - Colours are now all in assoc arrays.

This is much better. We should maybe add the 'gray' spelling aswell as 'grey' to the associative arrays so people have the choice. I'd also put the other attributes in an associative array so instead of $boldcolor, we have $color_attr[reset, bold, underline, standout] etc.

>   - `adam1', `fire', `elite' and `elite2' made colour-scheme-able.

I've patched the 'oliver' prompt to use the colour names aswell patch follows.
 
>   - Fixed bug in Oliver's prompt; it doesn't work if you don't set up

Thanks.

> Known bugs:
> -----------
> 
>   - I notice that the _prompt completion function no longer works,
>     presumably through one of the many changes to arguments.  I'll try
>     to fix this unless someone gets there first.

I suppose that we should allow the different prompts to specify completion for their parameters. Only trouble is that we can't get at any functions in the prompt until they have been setup.

>   - Some of the colours are tasteless.  Beauty is in the eye of the
>     beholder ...  Contributions from graphic designers/artists welcome :-)

I'd also say that it isn't exactly wise that the majority of the example prompts require a strange font.

>   - It would be nice to be able control the `bold-ness' of the colours
>     provided as theme provided.

I've done this with the 'oliver' prompt in the patch below - precede the colours with the word 'bold'.

>   - precmd and preexec still get stomped on.  I think the solution to
>     this is to use Bart's addprecmd to add a hook to them both which
>     calls prompt_pre{cmd,exec} respectively the first time promptinit
>     is run, and then subsequent theme changes can alter these hook
>     functions without messing up the original pre{cmd,exec}.  Does
>     that sound reasonable?

That sounds like the best solution.

I also think it would be sensible for promptinit to save the original PS2 and PS3 and set them back to the originals before changing prompt. This means that any prompts which don't set them will use the original settings instead of those set by the last theme. 

The patch below makes a few of your prompts use prompt_opts insead of precmd. I've added 'true' to the end of the prompt function because it was returning an exit code of one half the time. It should probably return set_prompt's return code and set_prompt should return sensible exit codes and send its error messages to stderr but I haven't done this.
The typeset -g prompt_theme line echos the value of prompt_theme if it is set so I redirected it to /dev/null. I also updated my prompt with some other changes.

With respect to colour themes. It would be good to have a single way for defining colours across zsh. ZLS_COLOURS may be compatible with GNU ls but it isn't exactly the most readable way. One possible way would be to use an associative array for colours where the keys specify the context and the values specify the attributes. So for example, you might define:
zsh_colours[ls_directories]="bold blue on white"
zsh_colours[prompt_currentdir]="underlined green"
If different prompt themes use the same context words, you could share colour selections across prompts. It might also lead to a mechanism for defining the colours for different types of completion matches in the lists - not just for files.

Oliver Kiddle

diff -u Prompts.old/prompt_off_setup Prompts/prompt_off_setup
--- Prompts.old/prompt_off_setup	Thu Nov 18 16:15:57 1999
+++ Prompts/prompt_off_setup	Fri Nov 19 10:40:35 1999
@@ -4,7 +4,8 @@
   PS1="%# "
   PS2="> "
 
-  precmd () { setopt promptsubst }
+  prompt_opts=( cr percent )
+  precmd () { }
   preexec () { }
 }
 
diff -u Prompts.old/prompt_oliver_setup Prompts/prompt_oliver_setup
--- Prompts.old/prompt_oliver_setup	Thu Nov 18 17:40:39 1999
+++ Prompts/prompt_oliver_setup	Fri Nov 19 10:11:22 1999
@@ -9,7 +9,8 @@
 The colour of the prompt depends on two associative arrays -
 $pcolour and $tcolour. Each array is indexed by the name of the
 local host. Alternatively, the colour can be set with parameters
-to prompt.
+to prompt. To specify colours, use English words like 'yellow',
+optionally preceded by 'bold'.
 
 The hostname and username are also included unless they are in the
 $normal_hosts or $normal_users array.
@@ -17,21 +18,23 @@
 }
 
 prompt_oliver_setup() {
-  prompt_opts=( percent )
+  prompt_opts=( cr subst percent )
 
   [[ "${(t)pcolour}" != assoc* ]] && typeset -Ag pcolour
   [[ "${(t)tcolour}" != assoc* ]] && typeset -Ag tcolour
-  local pcol=$'\e['${1:-${pcolour[${HOST:=`hostname`}]:-33}}m
-  local tcol=$'\e['${2:-${tcolour[$HOST]:-37}}m
+  local pcol=${1:-${pcolour[${HOST:=`hostname`}]:-yellow}}
+  local pcolr=$fg[${pcol#bold}]
+  [[ $pcol = bold* ]] && pcolr=$bold_color$pcolr
+  
+  local tcol=${2:-${tcolour[$HOST]:-white}}
+  local tcolr=$reset_color$fg[${tcol#bold}]
+  [[ $tcol = bold* ]] && tcolr=$tcolr$bold_color
+  
   local a host="%M:" user="%n "
-  for a in $normal_hosts; do
-    [[ $HOST == $a ]] && host=""
-  done
-  for a in root $normal_users; do
-    [[ ${USER:-`whoami`} == $a ]] && user=""
-  done
+  [[ $HOST == (${(j(|))~normal_hosts}) ]] && host=""
+  [[ ${USER:-`whoami`} == (root|${(j(|))~normal_users}) ]] && user=""
 
-  PS1="%{$pcol%}$user$host%~ [%h%0(?..:%?)]%# %{$tcol%}"
+  PS1="%{$pcolr%}$user$host%~%"'$((COLUMNS-12))'"(l.$prompt_newline. )[%h%0(?..:%?)]%# %{$tcolr%}"
 }
 
 prompt_oliver_setup "$@"
diff -u Prompts.old/prompt_redhat_setup Prompts/prompt_redhat_setup
--- Prompts.old/prompt_redhat_setup	Fri Oct 15 10:38:21 1999
+++ Prompts/prompt_redhat_setup	Fri Nov 19 10:36:25 1999
@@ -6,7 +6,8 @@
   PS1="[%n@%m %1~]\\$ "
   PS2="> "
 
-  precmd () { setopt promptsubst }
+  prompt_opts=( cr percent )
+  precmd () { }
   preexec () { }
 }
 
diff -u Prompts.old/prompt_suse_setup Prompts/prompt_suse_setup
--- Prompts.old/prompt_suse_setup	Thu Nov 18 16:15:57 1999
+++ Prompts/prompt_suse_setup	Fri Nov 19 10:32:17 1999
@@ -6,7 +6,8 @@
   PS1="%n@%m:%~/ > "
   PS2="> "
 
-  precmd () { setopt promptsubst }
+  prompt_opts=( cr percent )
+  precmd () { }
   preexec () { }
 }
 
diff -u Prompts.old/prompt_zefram_setup Prompts/prompt_zefram_setup
--- Prompts.old/prompt_zefram_setup	Thu Nov 18 16:15:57 1999
+++ Prompts/prompt_zefram_setup	Fri Nov 19 10:31:13 1999
@@ -10,7 +10,8 @@
   PS1='[%(2L.%L/.)'$ZSH_VERSION']%(?..%B{%v}%b)%n%(2v.%B@%b.@)%m:%B%~%b%(!.#.>) '
   PS2='%(4_:... :)%3_> '
 
-  precmd () { prompt_zefram_precmd; setopt promptsubst }
+  prompt_opts=( cr subst percent )
+  precmd () { prompt_zefram_precmd }
   preexec () { }
 }
 
diff -u Prompts.old/promptinit Prompts/promptinit
--- Prompts.old/promptinit	Thu Nov 18 16:15:57 1999
+++ Prompts/promptinit	Fri Nov 19 10:58:51 1999
@@ -8,12 +8,12 @@
 
 prompt_themes=()
 typeset -gU prompt_themes
-typeset -g prompt_theme
+typeset -g prompt_theme >/dev/null
 
 promptinit () {
   emulate -L zsh
   setopt extendedglob
-  local ppath='' name
+  local ppath='' name theme
 
   # Autoload all prompt_*_setup functions in fpath
   for theme in $^fpath/prompt_*_setup(N); do
@@ -151,6 +151,8 @@
  
   (( $#prompt_opts )) &&
       setopt noprompt{bang,cr,percent,subst} prompt${^prompt_opts[@]}
+
+  true
 }
 
 prompt_preview_theme () {