about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Functions/Misc/allopt9
2 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index e302d6f0b..a1e14f46e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-09-01  Bart Schaefer  <schaefer@zsh.org>
+
+	* 12721: Functions/Misc/allopt: Remove "emulate" which changes the
+	output of the function; other minor cleanup.
+
 2000-08-30  Clint Adams  <schizo@debian.org>
 
 	* 12720: Completion/Debian/_dpkg: change two instances of
diff --git a/Functions/Misc/allopt b/Functions/Misc/allopt
index 604e76198..0d59fa3e9 100644
--- a/Functions/Misc/allopt
+++ b/Functions/Misc/allopt
@@ -8,17 +8,16 @@
 # Written by Sweth Chandramouli with hacks by Bart Schaefer.
 
 listalloptions () {
-   emulate -R zsh
    builtin setopt localoptions kshoptionprint
    local OPT_NAME OPT_PAIR OPT_VALUE
    for OPT_PAIR in "${(f)$(builtin setopt)}" ; do
       OPT_VALUE=${OPT_PAIR##* }
       OPT_NAME=${OPT_PAIR%% *}
       if [[ ${OPT_NAME#no} != ${OPT_NAME} ]] ; then
-         OPT_VALUE=${(L)${${OPT_VALUE:s/on/OFF}:s/off/on}} &&
-            OPT_NAME=${OPT_NAME#no};
-      fi;
-      echo ${(r:21:)OPT_NAME} ${OPT_VALUE}
+	 OPT_VALUE=${(L)${${OPT_VALUE:s/on/OFF}:s/off/on}}
+	 OPT_NAME=${OPT_NAME#no}
+      fi
+      echo "${(r:21:)OPT_NAME} ${OPT_VALUE}"
    done
 }