On Wednesday, November 13, 2013 9:06:46 PM UTC-6, Ben Fritz wrote:
> On Wednesday, November 13, 2013 8:45:43 PM UTC-6, Daniel "paradigm" Thau
> wrote:
> > On Wednesday, November 13, 2013 9:06:25 PM UTC-5, Ben Fritz wrote:
> > Some googling around makes it seem as though Solaris's /usr/bin/patch may
> > not
> > know unified diff format. See if you have a /usr/bin/qpatch on your system
> > and try with that.
>
> Ugh, good to know. I'll look for that utility at work tomorrow, or failing
> everything else just apply the patch by hand. It's pretty small.
>
> > I'll try and make a context format with diff -c later for you in the next
> > few
> > days if need be.
>
> No need, I'll generate it myself if I must. Sorry for the trouble.
Actually I just made it now. Attached for anybody else who needs it.
Here's how, from my home computer which DOES have Vim as an Hg repository:
patch -p1 < autotextobject.diff
hg extdiff -o -Nprc > autotextobject_context.patch
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
diff -Nprc vim-src.fbb64f5bfdf4/runtime/doc/motion.txt vim-src/runtime/doc/motion.txt
*** vim-src.fbb64f5bfdf4/runtime/doc/motion.txt 2013-11-13 21:11:20.148697015 -0600
--- vim-src/runtime/doc/motion.txt 2013-11-13 21:11:20.152696965 -0600
*************** matching end tag. These are ignored.
*** 733,738 ****
--- 733,745 ----
The text objects are tolerant about mistakes. Stray end tags are ignored.
+
+ Automatic text-objects *auto-text-objects*
+
+ If |'autotextobject'| is set and an undefined text-object is entered, the
+ character provided will be used as bounds and act like |v_i"| or |v_a"|. See
+ |'autotextobject'|.
+
==============================================================================
7. Marks *mark-motions* *E20* *E78*
diff -Nprc vim-src.fbb64f5bfdf4/runtime/doc/options.txt vim-src/runtime/doc/options.txt
*** vim-src.fbb64f5bfdf4/runtime/doc/options.txt 2013-11-13 21:11:20.148697015 -0600
--- vim-src/runtime/doc/options.txt 2013-11-13 21:11:20.152696965 -0600
*************** A jump table for the options with a shor
*** 734,739 ****
--- 734,755 ----
released with Sun ONE Studio 4 Enterprise Edition.
Note: When this option is on some plugins may not work.
+ *'autotextobject'* *'ato'* *'noautotextobject'*
+ *'noato'*
+ 'autotextobject' 'ato' boolean (default off)
+ global
+ {not in Vi}
+ {only available when compiled with it, use
+ exists("+textobjects") to check}
+ When on, if an undefined text-object is entered the character is
+ treated as the bounds for a text-object. This text-object will act
+ like |v_i"| or |v_a"| except with the provided character instead of a
+ quote. For example, "," is not defined as a text-object. If the user
+ enters "di," with this setting, the area between "," characters will
+ be deleted.
+ Note: New text-objects may be added in future versions of Vim which
+ will take precedence over text-objects provided with this setting.
+
*'arabic'* *'arab'* *'noarabic'* *'noarab'*
'arabic' 'arab' boolean (default off)
local to window
diff -Nprc vim-src.fbb64f5bfdf4/runtime/doc/tags vim-src/runtime/doc/tags
*** vim-src.fbb64f5bfdf4/runtime/doc/tags 2013-11-13 21:11:20.120697365 -0600
--- vim-src/runtime/doc/tags 2013-11-13 21:11:20.156696915 -0600
*************** $VIMRUNTIME starting.txt /*$VIMRUNTIME*
*** 53,63 ****
--- 53,65 ----
'ari' options.txt /*'ari'*
'arshape' options.txt /*'arshape'*
'as' todo.txt /*'as'*
+ 'ato' options.txt /*'ato'*
'autochdir' options.txt /*'autochdir'*
'autoindent' options.txt /*'autoindent'*
'autoprint' vi_diff.txt /*'autoprint'*
'autoread' options.txt /*'autoread'*
'autosave' todo.txt /*'autosave'*
+ 'autotextobject' options.txt /*'autotextobject'*
'autowrite' options.txt /*'autowrite'*
'autowriteall' options.txt /*'autowriteall'*
'aw' options.txt /*'aw'*
*************** $VIMRUNTIME starting.txt /*$VIMRUNTIME*
*** 2300,2305 ****
--- 2302,2309 ----
:keepj motion.txt /*:keepj*
:keepjumps motion.txt /*:keepjumps*
:keepmarks motion.txt /*:keepmarks*
+ :keepp cmdline.txt /*:keepp*
+ :keeppatterns cmdline.txt /*:keeppatterns*
:l various.txt /*:l*
:lN quickfix.txt /*:lN*
:lNext quickfix.txt /*:lNext*
*************** spell-affix-flags spell.txt /*spell-affi
*** 7791,7796 ****
--- 7795,7801 ----
spell-affix-mbyte spell.txt /*spell-affix-mbyte*
spell-affix-not-supported spell.txt /*spell-affix-not-supported*
spell-affix-vim spell.txt /*spell-affix-vim*
+ spell-cjk spell.txt /*spell-cjk*
spell-compound spell.txt /*spell-compound*
spell-dic-format spell.txt /*spell-dic-format*
spell-double-scoring spell.txt /*spell-double-scoring*
diff -Nprc vim-src.fbb64f5bfdf4/src/normal.c vim-src/src/normal.c
*** vim-src.fbb64f5bfdf4/src/normal.c 2013-11-13 21:11:20.108697518 -0600
--- vim-src/src/normal.c 2013-11-13 21:11:20.152696965 -0600
*************** nv_object(cap)
*** 9315,9321 ****
case 'u': /* "au" = a URL */
#endif
default:
! flag = FAIL;
break;
}
--- 9315,9328 ----
case 'u': /* "au" = a URL */
#endif
default:
! /* if 'autotextobject' is set, and none of the above
! * text-objects were utilized, try to treat cap->nchar like a
! * quote */
! if (p_ato)
! flag = current_quote(cap->oap, cap->count1,
! include, cap->nchar);
! else
! flag = FAIL;
break;
}
diff -Nprc vim-src.fbb64f5bfdf4/src/option.c vim-src/src/option.c
*** vim-src.fbb64f5bfdf4/src/option.c 2013-11-13 21:11:20.132697215 -0600
--- vim-src/src/option.c 2013-11-13 21:11:20.156696915 -0600
*************** static struct vimoption
*** 555,560 ****
--- 555,565 ----
{"autoread", "ar", P_BOOL|P_VI_DEF,
(char_u *)&p_ar, PV_AR,
{(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+ #ifdef FEAT_TEXTOBJ
+ {"autotextobject","ato",P_BOOL|P_VI_DEF,
+ (char_u *)&p_ato, PV_NONE,
+ {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+ #endif
{"autowrite", "aw", P_BOOL|P_VI_DEF,
(char_u *)&p_aw, PV_NONE,
{(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
diff -Nprc vim-src.fbb64f5bfdf4/src/option.h vim-src/src/option.h
*** vim-src.fbb64f5bfdf4/src/option.h 2013-11-13 21:11:20.124697315 -0600
--- vim-src/src/option.h 2013-11-13 21:11:20.156696915 -0600
*************** EXTERN char_u *p_ambw; /* 'ambiwidth' */
*** 320,325 ****
--- 320,328 ----
EXTERN int *p_antialias; /* 'antialias' */
#endif
EXTERN int p_ar; /* 'autoread' */
+ #ifdef FEAT_TEXTOBJ
+ EXTERN int p_ato; /* 'autotextobject' */
+ #endif
EXTERN int p_aw; /* 'autowrite' */
EXTERN int p_awa; /* 'autowriteall' */
EXTERN char_u *p_bs; /* 'backspace' */
