From owner-svn-src-head@FreeBSD.ORG  Mon Apr 14 14:40:12 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id CC21A2A7;
 Mon, 14 Apr 2014 14:40:12 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B83831E4E;
 Mon, 14 Apr 2014 14:40:12 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3EEeCwt076275;
 Mon, 14 Apr 2014 14:40:12 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3EEeCsj076274;
 Mon, 14 Apr 2014 14:40:12 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201404141440.s3EEeCsj076274@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Mon, 14 Apr 2014 14:40:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r264459 - head/usr.bin/units
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 14 Apr 2014 14:40:12 -0000

Author: eadler
Date: Mon Apr 14 14:40:12 2014
New Revision: 264459
URL: http://svnweb.freebsd.org/changeset/base/264459

Log:
  units(1): parse config file after setting defaults
  
  Parse the config file after setting the defaults to permit the user to change
  things (e.g., editing mode)

Modified:
  head/usr.bin/units/units.c

Modified: head/usr.bin/units/units.c
==============================================================================
--- head/usr.bin/units/units.c	Mon Apr 14 14:04:59 2014	(r264458)
+++ head/usr.bin/units/units.c	Mon Apr 14 14:40:12 2014	(r264459)
@@ -724,11 +724,11 @@ main(int argc, char **argv)
 
 	inhistory = history_init();
 	el = el_init(argv[0], stdin, stdout, stderr);
-	el_source(el, NULL);
 	el_set(el, EL_PROMPT, &prompt);
 	el_set(el, EL_EDITOR, "emacs");
 	el_set(el, EL_SIGNAL, 1);
 	el_set(el, EL_HIST, history, inhistory);
+	el_source(el, NULL);
 	history(inhistory, &ev, H_SETSIZE, 800);
 	if (inhistory == 0)
 		err(1, "Could not initalize history");