Browse files

Applied some of the debian patches.

  • Loading branch information...
1 parent d8725da commit b190a43d4ad89247d1c3d90c24a9f3048ac11fba @mbert committed Dec 10, 2011
View
2 Makefile.in
@@ -440,7 +440,7 @@ install.unix: $(ALL) doc/elvtags.man
install: install.$(OS)
install.unix: $(ALL) doc/elvtags.man
- rm -f doc/*.bak
+ rm -f doc/*.bak
[ -d $(BINDIR) ] || mkdir $(BINDIR)
cp $(ALL) $(BINDIR)
(cd $(BINDIR); chmod 0755 $(ALL))
View
2 configure
@@ -644,7 +644,7 @@ case "$SYS" in
TLIBS="-lcurses"
;;
- *linux*)
+ *linux* | *kfreebsd*)
if [ ! -f /usr/lib/libtermcap.a -a ! -f /lib/libtermcap.a ]
then
if [ -f /usr/lib/libncurses.a -o -f /usr/lib/ncurses.a ]
View
2 data/elvis.arf
@@ -10,6 +10,8 @@ then {
if os=="unix" && buflines >= 1
then {
try 1s/\V^#! *[^ ]*\/\([^ ]\+\).*/set! bufdisplay="syntax \1"/x
+ if bufdisplay=="syntax env"
+ then try 1s/\V^#! *[^ ]*\/[^ ]\+ \([^ ]\+\).*/set! bufdisplay="syntax \1"/x
if bufdisplay<<11=="syntax perl"
then set! bufdisplay="syntax perl"
if bufdisplay<<12=="syntax tclsh"
View
3 data/elvis.ini
@@ -132,3 +132,6 @@ then {
}
}
"
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" try to load the augz script which allows us to read/write gzipped files
+try load augz
View
1 data/elvis.rc
@@ -1,6 +1,7 @@
" Here are some typical settings that you might want to try. The simplest
" way to use this file is to :source this file, and then run ":mkexrc" to
" save the settings where they can be automatically loaded.
+set undolevels=12
set autoindent
try set spell
try set smartargs
View
4 data/elvis.syn
@@ -209,8 +209,8 @@ keyword $* $@ $# $? $- $$ $! & | ; [ ] < > ( )
keyword alias autoload bg break case cd continue do done echo elif else esac
keyword eval exec exit export false fc fg fi for getopts hash history
keyword if in integer jobs kill let newgrp nohup print pwd r read readonly
-keyword select set shift source stop suspend test then time times trap type
-keyword typeset ulimit umask unalias unset until wait whence while
+keyword return select set shift source stop suspend test then time times trap
+keyword type typeset ulimit umask unalias unset until wait whence while
function (
comment #
startword /?-*!.
View
55 debian/patches/APPLY
@@ -1,67 +1,12 @@
- fix some typos in the html manual:
-doc-typos-1
-
- add "return" to the syntax file as a keyword for shell scripts
- (suggested by Herbert Xu):
-syntax-sh-return
-
- fix sed command in Makefile that updates the manpages' version
- string ("ELVIS 2.2_0"):
-make-sed-ver
-
disable the instman.sh script - we manually install the manpages
in debian/rules:
disable-instman
debianize some links in the manual:
doc-man-location
- replace the augz script with the better gzip script from the
- current elvis development version and load it in elvis.ini
- (note that it still doesn't work in some situations):
-script-augz
-
- add "set undolevels=12" to the sample configuration file - very
- useful:
-cfg-undolevels
-
patch Makefile to remove doc/elvfmt.man:
make-rm-elvfmtman
adapt the printdoc script and the documentation of it
printdoc-debian
-
- correct the description of the # vi command:
-doc-vicmd-hash
-
- fix a bug in the ) vi command code that could cause a segmentation
- fault (patch from elvis-almost-2.2.1):
-segfault-fsentence
-
- add region and stdin to the features alias (in elvis.ali):
-alias-features
-
- backport another fix (:andale) and improvement (:customize) from
- almost-2.2.1:
-alias-andale-and-customize
-
- pressing escape in command mode should cause elvis to beep:
-esc-beep
-
- "The :dict alias (after ":load dict") doesn't handle single words
- correctly.":
-script-dict
-
- fix file/syntax detection for scripts that use env in their
- shebang line:
-arf-syntax-env
-
- fix the description of the '{' movement taking into account
- the tweaksection variable:
-doc-tweaksection
-
- fix hyphen-used-as-minus-sign:
-doc-man-hyphen
-
- fix build on new Debian kFreeBSD architecture:
-config-arch-kfreebsd
View
32 debian/patches/alias-andale-and-customize
@@ -1,32 +0,0 @@
-Index: elvis-2.2.0/data/elvis.ali
-===================================================================
---- elvis-2.2.0.orig/data/elvis.ali 2009-03-03 21:10:46.000000000 +0530
-+++ elvis-2.2.0/data/elvis.ali 2009-03-03 21:10:47.000000000 +0530
-@@ -126,7 +126,7 @@
- "Use Andale mono font for the main font, and Courier for italic (X11 only)
- if !isnumber(!(14)1)
- then error usage: andale [fontsize]
-- set font="luxi mono*!(14)1" italicfont="courier*!(14)1i"
-+ set font="andale mono*!(14)1" italicfont="courier*!(14)1i"
- }
-
- alias! fork {
-@@ -336,11 +336,18 @@
- let o = elvispath(f)
- if o == ""
- then error "!^" is not a known configuration file
-+ "Choose a base directory
- if os=="msdos" || os=="os2" || os == "win32"
- then let d=$HOME/"dotelvis"
- else let d=$HOME/".elvis"
-+ "If the directory doesn't exist yet, then create it
- if dirperm(d) == "new"
- then eval !mkdir "(d)"
-+ "If we need a subdirectory and it doesn't exist yet, then create it
-+ let n = dirname(d/f)
-+ if dirperm(n) == "new"
-+ then eval !mkdir "(n)"
-+ "If customized file exists, then load it; else start with the default version
- let n = d / f
- if exists(n)
- then e (n)
View
13 debian/patches/alias-features
@@ -1,13 +0,0 @@
-Index: elvis-2.2.0/data/elvis.ali
-===================================================================
---- elvis-2.2.0.orig/data/elvis.ali 2009-03-03 20:44:08.000000000 +0530
-+++ elvis-2.2.0/data/elvis.ali 2009-03-03 21:10:46.000000000 +0530
-@@ -312,7 +312,7 @@
- calc "Network protocols: ";(f ? f : "none")
-
- set f="" l="Other features: "
-- for i in alias array autocmd backtick browse cachedesc calc complete equaltilde fold g hlobject hlsearch image incsearch listchars litre lpr make mapdb misc mkexrc normal proto ram rcsid showtag smartargs spell split tags textobj v xft
-+ for i in alias array autocmd backtick browse cachedesc calc complete equaltilde fold g hlobject hlsearch image incsearch listchars litre lpr make mapdb misc mkexrc normal proto ram rcsid region showtag smartargs spell split stdin tags textobj v xft
- do {
- if feature(i)
- then {
View
13 debian/patches/arf-syntax-env
@@ -1,13 +0,0 @@
-Index: elvis-2.2.0/data/elvis.arf
-===================================================================
---- elvis-2.2.0.orig/data/elvis.arf 2009-03-03 20:44:07.000000000 +0530
-+++ elvis-2.2.0/data/elvis.arf 2009-03-03 21:10:48.000000000 +0530
-@@ -10,6 +10,8 @@
- if os=="unix" && buflines >= 1
- then {
- try 1s/\V^#! *[^ ]*\/\([^ ]\+\).*/set! bufdisplay="syntax \1"/x
-+ if bufdisplay=="syntax env"
-+ then try 1s/\V^#! *[^ ]*\/[^ ]\+ \([^ ]\+\).*/set! bufdisplay="syntax \1"/x
- if bufdisplay<<11=="syntax perl"
- then set! bufdisplay="syntax perl"
- if bufdisplay<<12=="syntax tclsh"
View
12 debian/patches/cfg-undolevels
@@ -1,12 +0,0 @@
-Index: elvis-2.2.0/data/elvis.rc
-===================================================================
---- elvis-2.2.0.orig/data/elvis.rc 2009-03-03 20:44:08.000000000 +0530
-+++ elvis-2.2.0/data/elvis.rc 2009-03-03 21:10:44.000000000 +0530
-@@ -1,6 +1,7 @@
- " Here are some typical settings that you might want to try. The simplest
- " way to use this file is to :source this file, and then run ":mkexrc" to
- " save the settings where they can be automatically loaded.
-+set undolevels=12
- set autoindent
- try set spell
- try set smartargs
View
13 debian/patches/config-arch-kfreebsd
@@ -1,13 +0,0 @@
-Index: elvis-2.2.0/configure
-===================================================================
---- elvis-2.2.0.orig/configure 2009-03-03 21:10:42.000000000 +0530
-+++ elvis-2.2.0/configure 2009-03-03 21:10:50.000000000 +0530
-@@ -644,7 +644,7 @@
- TLIBS="-lcurses"
- ;;
-
-- *linux*)
-+ *linux* | *kfreebsd*)
- if [ ! -f /usr/lib/libtermcap.a -a ! -f /lib/libtermcap.a ]
- then
- if [ -f /usr/lib/libncurses.a -o -f /usr/lib/ncurses.a ]
View
95 debian/patches/doc-man-hyphen
@@ -1,95 +0,0 @@
-Index: elvis-2.2.0/doc/ctags.man
-===================================================================
---- elvis-2.2.0.orig/doc/ctags.man 2009-03-03 20:44:07.000000000 +0530
-+++ elvis-2.2.0/doc/ctags.man 2009-03-03 21:10:50.000000000 +0530
-@@ -84,7 +84,7 @@
- .IP \fB-g\fR
- For static tags, generate entries that look like global tags.
- (I.e., never generate an extra "file:" attribute.)
--This implies -s and -h.
-+This implies \-s and \-h.
- .IP \fB-i\fR
- Include inline definitions.
- A tag will be generated for each function which is declared as being
-Index: elvis-2.2.0/doc/elvis.man
-===================================================================
---- elvis-2.2.0.orig/doc/elvis.man 2009-03-03 21:10:40.000000000 +0530
-+++ elvis-2.2.0/doc/elvis.man 2009-03-03 21:10:50.000000000 +0530
-@@ -150,7 +150,7 @@
- permanently paranoid, for the duration of this process.
- .IP \fB-SS\fR
- Sets security=restricted.
--This is more extreme security than "-S".
-+This is more extreme security than "\-S".
- The intent is to protect the system against reading by malicious users.
- .IP "\fB-f \fIsession\fR"
- Makes
-@@ -163,13 +163,13 @@
- .I logfile
- instead of going to stdout/stderr as usual.
- This is useful under Windows95, where stdout/stderr don't show anywhere.
--If you're having trouble configuring WinElvis, try running "WinElvis -VVV -o log"
-+If you're having trouble configuring WinElvis, try running "WinElvis \-VVV \-o log"
- and then you can find the trace and error messages in the file "log".
- .IP "\fB-G \fIgui\fR"
- Makes
- .B Elvis
- use the named \fIgui\fR user interface instead of the default.
--To see a list of supported user interfaces, give the command "elvis -?".
-+To see a list of supported user interfaces, give the command "elvis \-?".
- .IP "\fB-c \fIcommand\fR"
- After loading the first file, interpret \fIcommand\fR as an ex command line.
- Several ex command lines can be sent in one line, separated by "|".
-@@ -334,7 +334,7 @@
- temporarily sets security=safer while the
- command is executed, for security reasons.
- Second, the command is executed by the server's existing window, not the
--new one, so (for example) "elvis -client -c 20 foo" creates a new window for the file
-+new one, so (for example) "elvis \-client \-c 20 foo" creates a new window for the file
- "foo", and then moves the OLD WINDOW's cursor to line 20 of whatever file
- it was showing.
- .SS "X11 Mouse"
-@@ -500,7 +500,7 @@
- .IP TERM
- For the termcap interface, this is the name of the terminal's termcap/terminfo
- entry.
--Also, if its value is "kvt" or ends with "-r" or "-rv", then the background
-+Also, if its value is "kvt" or ends with "\-r" or "\-rv", then the background
- option will be "light" by default; else it will be "dark".
- .IP TERMCAP
- For the termcap interface, this can either store the name of a termcap file
-Index: elvis-2.2.0/doc/ref.man
-===================================================================
---- elvis-2.2.0.orig/doc/ref.man 2009-03-03 20:44:07.000000000 +0530
-+++ elvis-2.2.0/doc/ref.man 2009-03-03 21:10:50.000000000 +0530
-@@ -28,7 +28,7 @@
- The tag info consists of the three standard fields from each tag.
- The fields will be separated by tab characters, just like records from the
- traditional tags file format.
--Consequently, you can use "ref -t -a >oldtags" to convert a new-style tags file
-+Consequently, you can use "ref \-t \-a >oldtags" to convert a new-style tags file
- back to an old-style tags file.
- .IP \fB-v\fR
- Output verbose tag info, instead of the function header.
-@@ -160,10 +160,10 @@
- To find the global function headers, I used the command...
- .nf
-
-- ref -a kind:f file:dummy
-+ ref \-a kind:f file:dummy
- .fi
- .PP
--The "-a" causes
-+The "\-a" causes
- .B ref
- to output all headers, instead of just the first one that it finds.
- "kind:f" causes it to exclude any non-functions.
-@@ -184,7 +184,7 @@
- there, so for each "file.c" I used the command...
- .nf
-
-- ref -a kind:f file:=file.c
-+ ref \-a kind:f file:=file.c
- .fi
- .PP
- This is very similar to the earlier command.
View
21 debian/patches/doc-tweaksection
@@ -1,21 +0,0 @@
-Index: elvis-2.2.0/doc/elvisvi.html
-===================================================================
---- elvis-2.2.0.orig/doc/elvisvi.html 2009-03-03 21:10:45.000000000 +0530
-+++ elvis-2.2.0/doc/elvisvi.html 2009-03-03 21:10:49.000000000 +0530
-@@ -904,10 +904,12 @@
- <dt>[[
- <br>]]
- <dd><a name="obra"></a><a name="cbra"></a>
--These commands move backward or forward to the start of a section.
--The start of a section is defined to be '{' character in column 1 of a line;
--or a troff section command listed in the value of the
--<a href="elvisopt.html#sections">sections</a> option.
-+These commands move backward or forward to the start of a section. The
-+start of a section is defined to be a troff section command listed in
-+the value of the <a href="elvisopt.html#sections">sections</a> option,
-+or a '{' character that is preceded by unindented text unless the <a
-+href="elvisopt.html#tweaksection">tweaksection</a> option is turned
-+off, in which case the '{' character must appear in column 1.
-
- <p>Note: There are also <a href="#recbegin">[key</a> and
- <a href="#recend">]key</a>
View
88 debian/patches/doc-typos-1
@@ -1,88 +0,0 @@
-Index: elvis-2.2.0/doc/elvis.man
-===================================================================
---- elvis-2.2.0.orig/doc/elvis.man 2009-03-03 20:44:09.000000000 +0530
-+++ elvis-2.2.0/doc/elvis.man 2009-03-03 21:10:40.000000000 +0530
-@@ -454,7 +454,7 @@
- .IP "LC_ALL, LC_MESSAGES, and LANG"
- If LANG is defined, then
- .B Elvis
--will look for for its message translations in
-+will look for its message translations in
- .IR $LANG/elvis.msg ,
- and only use just plain
- .I elvis.msg
-Index: elvis-2.2.0/doc/elvisopt.html
-===================================================================
---- elvis-2.2.0.orig/doc/elvisopt.html 2009-03-03 20:44:09.000000000 +0530
-+++ elvis-2.2.0/doc/elvisopt.html 2009-03-03 21:10:40.000000000 +0530
-@@ -1601,7 +1601,7 @@
- <dd>The <em>scrollbar</em>, <em>toolbar</em>, and <em>statusbar</em> options
- indicate whether the scrollbar, toolbar, and statusbar should be visible,
- respectively.
--By default, all are are visible.
-+By default, all are visible.
-
- <dt><a name="scrollwheelspeed">scrollwheelspeed,sws <em>(Number, windows or x11)</em></a>
- <dd>The <em>scrollwheelspeed</em> option controls the speed and direction of
-Index: elvis-2.2.0/doc/elvisos.html
-===================================================================
---- elvis-2.2.0.orig/doc/elvisos.html 2009-03-03 20:44:09.000000000 +0530
-+++ elvis-2.2.0/doc/elvisos.html 2009-03-03 21:10:40.000000000 +0530
-@@ -45,7 +45,7 @@
- $1 in the command line to be replaced by the name of Elvis' temporary file
- that contains the print data.
-
--<p>This lead to the the second problem:
-+<p>This lead to the second problem:
- PRINT doesn't make a copy of the file, and Elvis deletes the temporary file
- as soon as PRINT exits.
- Since PRINT exits before the file has been printed completely, this means
-@@ -606,7 +606,7 @@
- If uname reports a brand of Unix that <code>configure</code> doesn't recognize,
- then <code>configure</code> will inspect the files on your system for evidence
- that you're running SCO Unix/ODT or SCO Xenix.
--If that test fails, you'll need to give the OS name on the the command line
-+If that test fails, you'll need to give the OS name on the command line
- when invoking <code>configure</code> (e.g., "<code>configure sco</code>"
- or "<code>configure xenix</code>").
-
-Index: elvis-2.2.0/doc/elvisses.html
-===================================================================
---- elvis-2.2.0.orig/doc/elvisses.html 2009-03-03 20:44:09.000000000 +0530
-+++ elvis-2.2.0/doc/elvisses.html 2009-03-03 21:10:40.000000000 +0530
-@@ -184,7 +184,7 @@
- as readonly.
- <p>
- Also, if the <a href="elvisopt.html#home">home</a> option is unset,
--then this tries to set it to the directory containing elvis.
-+then this tries to set it to the directory containing Elvis.
- Generally, some OS-specific code will set <code>home</code> appropriately
- before we get here, so this code isn't normally needed.
-
-@@ -194,7 +194,7 @@
- then source! (elvispath("elvis.spe"))
- </pre>
- This initializes the <a href="elvistip.html#spell">spell checker</a>,
--if that feature is supported in this version of elvis.
-+if that feature is supported in this version of Elvis.
-
- <pre>
- " IF ALIASES ARE SUPPORTED, THEN LOAD THE DEFAULT ALIASES
-@@ -202,7 +202,7 @@
- then source! (elvispath("elvis.ali"))
- </pre>
- This loads some standard aliases, if the alias feature is supported by
--this version of elvis, and elvis isn't being used as a "restricted" editor.
-+this version of Elvis, and Elvis isn't being used as a "restricted" editor.
-
- <pre>
- " SYSTEM TWEAKS GO HERE
-@@ -526,7 +526,7 @@
- <a href="elvistip.html#EXAMPLES">described in the Tips chapter</a>.
- If your copy of Elvis is configured to support aliases (and all versions are,
- except for MS-DOS) then this file will be automatically loaded via the
--<a href="elvis.ini">elvis.ini</a> script, each time you run Elvis.
-+<a href="#elvis.ini">elvis.ini</a> script, each time you run Elvis.
-
- <dt><a name="elvis.msg">elvis.msg</a>
- <dd>This file stores a translation table, which allows you to customize
View
16 debian/patches/doc-vicmd-hash
@@ -1,16 +0,0 @@
-Index: elvis-2.2.0/doc/elvisvi.html
-===================================================================
---- elvis-2.2.0.orig/doc/elvisvi.html 2009-03-03 20:44:08.000000000 +0530
-+++ elvis-2.2.0/doc/elvisvi.html 2009-03-03 21:10:45.000000000 +0530
-@@ -1316,10 +1316,8 @@
- If no <var>count</var> is given, then 1 is assumed.
- If the <var>key</var> is "-" then <var>count</var> is subtracted from the
- number.
--If the <var>key</var> is "+" or "#" then <var>count</var> is added to the
--number.
- If the <var>key</var> is "=" then the word is changed to <var>count</var>.
--Any other <var>key</var> causes the command to fail.
-+Any other <var>key</var> will add <var>count</var> to the number.
-
- <dt><var>count</var> &amp;
- <dd><a name="amp"></a>
View
23 debian/patches/esc-beep
@@ -1,23 +0,0 @@
-Index: elvis-2.2.0/vicmd.c
-===================================================================
---- elvis-2.2.0.orig/vicmd.c 2009-03-03 20:44:07.000000000 +0530
-+++ elvis-2.2.0/vicmd.c 2009-03-03 21:10:47.000000000 +0530
-@@ -4,7 +4,7 @@
-
- #include "elvis.h"
- #ifdef FEATURE_RCSID
--char id_vicmd[] = "$Id: vicmd.c,v 2.83 2003/10/19 23:13:33 steve Exp $";
-+char id_vicmd[] = "$Id: vicmd.c,v 2.84 2003/12/28 20:33:29 steve Exp $";
- #endif
-
-
-@@ -953,6 +953,9 @@
- win->selattop = ElvFalse;
- win->seltype = 'r';
- break;
-+
-+ case ELVCTRL('['):
-+ return RESULT_ERROR;
- }
- return RESULT_COMPLETE;
- #endif /* FEATURE_V */
View
13 debian/patches/make-sed-ver
@@ -1,13 +0,0 @@
-Index: elvis-2.2.0/Makefile.in
-===================================================================
---- elvis-2.2.0.orig/Makefile.in 2009-03-03 20:44:09.000000000 +0530
-+++ elvis-2.2.0/Makefile.in 2009-03-03 21:10:42.000000000 +0530
-@@ -437,7 +437,7 @@
- find $(DATADIR) -type f -exec chmod 0644 {} \;
- find $(DOCDIR) -type f -exec chmod 0644 {} \;
- (cd doc; for i in *.html; do sed 's/<title>Elvis[^ ]*/<title>Elvis-$(VERSION)/;s/ELVIS[^ <]*</ELVIS-$(VERSION)</' $$i >$(DOCDIR)/$$i; done)
-- (cd doc; for i in *.man; do sed 's/Elvis 2\.[0-9x][0-9a-z-]*/Elvis $(VERSION)/' $$i >$(DOCDIR)/$$i; done)
-+ (cd doc; for i in *.man; do sed 's/Elvis 2\.[0-9x][0-9a-z_-]*/Elvis $(VERSION)/' $$i >$(DOCDIR)/$$i; done)
- -(cd $(DATADIR); $(BINDIR)/elvtags -gitv stubs/*.c || ctags stubs/*.c)
- chmod 0755 $(DATADIR)/*/. $(DATADIR) $(DOCDIR)
- sh instman.sh -p$(PREFIX) $(ALL)
View
32 debian/patches/script-augz
@@ -1,32 +0,0 @@
-Index: elvis-2.2.0/data/elvis.ini
-===================================================================
---- elvis-2.2.0.orig/data/elvis.ini 2009-03-03 20:44:08.000000000 +0530
-+++ elvis-2.2.0/data/elvis.ini 2009-03-03 21:10:43.000000000 +0530
-@@ -132,3 +132,6 @@
- }
- }
- "
-+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-+" try to load the augz script which allows us to read/write gzipped files
-+try load augz
-Index: elvis-2.2.0/data/scripts/augz.ex
-===================================================================
---- elvis-2.2.0.orig/data/scripts/augz.ex 2009-03-03 20:44:08.000000000 +0530
-+++ elvis-2.2.0/data/scripts/augz.ex 2009-03-03 21:10:43.000000000 +0530
-@@ -4,8 +4,14 @@
- au!
- au BufReadPre,FileReadPre *.gz set reol=binary
- au BufReadPost *.gz %!gunzip
-- au FileReadPost *.gz '[,']!gunzip
-- au BufReadPost,FileReadPost *.gz set reol=text nomodified bufdisplay=normal
-+ au FileReadPost *.gz '[,']!gunzip 2>/dev/null
-+ au BufReadPost,FileReadPost *.gz {
-+ set reol=text nomodified
-+ file! (basename(filename))
-+ source! (elvispath("elvis.arf"))
-+ file! (filename).gz
-+ set edited
-+ }
- au BufReadPost *.gz eval doau BufReadPost (basename(filename))
- au BufWritePost,FileWritePost *.gz eval mv (afile) (basename(afile))
- au BufWritePost,FileWritePost *.gz eval !gzip (basename(afile))
View
12 debian/patches/script-dict
@@ -1,12 +0,0 @@
-Index: elvis-2.2.0/data/scripts/dict.ex
-===================================================================
---- elvis-2.2.0.orig/data/scripts/dict.ex 2009-03-03 20:44:07.000000000 +0530
-+++ elvis-2.2.0/data/scripts/dict.ex 2009-03-03 21:10:48.000000000 +0530
-@@ -12,6 +12,6 @@
- alias dict {
- " Show the definition of a term in a new window
- local w="!*"
-- let w =~ s/ /\\ /g
-+ let w =~ s/ /\\ /ge
- eval sp dict:(w)
- }
View
29 debian/patches/segfault-fsentence
@@ -1,29 +0,0 @@
-Index: elvis-2.2.0/move.c
-===================================================================
---- elvis-2.2.0.orig/move.c 2009-03-03 20:44:08.000000000 +0530
-+++ elvis-2.2.0/move.c 2009-03-03 21:10:46.000000000 +0530
-@@ -4,7 +4,7 @@
-
- #include "elvis.h"
- #ifdef FEATURE_RCSID
--char id_move[] = "$Id: move.c,v 2.66 2003/10/17 17:41:23 steve Exp $";
-+char id_move[] = "$Id: move.c,v 2.67 2003/12/28 20:31:11 steve Exp $";
- #endif
-
- #ifdef FEATURE_G
-@@ -1620,6 +1620,7 @@
- long para;
- long offset;
- long count;
-+ MARKBUF tmp;
-
- DEFAULT(1);
-
-@@ -1651,6 +1652,7 @@
- else
- {
- para = 0;
-+ scanseek(&cp, marktmp(tmp, markbuffer(win->state->cursor), 0L));
- }
- marksetoffset(win->state->cursor, offset);
- if (para == offset)
View
15 debian/patches/syntax-sh-return
@@ -1,15 +0,0 @@
-Index: elvis-2.2.0/data/elvis.syn
-===================================================================
---- elvis-2.2.0.orig/data/elvis.syn 2009-03-03 20:44:09.000000000 +0530
-+++ elvis-2.2.0/data/elvis.syn 2009-03-03 21:10:41.000000000 +0530
-@@ -209,8 +209,8 @@
- keyword alias autoload bg break case cd continue do done echo elif else esac
- keyword eval exec exit export false fc fg fi for getopts hash history
- keyword if in integer jobs kill let newgrp nohup print pwd r read readonly
--keyword select set shift source stop suspend test then time times trap type
--keyword typeset ulimit umask unalias unset until wait whence while
-+keyword return select set shift source stop suspend test then time times trap
-+keyword type typeset ulimit umask unalias unset until wait whence while
- function (
- comment #
- startword /?-*!.
View
2 doc/ctags.man
@@ -84,7 +84,7 @@ and regular expressions for anything else.
.IP \fB-g\fR
For static tags, generate entries that look like global tags.
(I.e., never generate an extra "file:" attribute.)
-This implies -s and -h.
+This implies \-s and \-h.
.IP \fB-i\fR
Include inline definitions.
A tag will be generated for each function which is declared as being
View
10 doc/elvis.man
@@ -159,13 +159,13 @@ Redirects messages and trace information out to
instead of going to stdout/stderr as usual.
This is useful under Microsoft Windows, where stdout/stderr don't show anywhere.
If you're having trouble configuring WinElvis,
-try running "WinElvis -VVV -o log"
+try running "WinElvis \-VVV \-o log"
and then you can find the trace and error messages in the file "log".
.IP "\fB-G \fIgui\fR"
Makes
.B Elvis
use the named \fIgui\fR user interface instead of the default.
-To see a list of supported user interfaces, give the command "elvis -G?".
+To see a list of supported user interfaces, give the command "elvis \-G?".
.IP "\fB-c \fIcommand\fR"
After loading the first file, interpret \fIcommand\fR as an ex command line.
Several ex command lines can be sent in one line, separated by "|".
@@ -333,7 +333,7 @@ First, the server
temporarily sets security=safer while the
command is executed, for security reasons.
Second, the command is executed by the server's existing window, not the
-new one, so (for example) "elvis -client -c 20 foo" creates a new window for the file
+new one, so (for example) "elvis \-client \-c 20 foo" creates a new window for the file
"foo", and then moves the OLD WINDOW's cursor to line 20 of whatever file
it was showing.
.SS "X11 Mouse"
@@ -453,7 +453,7 @@ when looking for a header file such as <stdio.h>.
.IP "LC_ALL, LC_MESSAGES, and LANG"
If LANG is defined, then
.B Elvis
-will look for for its message translations in
+will look for its message translations in
.IR $LANG/elvis.msg ,
and only use just plain
.I elvis.msg
@@ -499,7 +499,7 @@ containing a file named
.IP TERM
For the termcap interface, this is the name of the terminal's termcap/terminfo
entry.
-Also, if its value is "kvt" or ends with "-r" or "-rv", then the background
+Also, if its value is "kvt" or ends with "\-r" or "\-rv", then the background
option will be "light" by default; else it will be "dark".
.IP TERMCAP
For the termcap interface, this can either store the name of a termcap file
View
2 doc/elvisopt.html
@@ -1634,7 +1634,7 @@
<dd>The <em>scrollbar</em>, <em>toolbar</em>, and <em>statusbar</em> options
indicate whether the scrollbar, toolbar, and statusbar should be visible,
respectively.
-By default, all are are visible.
+By default, all are visible.
<dt><a name="scrollwheelspeed">scrollwheelspeed,sws <em>(Number, windows or x11)</em></a>
<dd>The <em>scrollwheelspeed</em> option controls the speed and direction of
View
4 doc/elvisos.html
@@ -45,7 +45,7 @@
$1 in the command line to be replaced by the name of Elvis' temporary file
that contains the print data.
-<p>This lead to the the second problem:
+<p>This lead to the second problem:
PRINT doesn't make a copy of the file, and Elvis deletes the temporary file
as soon as PRINT exits.
Since PRINT exits before the file has been printed completely, this means
@@ -606,7 +606,7 @@
If uname reports a brand of Unix that <code>configure</code> doesn't recognize,
then <code>configure</code> will inspect the files on your system for evidence
that you're running SCO Unix/ODT or SCO Xenix.
-If that test fails, you'll need to give the OS name on the the command line
+If that test fails, you'll need to give the OS name on the command line
when invoking <code>configure</code> (e.g., "<code>configure sco</code>"
or "<code>configure xenix</code>").
View
8 doc/elvisses.html
@@ -184,7 +184,7 @@
as readonly.
<p>
Also, if the <a href="elvisopt.html#home">home</a> option is unset,
-then this tries to set it to the directory containing elvis.
+then this tries to set it to the directory containing Elvis.
Generally, some OS-specific code will set <code>home</code> appropriately
before we get here, so this code isn't normally needed.
@@ -194,15 +194,15 @@
then source! (elvispath("elvis.spe"))
</pre>
This initializes the <a href="elvistip.html#spell">spell checker</a>,
-if that feature is supported in this version of elvis.
+if that feature is supported in this version of Elvis.
<pre>
" IF ALIASES ARE SUPPORTED, THEN LOAD THE DEFAULT ALIASES
if feature("alias") &amp;&amp; security!="restricted"
then source! (elvispath("elvis.ali"))
</pre>
This loads some standard aliases, if the alias feature is supported by
-this version of elvis, and elvis isn't being used as a "restricted" editor.
+this version of Elvis, and Elvis isn't being used as a "restricted" editor.
<pre>
" SYSTEM TWEAKS GO HERE
@@ -526,7 +526,7 @@
<a href="elvistip.html#EXAMPLES">described in the Tips chapter</a>.
If your copy of Elvis is configured to support aliases (and all versions are,
except for MS-DOS) then this file will be automatically loaded via the
-<a href="elvis.ini">elvis.ini</a> script, each time you run Elvis.
+<a href="#elvis.ini">elvis.ini</a> script, each time you run Elvis.
<dt><a name="elvis.msg">elvis.msg</a>
<dd>This file stores a translation table, which allows you to customize
View
14 doc/elvisvi.html
@@ -904,10 +904,12 @@
<dt>[[
<br>]]
<dd><a name="obra"></a><a name="cbra"></a>
-These commands move backward or forward to the start of a section.
-The start of a section is defined to be '{' character in column 1 of a line;
-or a troff section command listed in the value of the
-<a href="elvisopt.html#sections">sections</a> option.
+These commands move backward or forward to the start of a section. The
+start of a section is defined to be a troff section command listed in
+the value of the <a href="elvisopt.html#sections">sections</a> option,
+or a '{' character that is preceded by unindented text unless the <a
+href="elvisopt.html#tweaksection">tweaksection</a> option is turned
+off, in which case the '{' character must appear in column 1.
<p>Note: There are also <a href="#recbegin">[key</a> and
<a href="#recend">]key</a>
@@ -1316,10 +1318,8 @@
If no <var>count</var> is given, then 1 is assumed.
If the <var>key</var> is "-" then <var>count</var> is subtracted from the
number.
-If the <var>key</var> is "+" or "#" then <var>count</var> is added to the
-number.
If the <var>key</var> is "=" then the word is changed to <var>count</var>.
-Any other <var>key</var> causes the command to fail.
+Any other <var>key</var> will add <var>count</var> to the number.
<dt><var>count</var> &amp;
<dd><a name="amp"></a>
View
8 doc/ref.man
@@ -28,7 +28,7 @@ Output tag info, instead of the function header.
The tag info consists of the three standard fields from each tag.
The fields will be separated by tab characters, just like records from the
traditional tags file format.
-Consequently, you can use "ref -t -a >oldtags" to convert a new-style tags file
+Consequently, you can use "ref \-t \-a >oldtags" to convert a new-style tags file
back to an old-style tags file.
.IP \fB-v\fR
Output verbose tag info, instead of the function header.
@@ -160,10 +160,10 @@ I needed to generate extern declarations for all the functions.
To find the global function headers, I used the command...
.nf
- ref -a kind:f file:dummy
+ ref \-a kind:f file:dummy
.fi
.PP
-The "-a" causes
+The "\-a" causes
.B ref
to output all headers, instead of just the first one that it finds.
"kind:f" causes it to exclude any non-functions.
@@ -184,7 +184,7 @@ For each source file, I also needed to find the static functions defined
there, so for each "file.c" I used the command...
.nf
- ref -a kind:f file:=file.c
+ ref \-a kind:f file:=file.c
.fi
.PP
This is very similar to the earlier command.

0 comments on commit b190a43

Please sign in to comment.