diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2019-05-02 15:16:52 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2019-05-02 15:16:52 (GMT) |
| commit | b3481548bfb42ded0bb593b1e8665050d233c51b (patch) | |
| tree | 6adbac84bbf5a60a6a95870a2f5cf19f0982cd0e | |
| parent | 4dff7984d98eccdbae86d9ac70c8c80952f052bb (diff) | |
| parent | 1369fb20ab7bc034cc67254f02d30b223324fa69 (diff) | |
| download | blt-b3481548bfb42ded0bb593b1e8665050d233c51b.zip blt-b3481548bfb42ded0bb593b1e8665050d233c51b.tar.gz blt-b3481548bfb42ded0bb593b1e8665050d233c51b.tar.bz2 | |
Merge branch 'master' into devel
| -rw-r--r-- | ds9/doc/release/r8.1.html | 1 | ||||
| -rw-r--r-- | ds9/parsers/xpafirstlex.fcl | 2 | ||||
| -rw-r--r-- | ds9/parsers/xpafirstparser.tac | 4 | ||||
| -rw-r--r-- | ds9/parsers/xpafirstparser.tcl | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/ds9/doc/release/r8.1.html b/ds9/doc/release/r8.1.html index f95e14c..5d5d3f5 100644 --- a/ds9/doc/release/r8.1.html +++ b/ds9/doc/release/r8.1.html @@ -74,6 +74,7 @@ <li><tt>04.25.2019 MASK: fixed an issue with mask and backups.</tt></li> <li><tt>04.25.2019 BACKUP: fixed an issue with reading version 6.x backup files.</tt></li> <li><tt>04.25.2019 CUBE: add 'get cube coordsys command'</tt></li> +<li><tt>05.01.2019 XPA: fix -xpa command issue.</tt></li> <li><tt><b>xx.xx.2019 RELEASE version 8.1b1</b></tt></li> </ol> </div> diff --git a/ds9/parsers/xpafirstlex.fcl b/ds9/parsers/xpafirstlex.fcl index 9f62c60..02aa98a 100644 --- a/ds9/parsers/xpafirstlex.fcl +++ b/ds9/parsers/xpafirstlex.fcl @@ -1,4 +1,4 @@ -#tab xpaparser.tab.tcl +#tab xpafirstparser.tab.tcl %{ %} diff --git a/ds9/parsers/xpafirstparser.tac b/ds9/parsers/xpafirstparser.tac index 890e42f..eed1e77 100644 --- a/ds9/parsers/xpafirstparser.tac +++ b/ds9/parsers/xpafirstparser.tac @@ -29,7 +29,7 @@ xpa : yesno {ProcessCmdSet pds9 xpa $1} | method {ProcessCmdSet env XPA_METHOD $1} | NOXPANS_ {ProcessCmdSet env XPA_NSREGISTER false} -| CONNECT_ + | CONNECT_ | DISCONNECT_ | INFO_ # backward compatibility @@ -44,7 +44,7 @@ method : UNIX_ {set _ unix} %% -proc xpa::yyerror {msg} { +proc xpafirst::yyerror {msg} { variable yycnt variable yy_current_buffer variable index_ diff --git a/ds9/parsers/xpafirstparser.tcl b/ds9/parsers/xpafirstparser.tcl index 34e9e6e..af7f5b7 100644 --- a/ds9/parsers/xpafirstparser.tcl +++ b/ds9/parsers/xpafirstparser.tcl @@ -542,7 +542,7 @@ proc xpafirst::yyparse {} { # end autogenerated taccle functions ###### -proc xpa::yyerror {msg} { +proc xpafirst::yyerror {msg} { variable yycnt variable yy_current_buffer variable index_ |