r174 - in trunk/vim/debian: . patches
Stefano Zacchiroli
zack@costa.debian.org
Sun, 17 Apr 2005 22:39:40 +0000
Author: zack
Date: 2005-04-17 22:39:38 +0000 (Sun, 17 Apr 2005)
New Revision: 174
Added:
trunk/vim/debian/patches/303__exrc.c.diff
Removed:
trunk/vim/debian/helpztags.1
Modified:
trunk/vim/debian/changelog
Log:
- added patch for 279378
- removed helpztags.1, it doesn't need to be on svn: it is created at each build
Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog 2005-04-16 22:46:20 UTC (rev 173)
+++ trunk/vim/debian/changelog 2005-04-17 22:39:38 UTC (rev 174)
@@ -9,6 +9,8 @@
* Stefano Zacchiroli <zack@debian.org>:
+ Updated patch 118_ocaml.vim.diff (new upstream).
+ + Added patch 303__exrc.c.diff, which makes vim look for _exrc when
+ 'exrc' is set. (closes: #279378)
* Matthijs Mohlmann <matthijs@cacholong.nl>:
+ Fixes menu entry with icon (wrong syntax used in menu file), thanks to
Deleted: trunk/vim/debian/helpztags.1
===================================================================
--- trunk/vim/debian/helpztags.1 2005-04-16 22:46:20 UTC (rev 173)
+++ trunk/vim/debian/helpztags.1 2005-04-17 22:39:38 UTC (rev 174)
@@ -1,156 +0,0 @@
-.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.13
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sh \" Subsection heading
-.br
-.if t .Sp
-.ne 5
-.PP
-\fB\\$1\fR
-.PP
-..
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings. \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote. | will give a
-.\" real vertical bar. \*(C+ will give a nicer C++. Capital omega is used to
-.\" do unbreakable dashes and therefore won't be available. \*(C` and \*(C'
-.\" expand to `' in nroff, nothing in troff, for use with C<>.
-.tr \(*W-|\(bv\*(Tr
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-. ds -- \(*W-
-. ds PI pi
-. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch
-. ds L" ""
-. ds R" ""
-. ds C`
-. ds C'
-'br\}
-.el\{\
-. ds -- \|\(em\|
-. ds PI \(*p
-. ds L" ``
-. ds R" ''
-'br\}
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
-.\" entries marked with X<> in POD. Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.if \nF \{\
-. de IX
-. tm Index:\\$1\t\\n%\t"\\$2"
-..
-. nr % 0
-. rr F
-.\}
-.\"
-.\" For nroff, turn off justification. Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.hy 0
-.if n .na
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear. Run. Save yourself. No user-serviceable parts.
-. \" fudge factors for nroff and troff
-.if n \{\
-. ds #H 0
-. ds #V .8m
-. ds #F .3m
-. ds #[ \f1
-. ds #] \fP
-.\}
-.if t \{\
-. ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-. ds #V .6m
-. ds #F 0
-. ds #[ \&
-. ds #] \&
-.\}
-. \" simple accents for nroff and troff
-.if n \{\
-. ds ' \&
-. ds ` \&
-. ds ^ \&
-. ds , \&
-. ds ~ ~
-. ds /
-.\}
-.if t \{\
-. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-. \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-. \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-. \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-. ds : e
-. ds 8 ss
-. ds o a
-. ds d- d\h'-1'\(ga
-. ds D- D\h'-1'\(hy
-. ds th \o'bp'
-. ds Th \o'LP'
-. ds ae ae
-. ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "HELPZTAGS 1"
-.TH HELPZTAGS 1 "September 2003" "vim 6.2" "User Commands"
-.SH "NAME"
-helpztags \- generate the help tags file for directory
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-helpztags \fI\s-1DIRS\s0\fR...
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-\&\fIhelpztags\fR scans given directories for \fI*.txt\fR and \fI*.txt.gz\fR files.
-Each file is scanned for tags used in \fIvim\fR help files. For each directory
-proper \fItags\fR file is generated.
-.PP
-There should be at least one directory given. In other case program exits
-with error.
-.SH "AUTHORS"
-.IX Header "AUTHORS"
-Written by Jakub Turski and Artur R. Czechowski based on idea
-contained in \f(CW\*(C`vim\*(C'\fR sources for its \f(CW\*(C`:helptags command\*(C'\fR.
-.SH "REPORTING BUGS"
-.IX Header "REPORTING BUGS"
-Please use a Debian \f(CW\*(C`reportbug\*(C'\fR command or procedure described at
-\&\f(CW\*(C`http://bugs.debian.org/\*(C'\fR.
-.SH "SEE ALSO"
-.IX Header "SEE ALSO"
-Read \f(CW\*(C`:help helptags\*(C'\fR in \fIvim\fR for detailed information about helptags.
Added: trunk/vim/debian/patches/303__exrc.c.diff
===================================================================
--- trunk/vim/debian/patches/303__exrc.c.diff 2005-04-16 22:46:20 UTC (rev 173)
+++ trunk/vim/debian/patches/303__exrc.c.diff 2005-04-17 22:39:38 UTC (rev 174)
@@ -0,0 +1,12 @@
+diff -urN vim63/src/main.c vim63.new/src/main.c
+--- vim63/src/main.c 2005-04-18 00:26:22.292076624 +0200
++++ vim63.new/src/main.c 2005-04-18 00:26:00.650366664 +0200
+@@ -1445,7 +1445,7 @@
+ (char_u *)EXRC_FILE, FALSE) != FPC_SAME
+ #endif
+ )
+- (void)do_source((char_u *)EXRC_FILE, FALSE, FALSE);
++ (void)do_source((char_u *)EXRC_FILE, TRUE, FALSE);
+ }
+ }
+ if (secure == 2)