Skip to content
This repository
Browse code

Release 2.4

  • Loading branch information...
commit b9cea6312ab1535cea6d3db1e076bc0a2db2a5ec 1 parent 1b37d60
Israel Chauca Fuentes authored
1  .gitignore
@@ -5,3 +5,4 @@
5 5 *.gz
6 6 vimball.txt
7 7 *.orig
  8 +tags
24 Makefile
@@ -10,12 +10,12 @@ VIM=/usr/bin/vim
10 10
11 11 .PHONY: $(PLUGIN).vba README
12 12
13   -install: vimball
14   - @echo install
15   - $(VIM) -N -c ':so %' -c':q!' $(PLUGIN)-$(VERSION).vba
16   - cp -f $(TESTS) $(VIMFOLDER)$(TESTS)
  13 +#install: vimball
  14 + #@echo install
  15 + #$(VIM) -N -c ':so %' -c':q!' $(PLUGIN)-$(VERSION).vba
  16 + #cp -f $(TESTS) $(VIMFOLDER)$(TESTS)
17 17
18   -all: uninstall vimball install README zip gzip
  18 +all: vimball README zip gzip
19 19
20 20 vimball: $(PLUGIN).vba
21 21
@@ -25,10 +25,10 @@ clean:
25 25
26 26 dist-clean: clean
27 27
28   -uninstall:
29   - @echo uninstall
30   - $(VIM) -N -c':RmVimball' -c':q!' $(PLUGIN)-$(VERSION).vba
31   - rm -f $(VIMFOLDER)$(TESTS)
  28 +#uninstall:
  29 + #@echo uninstall
  30 + #$(VIM) -N -c':RmVimball' -c':q!' $(PLUGIN)-$(VERSION).vba
  31 + #rm -f $(VIMFOLDER)$(TESTS)
32 32
33 33 undo:
34 34 for i in */*.orig; do mv -f "$$i" "$${i%.*}"; done
@@ -47,8 +47,10 @@ zip:
47 47 @echo zip
48 48 rm -f *.zip
49 49 zip -r $(PLUGIN).zip doc plugin autoload
50   - zip $(PLUGIN).zip -d \*.sw\?
51   - zip $(PLUGIN).zip -d \*.orig
  50 + zip $(PLUGIN).zip -d \*.sw\? || echo 1
  51 + zip $(PLUGIN).zip -d \*.un\? || echo 1
  52 + zip $(PLUGIN).zip -d \*.orig || echo 1
  53 + zip $(PLUGIN).zip -d \*tags || echo 1
52 54 zip $(PLUGIN).zip -d $(TESTS)
53 55 ln -f $(PLUGIN).zip $(PLUGIN)-$(VERSION).zip
54 56
54 README
... ... @@ -1,4 +1,4 @@
1   -*delimitMate* Trying to keep those beasts at bay! v2.4DEV *delimitMate.txt*
  1 +*delimitMate* Trying to keep those beasts at bay! v2.4 *delimitMate.txt*
2 2
3 3
4 4
@@ -90,6 +90,9 @@ Without auto-close: >
90 90 –––––––––-|––––––––––
91 91 ()<S-Tab> | ()|
92 92 <
  93 +NOTE: Abbreviations will not be expanded by delimiters used on delimitMate,
  94 +you should use <C-]> (read |i_CTRL-]|) to expand them on the go.
  95 +
93 96 ------------------------------------------------------------------------------
94 97 2.2 EXPANSION OF SPACE AND CAR RETURN *delimitMateExpansion*
95 98
@@ -125,8 +128,9 @@ If you press backspace inside an empty pair, both delimiters are deleted. When
125 128 expansions are enabled, <BS> will also delete the expansions. NOTE that
126 129 deleting <CR> expansions will brake the redo command.
127 130
128   -If you type shift + backspace instead, only the closing delimiter will be
129   -deleted.
  131 +If you type <S-BS> (shift + backspace) instead, only the closing delimiter
  132 +will be deleted. NOTE that this will not usually work when using Vim from the
  133 +terminal, see 'delimitMate#JumpAny()' below to see how to fix it.
130 134
131 135 e.g. typing at the "|": >
132 136
@@ -163,9 +167,10 @@ e.g. (selection represented between square brackets): >
163 167 ------------------------------------------------------------------------------
164 168 2.5 SMART QUOTES *delimitMateSmartQuotes*
165 169
166   -Only one quote will be inserted following a quote, a "\" or an alphanumeric
167   -character. This should cover closing quotes, escaped quotes and apostrophes.
168   -Except for apostrophes, this feature can be disabled setting the option
  170 +Only one quote will be inserted following a quote, a "\" or, following or
  171 +preceding an alphanumeric character. This should cover closing quotes after a
  172 +string, opening quotes before a string, escaped quotes and apostrophes. Except
  173 +for apostrophes, this feature can be disabled setting the option
169 174 |'delimitMate_smart_quotes'| to 0.
170 175
171 176 e.g. typing at the "|": >
@@ -234,6 +239,10 @@ specific file types, see |delimitMateOptionDetails| for examples.
234 239 |'delimitMate_quotes'| Tells delimitMate which quotes should be
235 240 used.
236 241
  242 +|'delimitMate_nesting_quotes'| Tells delimitMate which quotes should be
  243 + allowed to be nested.
  244 +
  245 +
237 246 |'delimitMate_visual_leader'| Sets the leader to be used in visual mode.
238 247
239 248 |'delimitMate_expand_cr'| Turns on/off the expansion of <CR>.
@@ -287,7 +296,7 @@ e.g.: >
287 296 ------------------------------------------------------------------------------
288 297 *'delimitMate_matchpairs'*
289 298 *'b:delimitMate_matchpairs'*
290   -Values: A string with |matchpairs| syntax. ~
  299 +Values: A string with |'matchpairs'| syntax. ~
291 300 Default: &matchpairs ~
292 301
293 302 Use this option to tell delimitMate which characters should be considered
@@ -309,6 +318,18 @@ e.g.: >
309 318 au FileType html let b:delimitMate_quotes = "\" '"
310 319 <
311 320 ------------------------------------------------------------------------------
  321 + *'delimitMate_nesting_quotes'*
  322 + *'b:delimitMate_nesting_quotes'*
  323 +Values: A list of quotes. ~
  324 +Default: [] ~
  325 +
  326 +Quotes listed here will not be able to jump out of the empty pair, thus
  327 +allowing the autoclosed quotes to be nested.
  328 +e.g.: >
  329 + let delimitMate_quotes = ['"','`']
  330 + au FileType python let b:delimitMate_quotes = ['"']
  331 +<
  332 +------------------------------------------------------------------------------
312 333 *'delimitMate_visual_leader'*
313 334 *'b:delimitMate_visual_leader'*
314 335 Values: Any character. ~
@@ -472,9 +493,15 @@ Functions should be used enclosed between <C-R>= and <CR>, otherwise they
472 493 might not work as expected or at all.
473 494
474 495 ------------------------------------------------------------------------------
475   -delimitMate#WithinEmptyPair() *delimitMate_WithinEmptyPair*
  496 +delimitMate#WithinEmptyPair() *delimitMate_WithinEmptyPair()*
476 497
477 498 Returns 1 if the cursor is inside an empty pair, 0 otherwise.
  499 +e.g.: >
  500 +
  501 + inoremap <expr> <CR> delimitMate#WithinEmptyPair() ?
  502 + \ "\<C-R>=delimitMate#ExpandReturn()\<CR>" :
  503 + \ "external_mapping"
  504 +<
478 505
479 506 ------------------------------------------------------------------------------
480 507 delimitMate#ExpandReturn() *delimitMate#ExpandReturn()*
@@ -485,7 +512,8 @@ Returns the expansion for <CR> if enabled and inside an empty pair, returns
485 512 e.g.: This mapping could be used to select an item on a pop-up menu or expand
486 513 <CR> inside an empty pair: >
487 514
488   - inoremap <expr> <CR> pumvisible() ? "\<c-y>" :
  515 + inoremap <expr> <CR> pumvisible() ?
  516 + \"\<c-y>" :
489 517 \ "\<C-R>=delimitMate#ExpandReturn()\<CR>"
490 518 <
491 519 ------------------------------------------------------------------------------
@@ -510,7 +538,7 @@ This function returns a mapping that will make the cursor jump to the right
510 538 when delimitMate#ShouldJump() returns 1, returns the argument "key" otherwise.
511 539 e.g.: You can use this to create your own mapping to jump over any delimiter.
512 540 >
513   - inoremap <C-Tab> <C-R>=delimitMate#JumpAny("\<S-Tab>")<CR>
  541 + inoremap <C-Tab> <C-R>=delimitMate#JumpAny("\<C-Tab>")<CR>
514 542 <
515 543
516 544 ==============================================================================
@@ -561,10 +589,14 @@ This script was inspired by the auto-completion of delimiters on TextMate.
561 589
562 590 Version Date Release notes ~
563 591 |---------|------------|-----------------------------------------------------|
564   - 2.4DEV 2010-06-06 * Current release:
  592 + 2.4 2010-07-29 * Current release:
565 593 - Unbalanced parens: see :help delimitMateBalance.
566 594 - Visual wrapping now works on block-wise visual
567 595 with some limitations.
  596 + - Arrow keys didn't work on terminal.
  597 + - Added option to allow nested quotes.
  598 + - Expand Smart Quotes to look for a string on the
  599 + right of the cursor.
568 600
569 601 |---------|------------|-----------------------------------------------------|
570 602 2.3.1 2010-06-06 * - Fix: an extra <Space> is inserted after <Space>
4 autoload/delimitMate.vim
... ... @@ -1,7 +1,7 @@
1 1 " ============================================================================
2 2 " File: autoload/delimitMate.vim
3   -" Version: 2.4DEV
4   -" Modified: 2010-06-06
  3 +" Version: 2.4
  4 +" Modified: 2010-07-29
5 5 " Description: This plugin provides auto-completion for quotes, parens, etc.
6 6 " Maintainer: Israel Chauca F. <israelchauca@gmail.com>
7 7 " Manual: Read ":help delimitMate".
4 doc/delimitMate.txt
... ... @@ -1,4 +1,4 @@
1   -*delimitMate* Trying to keep those beasts at bay! v2.4DEV *delimitMate.txt*
  1 +*delimitMate* Trying to keep those beasts at bay! v2.4 *delimitMate.txt*
2 2
3 3
4 4
@@ -589,7 +589,7 @@ This script was inspired by the auto-completion of delimiters on TextMate.
589 589
590 590 Version Date Release notes ~
591 591 |---------|------------|-----------------------------------------------------|
592   - 2.4DEV 2010-06-06 * Current release:
  592 + 2.4 2010-07-29 * Current release:
593 593 - Unbalanced parens: see :help delimitMateBalance.
594 594 - Visual wrapping now works on block-wise visual
595 595 with some limitations.
6 plugin/delimitMate.vim
... ... @@ -1,7 +1,7 @@
1 1 " ============================================================================
2 2 " File: plugin/delimitMate.vim
3   -" Version: 2.4DEV
4   -" Modified: 2010-06-06
  3 +" Version: 2.4
  4 +" Modified: 2010-07-29
5 5 " Description: This plugin provides auto-completion for quotes, parens, etc.
6 6 " Maintainer: Israel Chauca F. <israelchauca@gmail.com>
7 7 " Manual: Read ":help delimitMate".
@@ -27,7 +27,7 @@ if v:version < 700
27 27 endif
28 28
29 29 let s:loaded_delimitMate = 1
30   -let delimitMate_version = "2.4DEV"
  30 +let delimitMate_version = "2.4"
31 31 "}}}
32 32
33 33 " Functions: {{{

0 comments on commit b9cea63

Please sign in to comment.
Something went wrong with that request. Please try again.