Load $XDG_CONFIG_HOME/ctags/*.ctags and respect XDG base directory sp…

…ecification (close universal-ctags#89)
itchyny · Dec 19, 2019 · 9a0c776 · 9a0c776
1 parent e216bb4
commit 9a0c776
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/main/options.c b/main/options.c
@@ -576,6 +576,7 @@ static const char *const StageDescription [] = {
 	[OptionLoadingStageDosCnf] = "DOS .cnf file",
 	[OptionLoadingStageEtc] = "file under /etc (e.g. ctags.conf)",
 	[OptionLoadingStageLocalEtc] = "file under /usr/local/etc (e.g. ctags.conf)",
+	[OptionLoadingStageXdg] = "file(s) XDG configuration directory",
 	[OptionLoadingStageHomeRecursive] = "file(s) under HOME",
 	[OptionLoadingStageCurrentRecursive] = "file(s) under the current directory",
 	[OptionLoadingStagePreload] = "optlib preload files",
@@ -3600,6 +3601,13 @@ static struct preloadPathElt preload_path_list [] = {
 		.stage = OptionLoadingStageCustom,
 	},
 #endif
+	{
+		.path = "ctags",
+		.isDirectory = true,
+		.makePath = prependEnvvar,
+		.extra = "XDG_CONFIG_HOME",
+		.stage = OptionLoadingStageXdg,
+	},
 	{
 		.path = ".ctags.d",
 		.isDirectory = true,

diff --git a/main/options_p.h b/main/options_p.h
@@ -76,6 +76,7 @@ typedef enum eOptionLoadingStage {
 	OptionLoadingStageDosCnf,
 	OptionLoadingStageEtc,
 	OptionLoadingStageLocalEtc,
+	OptionLoadingStageXdg,
 	OptionLoadingStageHomeRecursive,
 	OptionLoadingStageCurrentRecursive,
 	OptionLoadingStagePreload,