23:08:49 up 15 days, 0 min,  4 users,  load average: 0.02, 0.08, 0.09
USER     TTY      FROM              LOGIN@   IDLE   JCPU   PCPU WHAT
elson    :-3       -                23Jun13 ?xdm?   4:29m  0.96s /usr/bin/gnome-
elson    pts/1    :0.0             24Jun13  0.00s 55:28   0.29s git commit pico
elson    pts/2    :0.0             26Jun13 22.00s  0.86s  0.03s info vi
elson    pts/3    :0.0             Sun19   25:30m  0.07s  0.07s bash
Please enter the commit message for your changes. Lines starting
bug315: terminate skipping state on endsub only, not on return

This was a consequence of collapsing the code duplication between
endsub and return handling into a common sequence.
interp/params: do not require a named param to be defined when parsing a sub

this fixes	the second reported issue in
https://sourceforge.net/p/emc/bugs/315/, the following now parses OK:

O<multipass> SUB
#<sub> = #1
O#<sub> CALL
O<multipass> ENDSUB
m2
Merge remote branch 'origin/bug315-2-fix' into v2.5_branch
Test for bug 315 part 2
Merge branch 'v2.5_branch'

Conflicts:
	docs/src/drivers/pico_ppmc.txt
	src/emc/rs274ngc/interp_read.cc
Merge remote branch 'origin/bug315-fix'
touchy: regression fix (loading of file twice)

change select_and_open() to select_and_show()
initialize self.current_file upon select()
Fix traceback when clicking an empty file-load slot
increase stepgen to 16
Signed-off-by: John Thornton <jthornton@gnipsel.com>
Docs: update man page to 16

Signed-off-by: John Thornton <jthornton@gnipsel.com>