1
0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-04-20 14:01:25 +02:00

Merge branch 'master' into vimperator-2.1

Conflicts:
	vimperator/NEWS
	vimperator/locale/en-US/starting.txt
This commit is contained in:
Doug Kearns
2009-02-26 22:11:12 +11:00
58 changed files with 911 additions and 733 deletions
+8 -10
View File
@@ -8,17 +8,15 @@ section:Initialization[initialization,startup]
At startup, Vimperator completes the following tasks in order.
1. Vimperator can perform user initialization commands. When
one of the following is successfully located, it is executed, and no
further locations are tried.
one of the following is successfully located, it is executed, and no
further locations are tried.
a. |$VIMPERATOR_INIT| _$VIMPERATOR_INIT_ -- May contain a single ex
command (e.g.,
"[c]:source {file}[c]").
b. [a]\~/_vimperatorrc[a] -- Windows only. If this file exists, its
contents are executed and
_$MY_VIMPERATORRC_ set to its path.
c. [a]\~/.vimperatorrc[a] -- If this file exists, its contents are
executed.
a. |$VIMPERATOR_INIT|
_$VIMPERATOR_INIT_ -- May contain a single Ex command (e.g.,
"[c]:source {file}[c]").
b. [a]\~/_vimperatorrc[a] -- Windows only. If this file exists, its contents
are executed and _$MY_VIMPERATORRC_ set to its path.
c. [a]\~/.vimperatorrc[a] -- If this file exists, its contents are executed.
2. If 'exrc' is set, then any RC file in the current directory is also sourced.