-diff -ru /usr/src/usr.bin/w/Makefile w/Makefile
+diff -rbu /usr/src/usr.bin/w/Makefile ./Makefile
 --- /usr/src/usr.bin/w/Makefile	2014-01-16 15:36:18.000000000 -0500
-+++ w/Makefile	2014-08-11 02:22:47.155675163 -0400
++++ ./Makefile	2014-11-16 20:20:26.768360792 -0500
 @@ -4,8 +4,8 @@
  PROG=	w
  SRCS=	fmt.c pr_time.c proc_compare.c w.c

 	exit(1);
 }
 
Only in w: w.c.orig
Only in w: w.c.rej
Only in w: w.c~
Only in w: w.o

+		        xo_close_container("process-table");
 		}
-		(void)printf("%-*.*s %-*.*s %-*.*s ",
+		xo_emit("{:user/%-*.*s/%@**@s} {:tty/%-*.*s/%@**@s} ",
 		    W_DISPUSERSIZE, W_DISPUSERSIZE, ep->utmp.ut_user,
 		    W_DISPLINESIZE, W_DISPLINESIZE,
 		    *ep->utmp.ut_line ?
 		    (strncmp(ep->utmp.ut_line, "tty", 3) &&
 		    strncmp(ep->utmp.ut_line, "cua", 3) ?
-		    ep->utmp.ut_line : ep->utmp.ut_line + 3) : "-",
+			 ep->utmp.ut_line : ep->utmp.ut_line + 3) : "-");
+
+		if (save_p && save_p != p)
