X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fwhatnowsbr.c;h=8cb674461715672112290b8be91b747bbbf409d2;hb=684ec30d81e1223a282764452f4902ed4ad1c754;hp=79f7c6f919af735baa1b297ebea2971dc5ae3da9;hpb=875a8bcc360e2cbb611b8163ff3d2234287be3bc;p=mmh

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index 79f7c6f..8cb6744 100644
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -688,12 +688,6 @@ editfile(char **ed, char **arg, char *file, int use, struct msgs *mp,
 
 	default:
 		if ((status = pidwait(pid, NOTOK))) {
-#ifdef ATTVIBUG
-			if ((cp = mhbasename(*ed)) && strcmp(cp, "vi") == 0 &&
-					(status & 0x00ff) == 0)
-				status = 0;
-			else {
-#endif
 			if (((status & 0xff00) != 0xff00)
 				&& (!reedit || (status & 0x00ff))) {
 				if (!use && (status & 0xff00) && (rename(file, cp = m_backup (file)) != NOTOK)) {
@@ -704,9 +698,6 @@ editfile(char **ed, char **arg, char *file, int use, struct msgs *mp,
 			}
 			status = -2;  /* maybe "reedit ? -2 : -1"? */
 			break;
-#ifdef ATTVIBUG
-			}
-#endif
 		}
 
 		reedit++;
@@ -846,23 +837,19 @@ static struct swit  sendswitches[] = {
 	{ "push", 0 },
 #define NSPSHSW  9
 	{ "nopush", 0 },
-#define UNIQSW  10
-	{ "unique", -6 },
-#define NUNIQSW  11
-	{ "nounique", -8 },
-#define VERBSW  12
+#define VERBSW  10
 	{ "verbose", 0 },
-#define NVERBSW  13
+#define NVERBSW  11
 	{ "noverbose", 0 },
-#define WATCSW  14
+#define WATCSW  12
 	{ "watch", 0 },
-#define NWATCSW  15
+#define NWATCSW  13
 	{ "nowatch", 0 },
-#define WIDTHSW  16
+#define WIDTHSW  14
 	{ "width columns", 0 },
-#define SVERSIONSW  17
+#define SVERSIONSW  15
 	{ "version", 0 },
-#define SHELPSW  18
+#define SHELPSW  16
 	{ "help", 0 },
 	{ NULL, 0 }
 };
@@ -872,7 +859,6 @@ extern int debugsw;  /* from sendsbr.c */
 extern int forwsw;
 extern int inplace;
 extern int pushsw;
-extern int unique;
 extern int verbsw;
 
 extern char *altmsg;  /*  .. */
@@ -928,7 +914,6 @@ sendit(char *sp, char **arg, char *file, int pushed)
 	debugsw = 0;
 	forwsw = 1;
 	inplace = 1;
-	unique = 0;
 
 	altmsg = NULL;
 	annotext = NULL;
@@ -964,12 +949,6 @@ sendit(char *sp, char **arg, char *file, int pushed)
 				pushed = 0;
 				continue;
 
-			case UNIQSW:
-				unique++;
-				continue;
-			case NUNIQSW:
-				unique = 0;
-				continue;
 			case FORWSW:
 				forwsw++;
 				continue;
@@ -1021,7 +1000,7 @@ sendit(char *sp, char **arg, char *file, int pushed)
 		dp = getcpy(cp);
 		for (ap = brkstring(dp, " ", "\n"); ap && *ap; ap++) {
 			vec[vecp++] = "-alias";
-			vec[vecp++] = *ap;
+			vec[vecp++] = getcpy(etcpath(*ap));
 		}
 	}