about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2000-07-12 11:04:07 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2000-07-12 11:04:07 +0000
commit4f9a7e27d4d22ee5629b6ccde7eb42ac7252de26 (patch)
treef5c3260cd38eedbbc16638cd0b270549192f2c49
parent046f5da3aa51f6d306144675fbd12ca8f5684b65 (diff)
downloadzsh-4f9a7e27d4d22ee5629b6ccde7eb42ac7252de26.tar.gz
zsh-4f9a7e27d4d22ee5629b6ccde7eb42ac7252de26.tar.xz
zsh-4f9a7e27d4d22ee5629b6ccde7eb42ac7252de26.zip
12231: fix compinstall list-prompt setting
-rw-r--r--ChangeLog4
-rw-r--r--Completion/Core/compinstall14
2 files changed, 10 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index ed1135915..1ac86ccb9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-07-12  Peter Stephenson  <pws@cambridgesiliconradio.com>
+
+	* 12231: Completion/Core/compinstall: fix setting of list-prompt.
+
 2000-07-12  Sven Wischnowsky  <wischnow@zsh.org>
 
 	* 12229: Doc/Zsh/compsys.yo: fix for list-prompt docs
diff --git a/Completion/Core/compinstall b/Completion/Core/compinstall
index fc56d2152..a913c97e0 100644
--- a/Completion/Core/compinstall
+++ b/Completion/Core/compinstall
@@ -1394,18 +1394,16 @@ To enable this, edit a prompt to show when scrolling is active; an empty
 string turns this feature off.  It can contain \`%l' to show the number of
 matches as \`current_number/total_number', \`%p' to show the fraction of
 the way down the list, or font-control sequences such as %B, %U, %S and the
-corresponding %b, %u, %s; quotes will be added automatically.  Note that
-this is the default behaviour; delete the whole line to turn it off, in
-which case the display of completions which don't fit on the screen is
-controlled by the LISTMAX parameter (currently ${LISTMAX:-unset}), which
-specifies the maximum number to show without asking.  Hit return to keep
-the current value.
+corresponding %b, %u, %s; quotes will be added automatically.  Delete the
+whole line to turn this behaviour off, in which case the display of
+completions which don't fit on the screen is controlled by the LISTMAX
+parameter (currently ${LISTMAX:-unset}), which specifies the maximum number
+to show without asking.  Hit return to keep the current value.
 "
          [[ -z $haslistp ]] &&
 	   listp='%SAt %p: Hit TAB for more, or the character to insert%s'
 	 vared -eh -p 'prompt> ' -c listp
-	 # Unconditionally use listp; will become '' if empty.
-	 haslistp=1
+	 [[ -z $listp ]] && haslistp=
 	 ;;
       q) return 1
          ;;