From 58dac9b5c04db3d664e0f4a4a6bbd7d5dc635cd3 Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Sun, 24 Jun 2018 21:19:10 +0000
Subject: emacs: document more *nox versions, and switch to emacs26 by default

---
 mk/defaults/mk.conf | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'mk')

diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf
index b666aa2803f..62b5f9d168f 100644
--- a/mk/defaults/mk.conf
+++ b/mk/defaults/mk.conf
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.295 2018/06/18 10:59:55 schmonz Exp $
+# $NetBSD: mk.conf,v 1.296 2018/06/24 21:19:10 wiz Exp $
 #
 
 # This file provides default values for variables that may be overridden
@@ -921,12 +921,12 @@ ELK_GUI?=	none
 # Possible: none, or some combination of xaw and/or motif
 # Default: none
 
-EMACS_TYPE?=	emacs25
+EMACS_TYPE?=	emacs26
 # Used by emacs/modules.mk to determine which emacs version should be installed
 # and emacs lisp packages should be built for.
-# Possible: emacs25, emacs25nox, emacs21, emacs21nox, emacs20,
+# Possible: emacs26, emacs26nox, emacs25, emacs25nox, emacs21, emacs21nox, emacs20,
 #	xemacs214, xemacs215
-# Default: emacs25
+# Default: emacs26
 
 EXIM_GROUP?=	mail
 # Used in the exim package to specify the server group.
-- 
cgit v1.2.3