summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Etc/zsh-development-guide4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1334e29d8..cee715d33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-11-08  Barton E. Schaefer  <schaefer@brasslantern.com>
+
+	* 37079: Etc/zsh-development-guide: better description of "optstr"
+	field in struct builtin as used in BUILTIN() macro
+
 2015-11-07  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* 37074: Src/subst.c, Test/D04parameter.ztst: extend previous
diff --git a/Etc/zsh-development-guide b/Etc/zsh-development-guide
index 9ca441bd8..c4aa1b243 100644
--- a/Etc/zsh-development-guide
+++ b/Etc/zsh-development-guide
@@ -503,7 +503,9 @@ arguments are:
   - the options the builtin accepts, given as a string containing the
     option characters (the above example makes the builtin accept the
     options `f', `l', `a', `g', and `s').  Passing NULL here disables
-    all flag handling, i.e. even "--".
+    all flag handling, i.e. even "--".  Each option letter may be
+    followed by one of ":" (argument must follow), "::" (optional
+    argument may follow), or ":%" (optional numeric argument).
   - and finally a optional string containing option characters that
     will always be reported as set when calling the C-function (this,
     too, can be used when using one C-function to implement multiple