From 23dcd84dda3f9ec4def614987bfd4346562114a4 Mon Sep 17 00:00:00 2001 From: Nicolas Boisselier Date: Sat, 2 Dec 2017 03:59:54 +0000 Subject: [PATCH] etc/profile.d/ldap.sh --- etc/profile.d/ldap.sh | 4 ++-- etc/vim/source/functions.vim | 19 ------------------- etc/vimrc | 2 +- 3 files changed, 3 insertions(+), 22 deletions(-) diff --git a/etc/profile.d/ldap.sh b/etc/profile.d/ldap.sh index a823b589..e3a5da36 100644 --- 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 9c80fffc..a7ec4685 100644 --- 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 5b085cfa..0545cf5f 100644 --- a/etc/vimrc +++ b/etc/vimrc @@ -5,7 +5,7 @@ " """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" let $VIMHOME = fnamemodify(resolve(fnamemodify(expand(''),':p')),':h').'/vim' -if !filereadable($VIMHOME) && filereadable(expand('~/.vim')) +if empty(glob($VIMHOME)) && filereadable(expand('~/.vim')) let $VIMHOME = resolve(expand('~/.vim')) endif -- 2.47.3