Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Please unblock package ldapvi The bug that is fixed by changing one word that is put into a comment line of the file to be handed to vim makes it croak because the encoding setting isn't allowed (anymore) in a modeline of vim and requires the user to press enter every time they use ldapvi with vim as editor. The debdiff is kept to a minimum: #v+ diff -u ldapvi-1.7/debian/changelog ldapvi-1.7/debian/changelog --- ldapvi-1.7/debian/changelog +++ ldapvi-1.7/debian/changelog @@ -1,3 +1,10 @@ +ldapvi (1.7-9) unstable; urgency=low + + * Use fileencoding instead of encoding in vim modeline which makes recent + versions of vim give an error (closes: #688129, #663121) + + -- Gerfried Fuchs <rho...@debian.org> Mon, 21 Jan 2013 16:28:10 +0100 + ldapvi (1.7-8) unstable; urgency=low * Really change libreadline5-dev to libreadline-dev this time diff -u ldapvi-1.7/debian/patches/series ldapvi-1.7/debian/patches/series --- ldapvi-1.7/debian/patches/series +++ ldapvi-1.7/debian/patches/series @@ -5,0 +6 @@ +06_fix-vim-modeline only in patch2: unchanged: --- ldapvi-1.7.orig/debian/patches/06_fix-vim-modeline +++ ldapvi-1.7/debian/patches/06_fix-vim-modeline @@ -0,0 +1,18 @@ +Description: use fileencoding in vim modeline instead of encoding + The encoding setting is not allowed in modeline in recent vim versions, + so switch to fileencoding instead. +Origin: http://lists.askja.de/pipermail/ldapvi/2011-January/000088.html +Bug-Debian: http://bugs.debian.org/688129, http://bugs.debian.org/663121 +Author: Devin J. Pohly <djpo...@gmail.com> + +--- a/ldapvi.c ++++ b/ldapvi.c +@@ -1414,7 +1414,7 @@ + int nlines = 0; + + if (print_binary_mode == PRINT_UTF8 && !cmdline->ldif) { +- fputs("# -*- coding: utf-8 -*- vim:encoding=utf-8:\n", s); ++ fputs("# -*- coding: utf-8 -*- vim:fileencoding=utf-8:\n", s); + nlines++; + } + if (cmdline->ldif) { #v- unblock ldapvi/1.7-9 Thanks for considering, Rhonda -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
