svn commit: r329697 - head/stand/lua

Kyle Evans kevans at FreeBSD.org
Wed Feb 21 04:14:33 UTC 2018


Author: kevans
Date: Wed Feb 21 04:14:32 2018
New Revision: 329697
URL: https://svnweb.freebsd.org/changeset/base/329697

Log:
  lualoader: Drop name requirement for menu separators

Modified:
  head/stand/lua/drawer.lua
  head/stand/lua/menu.lua

Modified: head/stand/lua/drawer.lua
==============================================================================
--- head/stand/lua/drawer.lua	Wed Feb 21 03:37:46 2018	(r329696)
+++ head/stand/lua/drawer.lua	Wed Feb 21 04:14:32 2018	(r329697)
@@ -175,6 +175,12 @@ drawer.menu_name_handlers = {
 	-- This is designed so that everything, including menu separators, may
 	-- have their names derived differently. The default action for entry
 	-- types not specified here is to call and use entry.name().
+	[core.MENU_SEPARATOR] = function(drawing_menu, entry)
+		if entry.name ~= nil then
+			return entry.name()
+		end
+		return ""
+	end,
 	[core.MENU_CAROUSEL_ENTRY] = function(drawing_menu, entry)
 		local carid = entry.carousel_id
 		local caridx = config.getCarouselIndex(carid)

Modified: head/stand/lua/menu.lua
==============================================================================
--- head/stand/lua/menu.lua	Wed Feb 21 03:37:46 2018	(r329696)
+++ head/stand/lua/menu.lua	Wed Feb 21 04:14:32 2018	(r329697)
@@ -113,9 +113,6 @@ menu.boot_options = {
 
 		{
 			entry_type = core.MENU_SEPARATOR,
-			name = function()
-				return ""
-			end
 		},
 
 		{
@@ -269,9 +266,6 @@ menu.welcome = {
 
 		{
 			entry_type = core.MENU_SEPARATOR,
-			name = function()
-				return ""
-			end
 		},
 
 		{


More information about the svn-src-head mailing list