diff options
author | 2006-01-22 07:12:39 +1000 | |
---|---|---|
committer | 2006-01-22 07:12:39 +1000 | |
commit | 74fb5bd5e59dc650819fff525995e00fc97c7858 (patch) | |
tree | 6c55af0fb792d5759572fecdfa5a24969bd36033 | |
parent | f2d6ae32206e75850164b512b862ee61ec0ea1cb (diff) |
Minor tweaks of init files
darcs-hash:20060121211239-ac50b-02fc95b123698b972063c2cd1cd8e85d548e1f8b.gz
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | init/fish.in | 11 | ||||
-rw-r--r-- | init/fish_interactive.fish.in | 6 |
3 files changed, 14 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index cd839273..a358da1f 100644 --- a/configure.ac +++ b/configure.ac @@ -170,7 +170,7 @@ AC_TRY_LINK([#if HAVE_LIBINTL_H] if test "$have__nl_msg_cat_cntr" = yes; then AC_MSG_RESULT(yes) AC_DEFINE([HAVE__NL_MSG_CAT_CNTR], [1], - [Define to 1 if the _nl_msg_cat_cntr synbol is exported.]) + [Define to 1 if the _nl_msg_cat_cntr symbol is exported.]) else AC_MSG_RESULT(no) fi diff --git a/init/fish.in b/init/fish.in index 0b2302ea..389b70dc 100644 --- a/init/fish.in +++ b/init/fish.in @@ -32,10 +32,9 @@ for i in $path_list end - - # -# Set some value for LANG if nothing was set before +# Set some value for LANG if nothing was set before, and this is a +# login shell. Also check for i18n information in /etc/sysconfig/i18n # if status --is-login @@ -72,6 +71,12 @@ for i in DISPLAY end end +# +# Alias for gettext (or a fallback if gettext isn't installed) This +# needs to be defined here and not in fish_function.fish, since it is +# used by other init files. +# + if which gettext >/dev/null ^/dev/null function _ -d "Alias for the gettext command" gettext fish $argv diff --git a/init/fish_interactive.fish.in b/init/fish_interactive.fish.in index af066cca..435fa5a1 100644 --- a/init/fish_interactive.fish.in +++ b/init/fish_interactive.fish.in @@ -40,7 +40,7 @@ end # @SYSCONFDIR@/fish_inputrc. # -for i in ~/.fish_inputrc @SYSCONFDIR@/fish_inputrc ~/etc/fish_inputrc /etc/fish_inputrc ~/.inputrc /etc/inputrc +for i in ~/.fish_inputrc @SYSCONFDIR@/fish_inputrc ~/.inputrc /etc/inputrc if test -f $i set -xg INPUTRC $i break @@ -119,5 +119,9 @@ if command ls --color=auto --help 1>/dev/null 2>/dev/null end +# +# Remove temporary functions +# + functions -e set_default_color functions -e set_exported_default |