.clang-format

@@ -1,32 +0,0 @@
-# clang-format is fairly limited, and these rules are approximate:
-#  - array initializers can get terribly mangled with clang-format 12.0,
-#  - sometimes it still aligns with space characters,
-#  - struct name NL { NL ... NL } NL name; is unachievable.
-BasedOnStyle: GNU
-ColumnLimit: 80
-IndentWidth: 4
-TabWidth: 4
-UseTab: ForContinuationAndIndentation
-BreakBeforeBraces: Allman
-SpaceAfterCStyleCast: true
-AlignAfterOpenBracket: DontAlign
-AlignOperands: DontAlign
-AlignConsecutiveMacros: Consecutive
-AllowAllArgumentsOnNextLine: false
-AllowAllParametersOfDeclarationOnNextLine: false
-IndentGotoLabels: false
-
-# IncludeCategories has some potential, but it may also break the build.
-# Note that the documentation says the value should be "Never".
-SortIncludes: false
-
-# This is a compromise, it generally works out aesthetically better.
-BinPackArguments: false
-
-# Unfortunately, this can't be told to align to column 40 or so.
-SpacesBeforeTrailingComments: 2
-
-# liberty-specific macro body wrappers.
-MacroBlockBegin: "BLOCK_START"
-MacroBlockEnd: "BLOCK_END"
-ForEachMacros: ["LIST_FOR_EACH"]

.gitignore

@@ -7,5 +7,3 @@
 /hex.files
 /hex.creator*
 /hex.includes
-/hex.cflags
-/hex.cxxflags

CMakeLists.txt

@@ -24,17 +24,14 @@ option (USE_SYSTEM_TERMO
 if (USE_SYSTEM_TERMO)
 	if (NOT Termo_FOUND)
 		message (FATAL_ERROR "System termo library not found")
-	endif ()
+	endif (NOT Termo_FOUND)
 else ()
-	# We don't want the library to install, but EXCLUDE_FROM_ALL ignores tests
 	add_subdirectory (termo EXCLUDE_FROM_ALL)
-	file (WRITE ${PROJECT_BINARY_DIR}/CTestCustom.cmake
-		"execute_process (COMMAND ${CMAKE_COMMAND} --build termo)")
-
-	# We don't have many good choices; this is a relatively clean approach
-	# (other possibilities: setting a variable in the parent scope, using
-	# a cache variable, writing a special config file with build paths in it
-	# and including it here, or setting a custom property on the targets)
+	# We don't have many good choices when we don't want to install it and want
+	# to support older versions of CMake; this is a relatively clean approach
+	# (other possibilities: setting a variable in the parent scope, using a
+	# cache variable, writing a special config file with build paths in it and
+	# including it here, or setting a custom property on the targets).
 	get_directory_property (Termo_INCLUDE_DIRS
 		DIRECTORY termo INCLUDE_DIRECTORIES)
 	set (Termo_LIBRARIES termo-static)

hex.c

@@ -81,7 +81,7 @@ enum
 static void
 update_curses_terminal_size (void)
 {
-#if defined HAVE_RESIZETERM && defined TIOCGWINSZ
+#if defined (HAVE_RESIZETERM) && defined (TIOCGWINSZ)
 	struct winsize size;
 	if (!ioctl (STDOUT_FILENO, TIOCGWINSZ, (char *) &size))
 	{
@@ -1581,10 +1581,6 @@ g_default_bindings[] =
 
 	{ "Home",       ACTION_ROW_START,          {}},
 	{ "End",        ACTION_ROW_END,            {}},
-	{ "C-a",        ACTION_ROW_START,          {}},
-	{ "C-e",        ACTION_ROW_END,            {}},
-	{ "_",          ACTION_ROW_START,          {}},
-	{ "$",          ACTION_ROW_END,            {}},
 	{ "M-<",        ACTION_GOTO_TOP,           {}},
 	{ "M->",        ACTION_GOTO_BOTTOM,        {}},
 	{ "g",          ACTION_GOTO_TOP,           {}},