--- a/NEWS
+++ b/NEWS
@@ -170,6 +170,8 @@
 
   * The function sumsq now computes sum (x .* conj (x)) for complex values.
 
+  * Octave now uses readline version 2.1 and kpathsea 3.0.
+
   * New configure option, --enable-readline.
 
   * New configure option, --enable-static.

--- a/PROJECTS
+++ b/PROJECTS
@@ -454,6 +454,12 @@
     function that gives all the basic information, then write who and
     whos as M-files.
 
+  * Make whos work for structure elements:
+
+      prot  type               rows   cols  name
+      ====  ====               ====   ====  ====
+      wd   matrix                m      n  struct.x
+
   * On systems that support matherr(), make it possible for users to
     enable the printing of warning messages.
 

--- a/config.h.bot
+++ b/config.h.bot
@@ -7,13 +7,13 @@
 #define GCC_ATTR_UNUSED
 #endif
 
-#define CONST_CAST(T, E) const_cast<T> (E)
+#define CONST_CAST(T, E) (T) (E)
 
-#define DYNAMIC_CAST(T, E) dynamic_cast<T> (E)
+#define DYNAMIC_CAST(T, E) (T) (E)
 
-#define REINTERPRET_CAST(T, E) reinterpret_cast<T> (E)
+#define REINTERPRET_CAST(T, E) (T) (E)
 
-#define STATIC_CAST(T, E) static_cast<T> (E)
+#define STATIC_CAST(T, E) (T) (E)
 
 #define HEAVYWEIGHT_INDEXING 1
 

--- a/doc/interpreter/preface.texi
+++ b/doc/interpreter/preface.texi
@@ -91,8 +91,7 @@
 
 @item
 Klaus Gebhardt @email{gebhardt@@crunch.ikp.physik.th-darmstadt.de}
-ported Octave to OS/2 and worked with Michel Juillard
-@email{juillard@@msh-paris.fr} on the port to DOS.
+ported Octave to OS/2.
 
 @item
 A. Scottedward Hodel @email{A.S.Hodel@@eng.auburn.edu} contributed a number
@@ -114,10 +113,6 @@
 Linux releases available.
 
 @item
-Michel Juillard @email{juillard@@msh-paris.fr} ported Octave to DOS
-systems.
-
-@item
 Friedrich Leisch @email{leisch@@ci.tuwien.ac.at} provided the
 @code{mahalanobis} function.
 

--- a/doc/interpreter/tips.texi
+++ b/doc/interpreter/tips.texi
@@ -320,7 +320,7 @@
 author of the library.
 
 @smallexample
-## Author: John W. Eaton <jwe@@bevo.che.wsic.edu>
+## Author: John W. Eaton <jwe@@bevo.che.wisc.edu>
 @end smallexample
 
 @item Maintainer

--- a/liboctave/ChangeLog
+++ b/liboctave/ChangeLog
@@ -1,3 +1,12 @@
+Thu Dec 18 14:53:45 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* idx-vector.cc (IDX_VEC_REP::sort): Don't do anything unless len > 1.
+	(make_uniq): Likewise.
+
+Fri Dec 12 10:58:33 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* lo-ieee.cc (octave_ieee_init): Check for linux before __alpha__.
+
 Sun Nov 30 14:59:12 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* lo-mappers.cc: Include cmath and lo-specfun.h, not oct-math.h.

--- a/liboctave/idx-vector.cc
+++ b/liboctave/idx-vector.cc
@@ -472,6 +472,9 @@
 static inline int
 make_uniq (int *d, int l)
 {
+  if (l < 2)
+    return l;
+
   int k = 0;
   for (int ii = 1; ii < l; ii++)
     {
@@ -547,10 +550,13 @@
 void
 IDX_VEC_REP::sort (bool uniq)
 {
-  sort_data (data, len);
+  if (len > 1)
+    {
+      sort_data (data, len);
 
-  if (uniq)
-    len = make_uniq (data, len);
+      if (uniq)
+	len = make_uniq (data, len);
+    }
 }
 
 void

--- a/liboctave/lo-ieee.cc
+++ b/liboctave/lo-ieee.cc
@@ -68,13 +68,13 @@
 #if defined (SCO)
   double tmp = 1.0;
   octave_Inf = 1.0 / (tmp - tmp);
+#elif defined (linux)
+  octave_Inf = HUGE_VAL;
 #elif defined (__alpha__)
   extern unsigned int DINFINITY[2];
   octave_Inf =  (*(static_cast<double *> (DINFINITY)));
 #elif defined (HAVE_INFINITY)
   octave_Inf = infinity ();
-#elif defined (linux)
-  octave_Inf = HUGE_VAL;
 #else
   double tmp = 1e+10;
   octave_Inf = tmp;

--- a/readline/ChangeLog
+++ b/readline/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jan 13 14:59:56 1998  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* readline.h (rl_dispatching): Add missing extern in declaration.
+
 Thu Jul 10 18:26:56 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* acconfig.h: Add #undefs for FIONREAD_IN_SYS_IOCTL,

--- a/readline/readline.h
+++ b/readline/readline.h
@@ -259,7 +259,7 @@
 /* Non-zero if we called this function from _rl_dispatch().  It's present
    so functions can find out whether they were called from a key binding
    or directly from an application. */
-int rl_dispatching;
+extern int rl_dispatching;
 
 /* The name of the terminal to use. */
 extern char *rl_terminal_name;

--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,15 @@
+Thu Jan  8 11:54:33 1998  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* xpow.cc (elem_xpow): If second arg of pow is complex, make sure
+	first arg is also complex.
+
+	* symtab.cc (symbol_table::rename): Properly insert new item at
+	the front of the list to avoid losing the rest of the items.
+
+Thu Dec 11 23:30:03 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* variables.cc (Fclear): Increment index to skip -x arg.
+
 Tue Dec  9 02:45:35 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* Makefile.in (INCLUDES): Don't forget Pix.h.

--- a/src/symtab.cc
+++ b/src/symtab.cc
@@ -405,6 +405,7 @@
 	      prev->chain (ptr->next ());
 
 	      index = hash (new_name);
+	      ptr->chain (table[index].next ());
 	      table[index].chain (ptr);
 
 	      return;

--- a/src/variables.cc
+++ b/src/variables.cc
@@ -1029,7 +1029,10 @@
       if (argc > 1)
 	{
 	  if (argv[idx] == "-x")
-	    exclusive = 1;
+	    {
+	      idx++;
+	      exclusive = 1;
+	    }
 	}
 
       int lcount = 0;

--- a/src/xpow.cc
+++ b/src/xpow.cc
@@ -488,9 +488,10 @@
   int nc = b.cols ();
 
   ComplexMatrix result (nr, nc);
+  Complex atmp (a);
   for (int j = 0; j < nc; j++)
     for (int i = 0; i < nr; i++)
-      result (i, j) = pow (a, b (i, j));
+      result (i, j) = pow (atmp, b (i, j));
 
   return result;
 }
@@ -600,7 +601,7 @@
   ComplexMatrix result (nr, nc);
   for (int j = 0; j < nc; j++)
     for (int i = 0; i < nr; i++)
-      result (i, j) = pow (a (i, j), b);
+      result (i, j) = pow (Complex (a (i, j)), b);
 
   return result;
 }
@@ -624,7 +625,7 @@
   ComplexMatrix result (nr, nc);
   for (int j = 0; j < nc; j++)
     for (int i = 0; i < nr; i++)
-      result (i, j) = pow (a (i, j), b (i, j));
+      result (i, j) = pow (Complex (a (i, j)), b (i, j));
 
   return result;
 }