about summary refs log tree commit diff
path: root/Doc/zmacros.yo
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2006-03-20 11:06:22 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2006-03-20 11:06:22 +0000
commit40df7069cb3f0bcac939eab2337511a5ac5ef510 (patch)
tree979d870a872f3b99f3e59c3ad8e8c75ab20f940f /Doc/zmacros.yo
parentb37a0f000058dc91fbc87e803ae91486c8396a9e (diff)
downloadzsh-40df7069cb3f0bcac939eab2337511a5ac5ef510.tar.gz
zsh-40df7069cb3f0bcac939eab2337511a5ac5ef510.tar.xz
zsh-40df7069cb3f0bcac939eab2337511a5ac5ef510.zip
22360, 22365: support version 2 of Yodl
Diffstat (limited to 'Doc/zmacros.yo')
-rw-r--r--Doc/zmacros.yo23
1 files changed, 19 insertions, 4 deletions
diff --git a/Doc/zmacros.yo b/Doc/zmacros.yo
index 1c3319059..19506d222 100644
--- a/Doc/zmacros.yo
+++ b/Doc/zmacros.yo
@@ -1,8 +1,12 @@
+IFDEF(INCWSLEVEL)(\
+INCWSLEVEL()\
+)(\
 STARTDEF()
+)
 
 DEFINEMACRO(includefile)(1)(\
   TYPEOUT(Including file ARG1)\
-  comment(Yodl file: ARG1)NL()\
+  comment(Yodl file: ARG1)+NL()\
   INCLUDEFILE(ARG1)\
 )
 
@@ -10,10 +14,18 @@ DEFINEMACRO(def)(3)(\
   DEFINEMACRO(ARG1)(ARG2)(ARG3)\
 )
 DEFINEMACRO(undef)(1)(\
+  IFDEF(DELETEMACRO)(\
+  DELETEMACRO(ARG1)\
+  )(\
   UNDEFINEMACRO(ARG1)\
+  )\
 )
 DEFINEMACRO(redef)(3)(\
+  IFDEF(DELETEMACRO)(\
+  DELETEMACRO(ARG1)\
+  )(\
   UNDEFINEMACRO(ARG1)\
+  )\
   DEFINEMACRO(ARG1)(ARG2)(ARG3)\
 )
 
@@ -24,12 +36,15 @@ DEFINEMACRO(PLUS)(0)(CHAR(43))
 
 DEFINEMACRO(DASH)(0)(ifztexi(--)ifnztexi(-))
 
-DEFINEMACRO(NL)(0)(
-)
+DEFINEMACRO(NL)(0)(CHAR(10))
 
 DEFINEMACRO(ifzman)(1)()
 DEFINEMACRO(ifnzman)(1)(ARG1)
 DEFINEMACRO(ifztexi)(1)()
 DEFINEMACRO(ifnztexi)(1)(ARG1)
 
-ENDDEF()
+IFDEF(DECWSLEVEL)(\
+DECWSLEVEL()\
+)(\
+ENDDEF()\
+)\