refactor: { => _comp}_rl_enabled

akinomyoga · akinomyoga · commit e062d3dbe61a · 2022-05-12T14:32:55.000+09:00
diff --git a/bash_completion b/bash_completion
@@ -140,11 +140,13 @@ have()
 # This function checks whether a given readline variable
 # is `on'.
 #
-_rl_enabled()
+_comp_readline_variable_on()
 {
     [[ $(bind -v) == *$1+([[:space:]])on* ]]
 }
 
+_comp_deprecate_func _rl_enabled _comp_readline_variable_on
+
 # This function shell-quotes the argument
 quote()
 {
@@ -2071,8 +2073,8 @@ _cd()
         return
     fi
 
-    local -r mark_dirs=$(_rl_enabled mark-directories && echo y)
-    local -r mark_symdirs=$(_rl_enabled mark-symlinked-directories && echo y)
+    local -r mark_dirs=$(_comp_readline_variable_on mark-directories && echo y)
+    local -r mark_symdirs=$(_comp_readline_variable_on mark-symlinked-directories && echo y)
 
     # we have a CDPATH, so loop on its contents
     for i in ${CDPATH//:/$'\n'}; do

Original file line number	Diff line number	Diff line change
`@@ -140,11 +140,13 @@ have()`
`140`	`140`	`# This function checks whether a given readline variable`
`141`	`141`	# is `on'.
`142`	`142`	`#`
`143`		`-_rl_enabled()`
	`143`	`+_comp_readline_variable_on()`
`144`	`144`	`{`
`145`	`145`	`[[ $(bind -v) == $1+([[:space:]])on ]]`
`146`	`146`	`}`
`147`	`147`
	`148`	`+_comp_deprecate_func _rl_enabled _comp_readline_variable_on`
	`149`	`+`
`148`	`150`	`# This function shell-quotes the argument`
`149`	`151`	`quote()`
`150`	`152`	`{`
`@@ -2071,8 +2073,8 @@ _cd()`
`2071`	`2073`	`return`
`2072`	`2074`	`fi`
`2073`	`2075`
`2074`		`- local -r mark_dirs=$(_rl_enabled mark-directories && echo y)`
`2075`		`- local -r mark_symdirs=$(_rl_enabled mark-symlinked-directories && echo y)`
	`2076`	`+ local -r mark_dirs=$(_comp_readline_variable_on mark-directories && echo y)`
	`2077`	`+ local -r mark_symdirs=$(_comp_readline_variable_on mark-symlinked-directories && echo y)`
`2076`	`2078`
`2077`	`2079`	`# we have a CDPATH, so loop on its contents`
`2078`	`2080`	`for i in ${CDPATH//:/$'\n'}; do`