Sorry, I forgot to mention the ordering of files.
diff [-u] oldfile newfile
Moreover, if you had checkout from svn and made some changes to files, you
can just use,
$ svn diff
Please request a svn accont from Chris, so that it will much easier for
you to commit changes to JAL if you wish.
Птн, 09 Дек 2011, Brian Schott писал(а):
> Bill, I never new about -u.
>
>
> [8:13pm brian~]% diff -u /Users/brian/j701/addons/ide/jhs/jijxipad.ijs
> /Users/brian/j701/addons/ide/jhs/jijxipad.ijs.orig
> --- /Users/brian/j701/addons/ide/jhs/jijxipad.ijs 2011-12-09
> 15:20:35.000000000 -0500
> +++ /Users/brian/j701/addons/ide/jhs/jijxipad.ijs.orig 2011-12-04
> 18:21:33.000000000 -0500
> @@ -21,72 +21,9 @@
> 'dn'jhb'↓'
> 'return'jhb'↵'
> 'jijsipad'jhrefx ' E '
> -'labs' jhb ' L '
> -'advance'jhb'adv'
> 'recalls'jhhidden'<RECALLS>'
> )
>
> -ev_labs_click=: 3 : 0
> -'labsdlg' jhdivadlg''
> - 'labrun' jhb'run'
> - labsel''
> - 'labsclose'jhb'X'
> -'</div>'
> -)
> -
> -labopen=: 3 : 0
> -require__'~addons/labs/labs/lab.ijs'
> -smselout_jijs_=: smfocus_jijs_=: [ NB.! allow introcourse to run
> -labinit_jlab_ y{LABFILES
> -)
> -
> -getlabs=: 3 : 0
> -LABTITLES=: LABCATS=: LABFILES=: ''
> -d=. dirpath t=. jpath'~addons/labs/labs'
> -try.
> - for_p. d do.
> - for_q. 1 dir '/*.ijt',~>p do.
> - LABFILES=: LABFILES,q
> - cat=. (>:#t)}.>q
> - cat=. (cat i.'/'){.cat
> - LABCATS=: LABCATS,<cat
> - title=. toJ fread q
> - title=. (title i.LF){.title
> - title=. (>:title i.'''')}.title
> - title=. (title i:''''){.title
> - LABTITLES=: LABTITLES,<cat,': ',title
> - end.
> - end.
> -catch.
> -end.
> -s=. /:LABTITLES
> -LABFILES=: s{LABFILES
> -LABCATS=: s{LABCATS
> -LABTITLES=: s{LABTITLES
> -)
> -
> -labsel=: 3 : 0
> -getlabs''
> ->(0~:#LABTITLES){'';'labsel'jhselect LABTITLES;1;0
> -)
> -
> -labopen=: 3 : 0
> -require__'~addons/labs/labs/lab.ijs'
> -smselout_jijs_=: smfocus_jijs_=: [ NB.! allow introcourse to run
> -labinit_jlab_ y{LABFILES
> -)
> -
> -ev_lab_click=: 3 : 'smoutput labmsg' NB. no labs to select
> -
> -ev_dot_ctrl =: ev_advance_click
> -ev_advance_click=: 3 : 0
> -if. (<'jlab')e.conl 0 do. labnext_jlab_'' else. smoutput 'No lab
> open. Do studio|labs...' end.
> -)
> -
> -ev_labrun_click=: 3 : 0
> -labopen ".getv'jsid'
> -)
> -
> jev_get=: create
>
> NB. move new transaction(s) to log
> @@ -226,25 +163,6 @@
> jform.jdo.blur(); // hide the onscreen keyboard
> }
>
> -function ev_advance_click(){jdoajax([]);}
> -
> -function ev_lab_click()
> -{
> - if(null==jbyid("labsel"))
> - jdoajax([],"");
> - else
> - jdlgshow("labsdlg","labsel");
> -}
> -
> -function ev_labsclose_click(){jhide("labsdlg");ev_2_shortcut();}
> -
> -function ev_labrun_click()
> -{
> - jhide("labsdlg");
> - jform.jsid.value= jbyid("labsel").selectedIndex;
> - jdoajax([],"");
> -}
> -
> function ev_return_click(){ev_jdo_enter();}
> function ev_bottom_click(){ jbyid("jdo").scrollIntoView(false);}
> function ev_up_click(){uarrow();}
> [8:13pm brian~]%
>
> On Fri, Dec 9, 2011 at 6:23 PM, bill lam <[email protected]> wrote:
> > The default diff format is rather difficult for human review. If your
> > diff also supports the -u option, eg
> >
> > diff -u file1 file1
> >
> > the output would be more readable.
> >
> > Птн, 09 Дек 2011, Brian Schott писал(а):
> >> Eric,
> >>
> >> I have successfully only added the button "L" in jijxipad (in line 24
> >> in the diff). When I click that new button, all that apparently
> >> happens is the line "</div>". Other than that I have mostly just
> >> copied from jijx into jijxipad definitions which relate to labs,
> >> including the verb "labopen". Can you look at the diff below and
> >> suggest how I can proceed, please?
> >>
> ----------------------------------------------------------------------
> For information about J forums see http://www.jsoftware.com/forums.htm
--
regards,
====================================================
GPG key 1024D/4434BAB3 2008-08-24
gpg --keyserver subkeys.pgp.net --recv-keys 4434BAB3
----------------------------------------------------------------------
For information about J forums see http://www.jsoftware.com/forums.htm
