Skip to content

Commit 0133188

Browse files
committed
Runtime file updates.
1 parent e214f6a commit 0133188

4 files changed

Lines changed: 48 additions & 24 deletions

File tree

runtime/doc/digraph.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*digraph.txt* For Vim version 7.4. Last change: 2011 Jan 15
1+
*digraph.txt* For Vim version 7.4. Last change: 2013 Dec 12
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -147,7 +147,7 @@ a standard meaning:
147147
Two 2 Hook
148148
Nine 9 Horn
149149

150-
Equals = Cyrillic
150+
Equals = Cyrillic (= used as second char)
151151
Asterisk * Greek
152152
Percent sign % Greek/Cyrillic special
153153
Plus + smalls: Arabic, capitals: Hebrew

runtime/doc/filetype.txt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*filetype.txt* For Vim version 7.4. Last change: 2013 May 25
1+
*filetype.txt* For Vim version 7.4. Last change: 2013 Dec 15
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -447,23 +447,25 @@ g:changelog_new_date_format
447447
%% insert a single '%' character
448448
%d insert the date from above
449449
%u insert the user from above
450+
%p insert result of b:changelog_entry_prefix
450451
%c where to position cursor when done
451-
The default is "%d %u\n\n\t* %c\n\n", which produces
452+
The default is "%d %u\n\n\t* %p%c\n\n", which produces
452453
something like (| is where cursor will be, unless at
453454
the start of the line where it denotes the beginning
454455
of the line) >
455456
|2003-01-14 Full Name <user@host>
456457
|
457-
| * |
458+
| * prefix|
458459
<
459460
g:changelog_new_entry_format
460461
The format used when creating a new entry.
461462
The following table describes special tokens in the
462463
string:
464+
%p insert result of b:changelog_entry_prefix
463465
%c where to position cursor when done
464466
The default is "\t*%c", which produces something
465467
similar to >
466-
| * |
468+
| * prefix|
467469
<
468470
g:changelog_date_entry_search
469471
The search pattern to use when searching for a

runtime/doc/todo.txt

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*todo.txt* For Vim version 7.4. Last change: 2013 Dec 11
1+
*todo.txt* For Vim version 7.4. Last change: 2013 Dec 15
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -34,6 +34,10 @@ not be repeated below, unless there is extra information.
3434
*known-bugs*
3535
-------------------- Known bugs and current work -----------------------
3636

37+
Article for Vim website. (Pritesh Ugrankar, 2013 Dec 13)
38+
39+
Patch for Perl 5.18. (2013 Dec 13, Ken Takata)
40+
3741
Regexp problems:
3842
- NFA regexp doesn't count tab matches correctly. (Urtica Dioica / gaultheria
3943
Shallon, 2013 Nov 18)
@@ -44,10 +48,14 @@ Regexp problems:
4448
Remark from Dominique, Aug 27
4549
- Issue 164: freeze on regexp search.
4650
- NFA problem with non-greedy match and branches. (Ingo Karkat, 2013 Nov 29)
51+
- Ignorecase not handled properly for multi-byte characters. (Axel Bender,
52+
2013 Dec 11)
4753

4854
Problem that a previous silent ":throw" causes a following try/catch not to
4955
work. (ZyX, 2013 Sep 28)
5056

57+
Patch for problems with Borland compiler. (Ken Takata, 2013 Dec 14)
58+
5159
Problem using ":try" inside ":execute". (ZyX, 2013 Sep 15)
5260

5361
Update for Clojure ftplugin. (Sung Pae). Await discussion about formatting in
@@ -67,6 +75,9 @@ Await response from maintainer.
6775

6876
Include systemverilog file? Two votes yes.
6977

78+
Patch to make "J" set '[ and '] marks. (Christian Brabandt, 2013 Dec 11)
79+
Any compatibility problems?
80+
7081
Patch to add :S modifier for excaping the current file name.
7182
(ZyX, 2013 Nov 30) Update Dec 5.
7283

@@ -78,6 +89,8 @@ Syntax highlighting slow (hangs) in SASS file. (Niek Bosch, 2013 Aug 21)
7889

7990
Adding "~" to 'cdpath' doesn't work for completion? (Davido, 2013 Aug 19)
8091

92+
Add digraph for Rouble: =P. What's the Unicode?
93+
8194
Issue 174: Detect Mason files.
8295

8396
Patch to make has() check for Vim version and patch at the same time.
@@ -92,6 +105,10 @@ Series of patches for NL vs NUL handling. (ZyX, 2013 Nov 3, Nov 9)
92105

93106
Patch to add v:completed_item. (Shougo Matsu, 2013 Nov 29).
94107

108+
Patch to make test 100 work on MS-Windows. (Taro Muraoka, 2013 Dec 12)
109+
110+
Patch to define macros for hardcoded values. (Elias Diem, 2013 Dec 14)
111+
95112
Perl: support for Activestate perl 5.18: Issue 170.
96113

97114
Several syntax file match "^\s*" which may get underlined if that's in the
@@ -108,6 +125,8 @@ Updated spec ftplugin. (Matěj Cepl, 2013 Oct 16)
108125

109126
Patch to right-align signs. (James Kolb (email james), 2013 Sep 23)
110127

128+
Patch to handle integer overflow. (Aaron Burrow, 2013 Dec 12)
129+
111130
With "$" in 'cpoptions' the popup menu isn't fully drawn. (Matti Niemenmaa,
112131
2013 Sep 5)
113132

@@ -140,6 +159,12 @@ Discussion about canonicalization of Hebrew. (Ron Aaron, 2011 April 10)
140159

141160
Checking runtime scripts: Thilo Six, 2012 Jun 6.
142161

162+
When evaluating expression in backticks, autoload doesn't work.
163+
(Andy Wokula, 2013 Dec 14)
164+
165+
Using <nr>ifoobar<esc> can slow down Vim. Patch by Christian Brabandt, 2013
166+
Dec 13.
167+
143168
Fold can't be opened after ":move". (Ein Brown)
144169
Patch from Christian Brabandt doesn't fix it completely.
145170

@@ -679,7 +704,7 @@ Assume the system converts between the actual encoding of the filesystem to
679704
the system encoding (usually utf-8).
680705

681706
Patch to add GUI colors to the terminal, when it supports it. (ZyX, 2013 Jan
682-
26)
707+
26, update 2013 Dec 14)
683708

684709
Problem producing tags file when hebrew.frx is present. It has a BOM.
685710
Results in E670. (Tony Mechelynck, 2010 May 2)

runtime/ftplugin/changelog.vim

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
" Vim filetype plugin file
22
" Language: generic Changelog file
33
" Maintainer: Nikolai Weibull <now@bitwi.se>
4-
" Latest Revision: 2012-08-23
4+
" Latest Revision: 2013-12-15
55
" Variables:
66
" g:changelog_timeformat (deprecated: use g:changelog_dateformat instead) -
77
" description: the timeformat used in ChangeLog entries.
@@ -122,12 +122,12 @@ if &filetype == 'changelog'
122122

123123
" Format used for new date entries.
124124
if !exists('g:changelog_new_date_format')
125-
let g:changelog_new_date_format = "%d %u\n\n\t* %c\n\n"
125+
let g:changelog_new_date_format = "%d %u\n\n\t* %p%c\n\n"
126126
endif
127127

128128
" Format used for new entries to current date entry.
129129
if !exists('g:changelog_new_entry_format')
130-
let g:changelog_new_entry_format = "\t* %c"
130+
let g:changelog_new_entry_format = "\t* %p%c"
131131
endif
132132

133133
" Regular expression used to find a given date entry.
@@ -143,9 +143,9 @@ if &filetype == 'changelog'
143143

144144
" Substitutes specific items in new date-entry formats and search strings.
145145
" Can be done with substitute of course, but unclean, and need \@! then.
146-
function! s:substitute_items(str, date, user)
146+
function! s:substitute_items(str, date, user, prefix)
147147
let str = a:str
148-
let middles = {'%': '%', 'd': a:date, 'u': a:user, 'c': '{cursor}'}
148+
let middles = {'%': '%', 'd': a:date, 'u': a:user, 'p': a:prefix, 'c': '{cursor}'}
149149
let i = stridx(str, '%')
150150
while i != -1
151151
let inc = 0
@@ -171,15 +171,15 @@ if &filetype == 'changelog'
171171
endfunction
172172

173173
" Internal function to create a new entry in the ChangeLog.
174-
function! s:new_changelog_entry()
174+
function! s:new_changelog_entry(prefix)
175175
" Deal with 'paste' option.
176176
let save_paste = &paste
177177
let &paste = 1
178178
call cursor(1, 1)
179179
" Look for an entry for today by our user.
180180
let date = strftime(g:changelog_dateformat)
181181
let search = s:substitute_items(g:changelog_date_entry_search, date,
182-
\ s:username())
182+
\ s:username(), a:prefix)
183183
if search(search) > 0
184184
" Ok, now we look for the end of the date entry, and add an entry.
185185
call cursor(nextnonblank(line('.') + 1), 1)
@@ -188,7 +188,7 @@ if &filetype == 'changelog'
188188
else
189189
let p = line('.')
190190
endif
191-
let ls = split(s:substitute_items(g:changelog_new_entry_format, '', ''),
191+
let ls = split(s:substitute_items(g:changelog_new_entry_format, '', '', a:prefix),
192192
\ '\n')
193193
call append(p, ls)
194194
call cursor(p + 1, 1)
@@ -198,15 +198,15 @@ if &filetype == 'changelog'
198198

199199
" No entry today, so create a date-user header and insert an entry.
200200
let todays_entry = s:substitute_items(g:changelog_new_date_format,
201-
\ date, s:username())
201+
\ date, s:username(), a:prefix)
202202
" Make sure we have a cursor positioning.
203203
if stridx(todays_entry, '{cursor}') == -1
204204
let todays_entry = todays_entry . '{cursor}'
205205
endif
206206

207207
" Now do the work.
208208
call append(0, split(todays_entry, '\n'))
209-
209+
210210
" Remove empty lines at end of file.
211211
if remove_empty
212212
$-/^\s*$/-1,$delete
@@ -223,8 +223,8 @@ if &filetype == 'changelog'
223223
endfunction
224224

225225
if exists(":NewChangelogEntry") != 2
226-
noremap <buffer> <silent> <Leader>o <Esc>:call <SID>new_changelog_entry()<CR>
227-
command! -nargs=0 NewChangelogEntry call s:new_changelog_entry()
226+
noremap <buffer> <silent> <Leader>o <Esc>:call <SID>new_changelog_entry('')<CR>
227+
command! -nargs=0 NewChangelogEntry call s:new_changelog_entry('')
228228
endif
229229

230230
let b:undo_ftplugin = "setl com< fo< et< ai<"
@@ -277,10 +277,7 @@ else
277277
if exists('b:changelog_entry_prefix')
278278
let prefix = call(b:changelog_entry_prefix, [])
279279
else
280-
let prefix = substitute(strpart(expand('%:p'), strlen(path)), '^/\+', "", "") . ':'
281-
endif
282-
if !empty(prefix)
283-
let prefix = ' ' . prefix
280+
let prefix = substitute(strpart(expand('%:p'), strlen(path)), '^/\+', "", "")
284281
endif
285282

286283
let buf = bufnr(changelog)

0 commit comments

Comments
 (0)