zsh-3.1.5-pws-23 zsh-3.1.5-pws-23

1 files changed, 5 insertions, 11 deletions

diff --git a/Src/utils.c b/Src/utils.c
index a409ab03c..16dbe9229 100644
--- a/Src/utils.c
+++ b/Src/utils.c
@@ -62,10 +62,9 @@ zerr(const char *fmt, const char *str, int num)
     /*
      * scriptname is set when sourcing scripts, so that we get the
      * correct name instead of the generic name of whatever
-     * program/script is running.  It's also set in shell functions,
-     * so test locallevel, too.
+     * program/script is running.
      */
-    nicezputs((isset(SHINSTDIN) && !locallevel) ? "zsh" :
+    nicezputs(isset(SHINSTDIN) ? "zsh" :
 	      scriptname ? scriptname : argzero, stderr);
     fputs(": ", stderr);
     zerrnam(NULL, fmt, str, num);
@@ -80,7 +79,7 @@ zerrnam(const char *cmd, const char *fmt, const char *str, int num)
 	    return;
 	errflag = 1;
 	trashzle();
-	if (unset(SHINSTDIN) || locallevel) {
+	if(unset(SHINSTDIN)) {
 	    nicezputs(scriptname ? scriptname : argzero, stderr);
 	    fputs(": ", stderr);
 	}
@@ -134,7 +133,7 @@ zerrnam(const char *cmd, const char *fmt, const char *str, int num)
 	    putc(*fmt == Meta ? *++fmt ^ 32 : *fmt, stderr);
 	    fmt++;
 	}
-    if ((unset(SHINSTDIN) || locallevel) && lineno)
+    if (unset(SHINSTDIN) && lineno)
 	fprintf(stderr, " [%ld]\n", (long)lineno);
     else
 	putc('\n', stderr);
@@ -2134,12 +2133,7 @@ mkarray(char *s)
 void
 zbeep(void)
 {
-    char *vb;
-    if ((vb = getsparam("ZBEEP"))) {
-	int len;
-	vb = getkeystring(vb, &len, 2, NULL);
-	write(SHTTY, vb, len);
-    } else if (isset(BEEP))
+    if (isset(BEEP))
 	write(SHTTY, "\07", 1);
 }