[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 9485620a5d96ba653cd85a76927b8e1730bc80aa

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 9485620a5d96ba653cd85a76927b8e1730bc80aa

[git]

[-- Attachment #1: Type: text/plain, Size: 5883 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".

The branch, master has been updated
       via  9485620a5d96ba653cd85a76927b8e1730bc80aa (commit)
       via  e240a306bd7e4fb4d21a3c7c0a77554c3be2e206 (commit)
       via  995af6a688ab89c6e21668b046c3940f26b83c1f (commit)
      from  da275347088b5cb0609bf8ae8efbcce361a03f2e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9485620a5d96ba653cd85a76927b8e1730bc80aa
Merge: 995af6a e240a30
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun Jul 21 22:16:31 2013 +0200

    Merge remote-tracking branch 'stevee/vim'

commit e240a306bd7e4fb4d21a3c7c0a77554c3be2e206
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Sun Jul 21 20:24:22 2013 +0200

    vim: Update configuration file.
    
    Enable the feature to put the cursor on it's last position
    if a file gets opened again.
    
    Fixes #10364.

commit 995af6a688ab89c6e21668b046c3940f26b83c1f
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Sun Jul 21 16:48:35 2013 +0200

    libxkbfile: Fix wrong description.
    
    Fixes #10365.

-----------------------------------------------------------------------

Summary of changes:
 libxkbfile/libxkbfile.nm | 10 +---------
 vim/vim.nm               | 20 ++++++++++++--------
 vim/vimrc                | 38 +++++++++++++++++++++++++++++++++++++-
 3 files changed, 50 insertions(+), 18 deletions(-)

Difference in files:
diff --git a/libxkbfile/libxkbfile.nm b/libxkbfile/libxkbfile.nm
index 3f88e83..61c7119 100644
--- a/libxkbfile/libxkbfile.nm
+++ b/libxkbfile/libxkbfile.nm
@@ -14,15 +14,7 @@ license    = MIT
 summary    = X.Org X11 libxkbfile runtime library.
 
 description
-	The flex program generates scanners. Scanners are programs which can
-	recognize lexical patterns in text. Flex takes pairs of regular
-	expressions and C code as input and generates a C source file as
-	output.  The output file is compiled and linked with a library to
-	produce an executable.  The executable searches through its input for
-	occurrences of the regular expressions. When a match is found, it
-	executes the corresponding C code. Flex was designed to work with
-	both Yacc and Bison, and is used by many programs as part of their
-	build process.
+	X.Org X11 libxkbfile runtime library.
 end
 
 source_dl  = http://ftp.x.org/pub/individual/lib/
diff --git a/vim/vim.nm b/vim/vim.nm
index 2863e94..03540f5 100644
--- a/vim/vim.nm
+++ b/vim/vim.nm
@@ -5,7 +5,7 @@
 
 name       = vim
 version    = 7.3
-release    = 3
+release    = 4
 
 groups     = Applications/Editors
 url        = http://www.vim.org
@@ -13,8 +13,8 @@ license    = PublicDomain/Charityware
 summary    = Very feature- and powerful editor.
 
 description
-	Vim is a highly configurable text editor built to enable efficient \
-	text editing. It is an improved version of the vi editor \
+	Vim is a highly configurable text editor built to enable efficient
+	text editing. It is an improved version of the vi editor
 	distributed with most UNIX systems.
 end
 
@@ -44,24 +44,28 @@ build
 		--with-compiled-by="<bugzilla(a)ipfire.org>"
 
 	configure_cmds
-		echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h
+		echo '#define SYS_VIMRC_FILE "%{sysconfdir}/vimrc"' >> src/feature.h
 	end
 
 	install_cmds
-		ln -sfv vim %{BUILDROOT}/usr/bin/vi
+		ln -sfv vim %{BUILDROOT}%{bindir}/vi
 
 		# Install configuration
-		mkdir -pv %{BUILDROOT}/etc
-		cp -vf %{DIR_SOURCE}/vimrc %{BUILDROOT}/etc/vimrc
+		mkdir -pv %{BUILDROOT}%{sysconfdir}
+		cp -vf %{DIR_SOURCE}/vimrc %{BUILDROOT}%{sysconfdir}/vimrc
 
 		# Remove script for c-shell
-		rm -rf %{BUILDROOT}/usr/share/vim/vim73/tools/vim132
+		rm -rf %{BUILDROOT}%{datadir}/vim/vim73/tools/vim132
 	end
 end
 
 packages
 	package %{name}
 		groups += Base
+
+		configfiles
+			%{sysconfidir}/vimrc
+		end
 	end
 
 	package %{name}-debuginfo
diff --git a/vim/vimrc b/vim/vimrc
index f8b6666..18c1481 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -1,6 +1,42 @@
+if v:lang =~ "utf8$" || v:lang =~ "UTF-8$"
+   set fileencodings=ucs-bom,utf-8,latin1
+endif
+
 set nocompatible
-set backspace=2
+set bs=indent,eol,start		" allow backspacing over everything in insert mode
+set viminfo='20,\"50		" read/write a .viminfo file, don't store more
+				" than 50 lines of registers
+set history=50			" keep 50 lines of command line history
+set ruler			" show the cursor position all the time
+
+" Only do this part when compiled with support for autocommands
+if has("autocmd")
+	augroup ipfire
+	autocmd!
+
+	" In text files, always limit the width of text to 78 characters
+	" autocmd BufRead *.txt set tw=78
+
+	" When editing a file, always jump to the last cursor position
+	autocmd BufReadPost *
+	\ if line("'\"") > 0 && line ("'\"") <= line("$") |
+	\   exe "normal! g'\"" |
+	\ endif
+
+	" don't write swapfile on most commonly used directories for NFS mounts or USB sticks
+	autocmd BufNewFile,BufReadPre /media/*,/mnt/* set directory=~/tmp,/var/tmp,/tmp
+
+	" start with spec file template
+	autocmd BufNewFile *.spec 0r /usr/share/vim/vimfiles/template.spec
+
+	augroup END
+endif
+
 syntax on
 if (&term == "iterm") || (&term == "putty")
   set background=dark
 endif
+
+" Don't wake up system with blinking cursor:
+" http://www.linuxpowertop.org/known.php
+let &guicursor = &guicursor . ",a:blinkon0"


hooks/post-receive
--
IPFire 3.x development tree