etc/profile.d/ldap.sh

diff --git a/etc/profile.d/ldap.sh b/etc/profile.d/ldap.sh
index a823b58960a1e74cdc6b9a91f2f184bf48bbf9d4..e3a5da36c72265aa8308e17c5f7a333cca2b6428 100644 (file)
--- a/etc/profile.d/ldap.sh
+++ b/etc/profile.d/ldap.sh
@@ -57,7 +57,7 @@ slapcat_csv() {
   while [ $# -gt 0 ]; do
     case "$1" in
       -head)  aawk+=" $1"; human_opt="" ;;
-      -human|-H) human=yes; human_opt=""; aawk+=" -head" ;;
+      -human) human=yes; human_opt=""; aawk+=" -head" ;;
       -nohead) human_opt="--noheader"; aawk=${aawk// -head/} ;;
       *) aawk+=" $1" ;;
     esac
@@ -73,7 +73,7 @@ ldapsearch_csv() {
   while [ $# -gt 0 ]; do
     case "$1" in
       -head)  aawk+=" $1"; human_opt="" ;;
-      -human|-H) human=yes; human_opt=""; aawk+=" -head" ;;
+      -human) human=yes; human_opt=""; aawk+=" -head" ;;
       -nohead) human_opt="--noheader"; aawk=${aawk// -head/} ;;
       *) aldap+=" $1" ;;
     esac

diff --git a/etc/vim/source/functions.vim b/etc/vim/source/functions.vim
index 9c80fffc451512ee46470b49adc0e1b4ffa06505..a7ec468502153f3a53fd7efc1857e8df1ca7ffc1 100644 (file)
--- a/etc/vim/source/functions.vim
+++ b/etc/vim/source/functions.vim
@@ -448,22 +448,3 @@ function! GetVisual() range
        return escaped_selection
 endfunction
 
-function! Files()
-  set nomore
-  let buf_count = bufnr("$")
-  let paths = ""
-  for i in range(1, buf_count)
-    if getbufvar(l:i, '&buflisted') > 0
-      let path = bufname(i)
-      " let filename = fnamemodify(path, ":t")
-      " let folder = fnamemodify(path, ":h")
-      if paths != ""
-        let paths = paths . " "
-      end
-      let paths = paths . path
-    endif
-  endfor
-  set more
-  return paths
-endfunction
-

diff --git a/etc/vimrc b/etc/vimrc
index 5b085cfaa3de7a8795fe96026cec0ba53b13feb5..0545cf5fdd68cb032fea0e36f3867fbef4b812ec 100644 (file)
--- a/etc/vimrc
+++ b/etc/vimrc
@@ -5,7 +5,7 @@
 "
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 let $VIMHOME = fnamemodify(resolve(fnamemodify(expand('<sfile>'),':p')),':h').'/vim'
-if !filereadable($VIMHOME) && filereadable(expand('~/.vim'))
+if empty(glob($VIMHOME)) && filereadable(expand('~/.vim'))
   let $VIMHOME =  resolve(expand('~/.vim'))
 endif