From owner-svn-src-head@freebsd.org  Sun Jan 15 13:40:16 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 232C0CB1C4C;
 Sun, 15 Jan 2017 13:40:16 +0000 (UTC)
 (envelope-from jilles@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 E467818D5;
 Sun, 15 Jan 2017 13:40:15 +0000 (UTC)
 (envelope-from jilles@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0FDeFWR073446;
 Sun, 15 Jan 2017 13:40:15 GMT (envelope-from jilles@FreeBSD.org)
Received: (from jilles@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0FDeFdG073445;
 Sun, 15 Jan 2017 13:40:15 GMT (envelope-from jilles@FreeBSD.org)
Message-Id: <201701151340.v0FDeFdG073445@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jilles set sender to
 jilles@FreeBSD.org using -f
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Sun, 15 Jan 2017 13:40:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r312230 - head/share/skel
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.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 15 Jan 2017 13:40:16 -0000

Author: jilles
Date: Sun Jan 15 13:40:14 2017
New Revision: 312230
URL: https://svnweb.freebsd.org/changeset/base/312230

Log:
  skel: Do not set -o emacs in .shrc.
  
  sh has defaulted to 'set -o emacs' since FreeBSD 9.0. Therefore, do not set
  this again in .shrc, since that only serves to prevent invocations like
  'sh -o vi' and 'sh +o emacs' to have the intended effect.
  
  PR:		215958
  Submitted by:	Andras Farkas
  MFC after:	1 week

Modified:
  head/share/skel/dot.shrc

Modified: head/share/skel/dot.shrc
==============================================================================
--- head/share/skel/dot.shrc	Sun Jan 15 12:58:14 2017	(r312229)
+++ head/share/skel/dot.shrc	Sun Jan 15 13:40:14 2017	(r312230)
@@ -13,10 +13,6 @@
 #
 # umask	022
 
-# Enable the builtin emacs(1) command line editor in sh(1),
-# e.g. C-a -> beginning-of-line.
-set -o emacs
-
 # Uncomment this and comment the above to enable the builtin vi(1) command
 # line editor in sh(1), e.g. ESC to go into visual mode.
 # set -o vi