From 539903c55b23a5551fb792234f3aab203c10d8ff Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 19 Jun 2008 14:32:25 +0000 Subject: [PATCH] * Added /etc/sysless with settings to make backspace work correctly in less. * Added /etc/vim/vimrc. Besides fixing key mappings it also disables compatibility mode and adjusts some settings to make using vi a more pleasant experience. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26028 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/HaikuImage | 5 ++++- data/etc/vim/vimrc | 29 +++++++++++++++++++++++++++++ src/data/etc/Jamfile | 14 ++++++++++++++ src/data/etc/sysless.in | 6 ++++++ 4 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 data/etc/vim/vimrc create mode 100644 src/data/etc/sysless.in diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage index 1be8d7e8ee..a315ec6b69 100644 --- a/build/jam/HaikuImage +++ b/build/jam/HaikuImage @@ -288,9 +288,12 @@ AddFilesToHaikuImage beos etc artwork : $(svgFiles) ; local etcFiles = inputrc profile teapot.data ; etcFiles = $(etcFiles:G=etc) ; SEARCH on $(etcFiles) = [ FDirName $(HAIKU_TOP) data etc ] ; -etcFiles += termcap ; +etcFiles += termcap sysless sysless.in ; AddFilesToHaikuImage beos etc : $(etcFiles) ; +SEARCH on vimrc = [ FDirName $(HAIKU_TOP) data etc vim ] ; +AddFilesToHaikuImage beos etc vim : vimrc ; + local fortuneFiles = Art Computers Education Food Fortunes Goedel Haiku Humorists Kids Law "Linux cookies" Love Magic Medicine Miscellaneous News "One Liners" "OS Fortunes" Pets Platitudes Riddles "Songs & Poems" diff --git a/data/etc/vim/vimrc b/data/etc/vim/vimrc new file mode 100644 index 0000000000..f3aba02bfa --- /dev/null +++ b/data/etc/vim/vimrc @@ -0,0 +1,29 @@ +" highlight matching brackets +set showmatch + +" status line: show line/column and current mode +set ruler +set showmode + +" required to be able to use keypad keys and map missed escape sequences +set esckeys + +" be user-friendly instead of compatible +set nocompatible + +" backspace shall remove anything in insert mode +set backspace=indent,eol,start + +" keys in insert mode +map! OA +map! OB +map! OC +map! OD +map! OH +map! OF +map! [5~ +map! [6~ +map!  + +" keys in command mode +map  X diff --git a/src/data/etc/Jamfile b/src/data/etc/Jamfile index 057032897c..3da379687f 100644 --- a/src/data/etc/Jamfile +++ b/src/data/etc/Jamfile @@ -1,4 +1,18 @@ SubDir HAIKU_TOP src data etc ; +# generate /etc/sysless +actions LessKey +{ + lesskey -o $(1) $(2) +} + +local syslessIn = sysless.in ; +SEARCH on $(syslessIn) = $(SUBDIR) ; +local sysless = sysless ; +MakeLocateArch $(sysless) ; +Depends $(sysless) : $(syslessIn) ; +LessKey $(sysless) : $(syslessIn) ; + + SubInclude HAIKU_TOP src data etc keymaps ; SubInclude HAIKU_TOP src data etc timezones ; diff --git a/src/data/etc/sysless.in b/src/data/etc/sysless.in new file mode 100644 index 0000000000..9727ebd42e --- /dev/null +++ b/src/data/etc/sysless.in @@ -0,0 +1,6 @@ +#command +\177 back-screen +^H back-screen +#line-edit +\177 backspace +^H backspace