summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Doc/Zsh/invoke.yo4
-rw-r--r--Doc/Zsh/zle.yo2
-rw-r--r--Doc/zmacros.yo4
4 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 64e6e6dd6..75a7e3674 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,11 @@
 	* 20398: Src/Zle/zle_main.c: allow clean exit from within
 	a zle widget function.
 
+2004-09-20  Bart Schaefer  <schaefer@zsh.org>
+
+	* 20397: Doc/zmacros.yo, Doc/Zsh/invoke.yo, Doc/Zsh/zle.yo: tweaks
+	to account for texinfo's tendency to condense "--" into "-".
+
 2004-09-20  Peter Stephenson  <pws@csr.com>
 
 	* 20391: Src/params.c: SHLVL didn't get updated in the
diff --git a/Doc/Zsh/invoke.yo b/Doc/Zsh/invoke.yo
index e0987a1bd..565d33877 100644
--- a/Doc/Zsh/invoke.yo
+++ b/Doc/Zsh/invoke.yo
@@ -80,8 +80,8 @@ is permitted and does not end option processing.
 
 Except when the bf(sh)/bf(ksh) emulation single-letter options are in effect,
 the option `tt(-b)' (or `tt(PLUS()b)') ends option processing.
-`tt(-b)' is like `tt(--)', except that further single-letter options can be
-stacked after the `tt(-b)' and will take effect as normal.
+`tt(-b)' is like `tt(-)tt(-)', except that further single-letter options
+can be stacked after the `tt(-b)' and will take effect as normal.
 
 startmenu()
 menu(Compatibility)
diff --git a/Doc/Zsh/zle.yo b/Doc/Zsh/zle.yo
index 9af41e820..39d28a49d 100644
--- a/Doc/Zsh/zle.yo
+++ b/Doc/Zsh/zle.yo
@@ -1491,7 +1491,7 @@ Inside a widget function, a call to this function treats the last key of
 the key sequence which called the widget as the digit.
 )
 tindex(neg-argument)
-item(tt(neg-argument) (ESC--) (unbound) (unbound))(
+item(tt(neg-argument) (ESC-DASH()) (unbound) (unbound))(
 Changes the sign of the following argument.
 )
 tindex(universal-argument)
diff --git a/Doc/zmacros.yo b/Doc/zmacros.yo
index c6df3d551..882abf41a 100644
--- a/Doc/zmacros.yo
+++ b/Doc/zmacros.yo
@@ -19,7 +19,9 @@ DEFINEMACRO(redef)(3)(\
 
 DEFINEMACRO(LPAR)(0)(CHAR(40))
 DEFINEMACRO(RPAR)(0)(CHAR(41))
-DEFINEMACRO(PLUS)(0)(CHAR(+))
+DEFINEMACRO(PLUS)(0)(CHAR(43))
+
+DEFINEMACRO(DASH)(0)(ifztexi(--)ifnztexi(-))
 
 DEFINEMACRO(NL)(0)(
 )