diff --git a/‎ChangeLog‎
Lines changed: 4 additions & 0 deletions b/‎ChangeLog‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎configure.ac‎
Lines changed: 4 additions & 4 deletions b/‎configure.ac‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎docs/Makefile.am‎
Lines changed: 1 addition & 1 deletion b/‎docs/Makefile.am‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎term/caca.trm‎
Lines changed: 16 additions & 10 deletions b/‎term/caca.trm‎
Lines changed: 16 additions & 10 deletions
@@ -14,6 +14,10 @@
 
 	* src/eval.c (set_gpval_axis_sth_double):  Remove unused parameter.
 
+	* configure.ac docs/Makefile.am term/caca.trm:
+	Add caca terminal documentation to the user manual.  Fix segfault on
+	"set term caca driver raw".
+
 2017-07-04  Bastian Maerkisch  <bmaerkisch@web.de>
 
 	* src/win/wgnuplib.h src/win/wgraph.c src/win/wgdiplus.cpp
 
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl configure.in for gnuplot on Unix.
 dnl
-dnl $Id: configure.ac,v 1.34 2017-06-28 21:35:26 sfeam Exp $
+dnl $Id: configure.ac,v 1.35 2017-07-05 19:17:59 sfeam Exp $
 dnl
 dnl this is actually major.minor ...
 dnl note that for a non-beta release, we need to disable DEVELOPMENT_RELEASE
@@ -748,10 +748,10 @@ fi
 
 dnl Disable experimental support for nonlinear axes
 AC_ARG_WITH(nonlinear-axes,dnl
-[  --without-nonlinear-axes     disable EXPERIMENTAL support for nonlinear axes])
+[  --without-nonlinear-axes     disable support for nonlinear axes])
 if test "$with_nonlinear_axes" = no; then
     AC_DEFINE(DISABLE_NONLINEAR_AXES, 1,
-               [ Define if you want to disable EXPERIMENTAL support for nonlinear axes ])
+               [ Define if you want to disable support for nonlinear axes ])
 fi
 
 dnl Sort help/subtopic tables by row or column
@@ -1360,7 +1360,7 @@ fi
 if test "$with_caca" = yes; then
   AC_MSG_RESULT([  caca terminal: yes (EXPERIMENTAL)])
 else
-  AC_MSG_RESULT([  caca terminal: no (requires libcaca >= 0.99.beta15)])
+  AC_MSG_RESULT([  caca terminal: no (use --with-caca to enable)])
 fi
 
 if test "$gnuplot_framework_AquaTerm" = yes; then
 
@@ -51,7 +51,7 @@ noinst_PROGRAMS = checkdoc doc2ipf doc2tex doc2gih doc2rnh doc2hlp	\
 AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/term
 
 T = $(top_srcdir)/term/
-CORETERM = $(T)ai.trm $(T)aquaterm.trm $(T)be.trm \
+CORETERM = $(T)ai.trm $(T)aquaterm.trm $(T)be.trm $(T)caca.trm \
 $(T)cairo.trm $(T)canvas.trm $(T)cgm.trm $(T)context.trm \
 $(T)corel.trm $(T)debug.trm $(T)djsvga.trm $(T)dumb.trm $(T)dxf.trm \
 $(T)dxy.trm $(T)eepic.trm $(T)emf.trm $(T)emxvga.trm $(T)epson.trm \
 
@@ -1,7 +1,7 @@
 /*
  * GNUPLOT - caca.trm
  *
- * $Id: caca.trm,v 1.11 2017-04-19 18:52:14 markisch Exp $
+ * $Id: caca.trm,v 1.12 2017-07-05 19:17:59 sfeam Exp $
  *
  * This file uses UTF8 encoding and a tab size of 4.
  *
@@ -197,8 +197,10 @@ static caca_canvas_t * CACA_suspend_cv = NULL;
 static TBOOLEAN CACA_windowed = FALSE; /* graphics output in different window*/
 static TBOOLEAN CACA_exportonly = FALSE; /* no output to screen but to file */
 static TBOOLEAN CACA_processing_events = FALSE; /* flag processing of events in CACA_text() */
+#ifdef WIN32
 static unsigned CACA_codepage = 0;
 static unsigned TMP_codepage;
+#endif
 
 /* drawing */
 static char CACA_pen;		/* current character used to draw point symbols */
@@ -810,8 +812,12 @@ CACA_init_aspect_ratio(void)
 	if (CACA_dp) {
 		height = caca_get_display_height(CACA_dp) / (CACA_ymax + CACA_status_height + 1);
 		width = caca_get_display_width(CACA_dp) / (CACA_xmax + 1);
+		/* The caca man page says "these functions never fail". */
+		/* But in practice they can return 0. */
 	}
-	if (height > width) {
+	if (height == 0 || width == 0) {
+		term->h_tic = term->v_tic = 1;
+	} else if (height > width) {
 		term->h_tic = (height + width / 2) / width;
 		term->v_tic = 1;
 	} else {
@@ -3354,23 +3360,23 @@ START_HELP(caca)
 "?terminal caca",
 "?term caca",
 "?caca",
-" The `caca` terminal driver uses `libcaca` to plot using ascii characters.",
-" In contrast to the `dumb` terminal it is a full-fledged terminal and",
-" includes support for (RGB) colors, box fill, images, rotated text,",
-" filled polygons, unicode character encoding and mouse interaction.",
+" [EXPERIMENTAL] ",
+" The `caca` terminal is a mostly-for-fun output mode that uses `libcaca` to",
+" plot using ascii characters.  In contrast to the `dumb` terminal it includes",
+" support for color, box fill, images, rotated text, filled polygons,",
+" and mouse interaction.",
 "",
 " Syntax:",
 "       set terminal caca {{driver | format} {default | <driver> | list}}",
 "                         {color | monochrome}",
-"                         {{no}inverted}",
-"                         {enhanced | noenhanced}",
+"                         {{no}inverted} {{no}enhanced}",
 "                         {background <rgb color>}",
 "                         {title \"<plot window title>\"}",
 "                         {size <width>,<height>}",
 "                         {charset ascii|blocks|unicode}",
 "",
 " The `driver` option selects the `libcaca` display driver or export `format`.",
-" Use `default` to let `libcaca` choose the platform default display driver.",
+" Use `default` is to let `libcaca` choose the platform default display driver.",
 " The default driver can be changed by setting the environment variable",
 " CACA_DRIVER before starting `gnuplot`.",
 " Use `set term caca driver list` to print a list of supported output modes.",
@@ -3434,7 +3440,7 @@ START_HELP(caca)
 "?term caca bugs",
 "?caca limitations",
 "?caca bugs",
-" The `caca` terminal has some known bugs and limitations:",
+" The `caca` terminal has known bugs and limitations:",
 "",
 " Closing the terminal window by clicking the \"X\" on the title line",
 " does not work correctly. Press \"q\" to close the window.",