Update to 4.6

Upstream changes:
JOE 4.6
Enhancements

Upgrade to Unicode 10.0.0. Add configure environment variable that allows you select Unicode 8.0.0, 9.0.0 or 10.0.0.

Install Gnome .desktop files for JOE. This allows you to use JOE in GUI "Open With" mouse actions.

Support strikeout and double-underline attributes for the few terminal emulators that support them. Use "stricken" and "dunderline" in the syntax files, or \s and \z in help screens and status line.

Bugs fixed

Fix bug where JOE would sometimes crash when editing shell scripts. This was due to an obscure bug in the syntax highlighter: 'reset' command (used for default state) was incorrectly messing with stack.

-highlighter_context was missing from many file types, which negated some improvements from the previous version.

Fixed signed char overflow with old style mouse events in large windows

Fix bug where path restart (//) was being applied to block filter command prompt. Strange things would happen if you had adjacent slashes in command arguments.

Allow ~ expansion but suppress path restart (//) in compiler error parsing.

Restore default handling of SIGPIPE and SIGINT for shell commands. This fixes an issue where SIGPIPE doesn't terminate a process as expected, for example by the head -n 10 in: ^K R !sh -c 'while :; do echo y; done' | head -n 10. This issue only occurred in read/write to !, JOE already did the right thing for shell windows and the filter region through shell command.

Improve screen update algorithm so that spaces at the ends of lines are always emitted. This allows them to be preserved when cutting text with the mouse from a terminal emulator window.

Improve efficiency of screen update algorithm: JOE had been resetting attributes such as background color before performing cursor motions (probably as work around for bugs in old terminal emulators). This made screen update slow when there were many attributes, as with syntax highlighting and color schemes. It was also repeatedly emitting ESC [ K.

Switch JOE to issue scrolling commands, even at high baud rates (before this, JOE issued scrolling commands only at 19200 and below because it used to be that simple screen refresh was faster than scrolling in terminal emulators. But this is no longer true with complex screens involving color schemes, unicode and highlighting).

Windows version

Fix file access checks. Inaccessible files due to ACL's weren't correctly detected. This was a regression in 4.5.

Check the correct (Windows) path in the home directory for color schemes. This was not re-implemented properly in 4.5.

JOE 4.5

Enhancements

New color scheme feature, which can be accessed with ^T S or by setting the -colors option.

24-bit color support can be enabled by setting the COLORTERM environment variable to truecolor or 24bit.

Several schemes included in-the-box:

gruvbox by Pavel Pertsev

ir_black by Todd Werth

molokai by Tomas Restrepo

solarized by Ethan Schoonover

wombat by Lars H. Nielsen

xoria by Dmitriy Y. Zotikov

zenburn by Jani Nurminen

The current line can be highlighted by pressing ^T U or by enabling the -hiline option.

The gutter containing line numbers has a dynamic size based on the length of the file, rather than a fixed size of 10.

Updated all language syntax files to use comment_todo and string/comment contexts where appropriate.

Now pass character which invoked a macro to each macro step and call. If a macro step happens to be the 'type' command, the character which invoked the macro will be typed in. For example, this macro will type three 'X's. Before this change you got three NULs.

type,type,type X

Bugs fixed

Fix exsave: (^K ^X) should close file when a block is present in the window, and the file is unmodified (regression from ^C change in 4.2).

Fix regex assertions: they were not working because the character before the search position was not being loaded.

For jmacs: ^Q^J now again inserts \n in the string replace prompt. This broke beginning with JOE 4.0.

Don't try to open files for writing to check file access. This behaves better on unionfs mounts.

Fix stray blocks created after find/replace.

Windows version

Fix inability to set indent step to 1 from menu.

Add support for math functions, fix engineering display.

Fix backslash escapes in find/replace.

Support italicized text.

JOE 4.4
Enhancements

Bugs fixed

Fix segfault due to buffer overrun. This happens if a line with many backslashes appears in the status line context display.

Fix jmacs: ^X ^F and ^X ^B were not working

Build fixes for Solaris

Improve php highlighter: allow numbers in substitution variable names

Unicode tweak: treat private use characters (Co) as printable

Dockerfile highlighter: Add Docker new commands from 1.12, mark bad strings in arrays

Fix loading external charmaps

Windows version

Fix crashing bug when using incremental search
JOE for Windows 4.3
Download

Bugs fixed

Fixed a missed merge that prevented some options menu items from being changed (tab width, tab char, etc).

Fixed bugs updating the title bar.

Minor memory leak/performance fix in subprocess communication.

(from newer version) Fix segfault due to buffer overrun. This happens if you a line with many backslashes appears in the status line context display.

JOE 4.3
Enhancements

Improve memory usage by shrinking buffer header size and highlighter state size.

Improve performance of status line context display (which shows the first line of the function that the cursor is currently in). This feature was making JOE very slow on extremely large files with auto indent enabled (typically JSON or XML data files). Now the syntax highlighter computes the context display (using a new syntax named context.jsf).

Add a mode 'title' to enable or disable the status line context display (previously autoindent mode was overloaded to do this).

Disable syntax highlighting and context display in very large files

Force more appropriate modes when we enter hex dump display: enable overtype, disable autoindent, wordwrap, ansi, picture.

Handle middle mouse button in "joe -mouse" mode (before it did nothing). It's treated as paste (copy region to mouse) as expected. (patch from Petr Olsak).

Bugs fixed

Do not kill region highlighting during incremental search (patch from Petr Olsak).

Negative numbers were not being recognized in blocks

PgUp/PgDn would try to scroll menu if the window above is a menu (it should do this only for completion menus associated with prompts)

Use 'LC_ALL=C sed' to get JOE to compile in OS X.

Forward direction delimiter matching where the delimiters do not begin with special characters (for example in Verilog "begin" / "end") was not working.

Get mouse to work in menus: this broke in 4.1

Character classes with ranges were not working for UTF-8 (as in \[a-z])

Apply spec highlighting to .spec files

Gracefully handle short terminals: fix segfaults which occur when trying to shrink terminal while many windows are on the screen or while turning on help with a short terminal. Fix similar bugs involving the skiptop option. JOE now works even if the terminal height is only one line.

JOE 4.2
New or improved syntax files for the following languages:

Dockerfile
Usability Enhancements

The top Google help searches for JOE include:

How do I save and exit? The startup copyright notice has been replaced with basic help for beginners: ^K Q to exit and ^K H for help.

How do I dismiss the region highlighting? The traditional way is to hit ^K B ^K K, but this is slightly non-obvious and has always been awkward. Now Ctrl-C will do it.

How do I close all files and exit? Now Ctrl-K Q does this. Previously ^K Q was the same as ^C: abort a single file.

Restyle the help screens:

Make it more obvious that there is more than one screen: put the help for help inline with the text instead of in the (seemingly invisible) header.

Mention Ctrl-Arrow region selection, status and goto matching delimiter commands on the first screen.

Remove time and "Ctrl-K H for help" message from status bar. Beginners often don't notice this help message, and it takes up valuable status bar space that power users want for the context display.

Add ^KH for help to search and replace prompts. Many JOE users do not know about this context sensitive help.

Provide aborthint and helphint options so that the ^C and ^K H hints can be customized depending on the rc file (so say ^G for abort in jmacs, for example).

Enable -noxon by default (disable ^S/^Q flow control). This allows us to bind ^Q to quote and ^S / ^R to incremental search.

Document ESC X (command prompt) in the help screens.

"joe --help" now prints all command line options.

Other Enhancements

Tags search now tries to find the tags file in parent directories if it does not exist in the current directory and if the TAGS environment variable was not set.

Built-in calculator can now print and accept numbers in binary, octal and engineering formats: dec 12_345 eng 12.345_0e3 bin 0b11_0000_0011_1001 oct 0o3_0071 hex 0x3039

Built-in calculator now prints and accepts separating underscores for clarity. For example, 4_294_967_296 instead of 4294967296.

Enhanced calculator statistics functions:

dev computes standard deviation with full population
samp computes standard deviation with sample of population
Linear regression analysis. Select a region of x and y values, then:
lr(x) provide estimate of y given x
rlr(y) provide estimate of x given y
Lr, lR, LR: log, exponential, power regression
Calculator region functions now assume the entire buffer if no region is set.

Tab completion now works at the calculator prompt (and in all prompts which allow numeric input, such as ^KL- go to line).

Make new regex engine (from JOE 4.1) more compatible with the classic engine. \y is now shorthand for \(\.\*\), so that it does what \* did in the old engine. Also:

\. no longer matches newline.
\* matches shortest match, not longest match.
Add -left and -right options to control the amount scrolling when the cursor moves past the left or right edge of the screen. When the baud rate is low these are automatically set to a large amount. Also, these now control the manual horizontal scrolling commands. When these are positive, they indicate number of columns. When they are negative, they indicate a fraction of the screen width (-2 is 1/2 the width).

Bugs fixed

Fix use after free bug which shows up as a crash in OpenBSD

Fix bug where indent step value was not shown on ^T menu

Fix bug where setting margin doesn't work on big-endian systems

Fix issue where highest valued Unicode character equivalent was not translating to its corresponding 8-bit character. Effect of this was that Delete key was not working in shell windows in ASCII character set.

Standard deviation calculator function was not producing correct results.

Allow koi8r and koi8-r for KOI8-R in joe_getcodeset (which is only used if there is no setlocale).

Guess_crlf forced UNIX line endings for new files even though crlf was set. Now crlf is left alone if guess_crlf can not determine the line ending.

If cursor was at end of a long line and you switched to hex dump display mode, then hex dump was scrolled. Now scroll offset is reset when you switch to hex display mode.

3 files changed, 25 insertions, 9 deletions

diff --git a/editors/joe/Makefile b/editors/joe/Makefile
index c1424e19313..d3f0635118b 100644
--- a/editors/joe/Makefile
+++ b/editors/joe/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.38 2015/10/19 09:15:54 adam Exp $
+# $NetBSD: Makefile,v 1.39 2018/05/08 08:31:29 wen Exp $
 
-DISTNAME=	joe-4.1
+DISTNAME=	joe-4.6
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=joe-editor/}
 
diff --git a/editors/joe/PLIST b/editors/joe/PLIST
index da41de224d3..c2b99fa23c9 100644
--- a/editors/joe/PLIST
+++ b/editors/joe/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2015/10/19 09:15:54 adam Exp $
+@comment $NetBSD: PLIST,v 1.11 2018/05/08 08:31:29 wen Exp $
 bin/jmacs
 bin/joe
 bin/jpico
@@ -6,6 +6,10 @@ bin/jstar
 bin/rjoe
 man/man1/joe.1
 man/ru/man1/joe.1
+share/applications/jmacs.desktop
+share/applications/joe.desktop
+share/applications/jpico.desktop
+share/applications/jstar.desktop
 share/doc/joe/ChangeLog
 share/doc/joe/NEWS.md
 share/doc/joe/README.md
@@ -23,11 +27,20 @@ share/examples/joe/rjoerc
 share/examples/joe/shell.csh
 share/examples/joe/shell.sh
 share/joe/charmaps/klingon
+share/joe/colors/default.jcf
+share/joe/colors/gruvbox.jcf
+share/joe/colors/ir_black.jcf
+share/joe/colors/molokai.jcf
+share/joe/colors/solarized.jcf
+share/joe/colors/wombat.jcf
+share/joe/colors/xoria.jcf
+share/joe/colors/zenburn-hc.jcf
+share/joe/colors/zenburn.jcf
 share/joe/lang/de.po
 share/joe/lang/fr.po
 share/joe/lang/ru.po
 share/joe/lang/uk.po
-share/joe/lang/zh.po
+share/joe/lang/zh_TW.po
 share/joe/syntax/4gl.jsf
 share/joe/syntax/ada.jsf
 share/joe/syntax/ant.jsf
@@ -41,12 +54,14 @@ share/joe/syntax/cobol.jsf
 share/joe/syntax/coffee.jsf
 share/joe/syntax/comment_todo.jsf
 share/joe/syntax/conf.jsf
+share/joe/syntax/context.jsf
 share/joe/syntax/csh.jsf
 share/joe/syntax/csharp.jsf
 share/joe/syntax/css.jsf
 share/joe/syntax/d.jsf
 share/joe/syntax/debian.jsf
 share/joe/syntax/diff.jsf
+share/joe/syntax/dockerfile.jsf
 share/joe/syntax/elixir.jsf
 share/joe/syntax/erb.jsf
 share/joe/syntax/erlang.jsf
@@ -62,6 +77,7 @@ share/joe/syntax/htmlerb.jsf
 share/joe/syntax/ini.jsf
 share/joe/syntax/iptables.jsf
 share/joe/syntax/java.jsf
+share/joe/syntax/jcf.jsf
 share/joe/syntax/joerc.jsf
 share/joe/syntax/js.jsf
 share/joe/syntax/jsf.jsf
diff --git a/editors/joe/distinfo b/editors/joe/distinfo
index 19426b279bc..6a9189b81ea 100644
--- a/editors/joe/distinfo
+++ b/editors/joe/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.22 2015/11/04 17:41:18 agc Exp $
+$NetBSD: distinfo,v 1.23 2018/05/08 08:31:29 wen Exp $
 
-SHA1 (joe-4.1.tar.gz) = 18004847c9c8863872d81f0bc1242dd35c0a5826
-RMD160 (joe-4.1.tar.gz) = 74b91bb7c644114331930491d8646fe784bd1db3
-SHA512 (joe-4.1.tar.gz) = f6fd9d87c94a4f47586d7a81cccbfd6bfdace2357e3c579f5abfb54117dd95cadcd1783e281874868da6f0a8853327fff5bb3876f86a031f45afb13db45f7377
-Size (joe-4.1.tar.gz) = 1292957 bytes
+SHA1 (joe-4.6.tar.gz) = da7712333f676cfb5ae9f3565fd2225c5a2185ca
+RMD160 (joe-4.6.tar.gz) = cd5a8eff82b7e8043f1a5fdbc875ec37b4de5f5a
+SHA512 (joe-4.6.tar.gz) = 3dd64a994fb3d352a12bf027ef16d57d14ac2577fd63fb6b6e25cae46052befaa7c15dc029bff2f8c3275df90f0343bd46313601055d97277ea4540e109fbe82
+Size (joe-4.6.tar.gz) = 1895046 bytes
 SHA1 (patch-aa) = fa3b48b82c37d8eb0623b0a4f8d527eb80fe1a5b
 SHA1 (patch-ab) = c892db0e7675b25103dbb21762abe69b104f8be3