Merge branch 'master' of gitorious.org:procps/procps

Conflicts: NEWS
2011-12-01 23:13:15 +11:00 · 2011-12-01 23:13:15 +11:00 · bf1cd8b6e7
commit bf1cd8b6e7
parent 43734fad69 93a9550315
2 changed files with 2 additions and 1 deletions
--- a/1
+++ b/1
@ -1,6 +1,7 @@
 procps-3.3.0 --> procps-ng-3.3.1
 --------------------------------

+  * Added DejaGNU regression testing
  * Fixed pgrep -u not finding processes
  * Fixed pgrep crashing
  * vmstat -p <part> finds partitions. Was Debian patch vmstat_part_format
--- a/watch.c
+++ b/watch.c
@ -298,7 +298,7 @@ main(int argc, char *argv[])
 					chtype oldch = inch();
 					unsigned char oldc = oldch & A_CHARTEXT;
 					attr = !first_screen
-					    && ((char)c != oldc
+					    && ((unsigned char)c != oldc
 						||
 						(option_differences_cumulative
 						 && (oldch & A_ATTRIBUTES)));