From 5659426c2a4d6465f915a86257d01ea6b8c7a984 Mon Sep 17 00:00:00 2001
From: Peter Stephenson <pws@users.sourceforge.net>
Date: Sat, 31 Jul 2010 21:06:10 +0000
Subject: always print job status if non-zero status and PRINTEXITSVALUE

---
 ChangeLog  |  5 ++++-
 Src/jobs.c | 30 ++++++++++++++++++------------
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 741cc9a62..5da5b81f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2010-07-31  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
+	* 28111: Src/jobs.c: always print exit status if PRINTEXITVALUE
+	is set.
+
 	* users/15217: Src/Zle/zle_main.c: use top-level status
 	when redrawing prompt.
 
@@ -13457,5 +13460,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5041 $
+* $Revision: 1.5042 $
 *****************************************************
diff --git a/Src/jobs.c b/Src/jobs.c
index a3cf4711b..4560bf4e2 100644
--- a/Src/jobs.c
+++ b/Src/jobs.c
@@ -837,7 +837,7 @@ printjob(Job jn, int lng, int synch)
     Process pn;
     int job, len = 9, sig, sflag = 0, llen;
     int conted = 0, lineleng = columns, skip = 0, doputnl = 0;
-    int doneprint = 0;
+    int doneprint = 0, skip_print = 0;
     FILE *fout = (synch == 2 || !shout) ? stdout : shout;
 
     if (oldjobtab != NULL)
@@ -846,16 +846,7 @@ printjob(Job jn, int lng, int synch)
 	job = jn - jobtab;
 
     if (jn->stat & STAT_NOPRINT) {
-	if (jn->stat & STAT_DONE) {
-	    deletejob(jn);
-	    if (job == curjob) {
-		curjob = prevjob;
-		prevjob = job;
-	    }
-	    if (job == prevjob)
-		setprevjob();
-	}
-	return 0;
+	skip_print = 1;
     }
 
     if (lng < 0) {
@@ -889,11 +880,26 @@ printjob(Job jn, int lng, int synch)
 		if (job == thisjob && sig == SIGTSTP)
 		    doputnl = 1;
 	    } else if (isset(PRINTEXITVALUE) && isset(SHINSTDIN) &&
-		       WEXITSTATUS(pn->status))
+		       WEXITSTATUS(pn->status)) {
 		sflag = 1;
+		skip_print = 0;
+	    }
 	}
     }
 
+    if (skip_print) {
+	if (jn->stat & STAT_DONE) {
+	    deletejob(jn);
+	    if (job == curjob) {
+		curjob = prevjob;
+		prevjob = job;
+	    }
+	    if (job == prevjob)
+		setprevjob();
+	}
+	return 0;
+    }
+
     /*
      * - Always print if called from jobs
      * - Otherwise, require MONITOR option ("jobbing") and some
-- 
cgit 1.4.1