Module Name:    src
Committed By:   nia
Date:           Sun Aug 21 21:35:36 UTC 2022

Modified Files:
        src/bin/sh: histedit.c

Log Message:
sh(1): revert previous because it interferes with custom user bindings


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/bin/sh/histedit.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/bin/sh/histedit.c
diff -u src/bin/sh/histedit.c:1.63 src/bin/sh/histedit.c:1.64
--- src/bin/sh/histedit.c:1.63	Thu Aug 18 14:10:05 2022
+++ src/bin/sh/histedit.c	Sun Aug 21 21:35:36 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: histedit.c,v 1.63 2022/08/18 14:10:05 nia Exp $	*/
+/*	$NetBSD: histedit.c,v 1.64 2022/08/21 21:35:36 nia Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)histedit.c	8.2 (Berkeley) 5/4/95";
 #else
-__RCSID("$NetBSD: histedit.c,v 1.63 2022/08/18 14:10:05 nia Exp $");
+__RCSID("$NetBSD: histedit.c,v 1.64 2022/08/21 21:35:36 nia Exp $");
 #endif
 #endif /* not lint */
 
@@ -176,11 +176,11 @@ bad:
 		}
 		if (el) {
 			INTOFF;
-			el_source(el, lookupvar("EDITRC"));
 			if (Vflag)
 				el_set(el, EL_EDITOR, "vi");
 			else if (Eflag)
 				el_set(el, EL_EDITOR, "emacs");
+			el_source(el, lookupvar("EDITRC"));
 			el_set(el, EL_BIND, "^I", 
 			    tabcomplete ? "rl-complete" : "ed-insert", NULL);
 			INTON;

Reply via email to