Mercurial > octave-nkf

changeset 6979:2883ea1c5c18

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2007-10-08 20:23:48 by dbateman]
author dbateman
date Mon, 08 Oct 2007 20:26:01 +0000
parents b75630794a11
children e5d51f9fa1c9
files liboctave/Array2.h liboctave/CMatrix.h liboctave/ChangeLog liboctave/MArray2.h liboctave/boolMatrix.cc liboctave/boolMatrix.h liboctave/chMatrix.cc liboctave/chMatrix.h liboctave/chNDArray.h liboctave/cmd-edit.cc liboctave/cmd-edit.h liboctave/dMatrix.h liboctave/intNDArray.cc liboctave/intNDArray.h liboctave/oct-rl-edit.c liboctave/oct-rl-edit.h scripts/ChangeLog scripts/general/interp2.m src/ChangeLog src/data.cc src/input.cc
diffstat 21 files changed, 935 insertions(+), 177 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/Array2.h	Mon Oct 08 19:41:28 2007 +0000
+++ b/liboctave/Array2.h	Mon Oct 08 20:26:01 2007 +0000
@@ -56,6 +56,11 @@
   Array2 (octave_idx_type r, octave_idx_type c, const T& val)
     : Array<T> (dim_vector (r, c), val) { }
 
+  Array2 (const dim_vector& dv) : Array<T> (dv) { }
+
+  Array2 (const dim_vector& dv, const T& val) 
+    : Array<T> (dv) { Array<T>::fill (val); }
+
   Array2 (const Array2<T>& a) : Array<T> (a, a.dims ()) { }
 
   Array2 (const Array<T>& a, octave_idx_type r, octave_idx_type c)
--- a/liboctave/CMatrix.h	Mon Oct 08 19:41:28 2007 +0000
+++ b/liboctave/CMatrix.h	Mon Oct 08 20:26:01 2007 +0000
@@ -47,6 +47,11 @@
   ComplexMatrix (octave_idx_type r, octave_idx_type c, const Complex& val)
     : MArray2<Complex> (r, c, val) { }
 
+  ComplexMatrix (const dim_vector& dv) : MArray2<Complex> (dv) { }
+
+  ComplexMatrix (const dim_vector& dv, const Complex& val) 
+    : MArray2<Complex> (dv, val) { }
+
   ComplexMatrix (const ComplexMatrix& a) : MArray2<Complex> (a) { }
 
   ComplexMatrix (const MArray2<Complex>& a) : MArray2<Complex> (a) { }
--- a/liboctave/ChangeLog	Mon Oct 08 19:41:28 2007 +0000
+++ b/liboctave/ChangeLog	Mon Oct 08 20:26:01 2007 +0000
@@ -1,3 +1,91 @@
+2007-10-08  David Bateman  <dbateman@free.fr>
+
+	* oct-rl-edit. (typedef rl_quoting_fcn_ptr, rl_dequoting_fcn_ptr,
+	rl_char_is_quoted_fcn_ptr, rl_command_fcn_ptr): New  typedefs
+	for readline compatible functions.
+	(octave_rl_redisplay): Redisplay the current line of text.
+	(octave_rl_newline):  Change interface to the same
+	as used by the equivalent readline function itself.
+	(octave_rl_filename_quoting_desired,
+	octave_rl_set_filename_quote_characters,
+	octave_rl_set_completer_quote_characters,
+	octave_rl_qet_quoting_function, octave_rl_qet_dequoting_function,
+	octave_rl_set_char_is_quoted_function): New functions to control
+	readline filename quoting and line acceptace.
+	* oct-rl-edit.c (octave_rl_newline): Change interface to the same
+	as used by the equivalent readline function itself.
+	(octave_rl_redisplay): Redisplay the current line of text.
+	(octave_rl_filename_quoting_desired,
+	octave_rl_set_filename_quote_characters,
+	octave_rl_set_completer_quote_characters,
+	octave_rl_qet_quoting_function, octave_rl_qet_dequoting_function,
+	octave_rl_set_char_is_quoted_function): New functions to control
+	readline filename quoting and line acceptace.
+	* cmd-edit.h (typedef quoting_fcn, typedef dequoting_fcn,
+	typedef char_is_quoted_fcn, user_accept_line_fcn): New typedefs
+	to map C++ function to readline compatible functions.
+	(set_filename_quote_characters): New function to set the
+	characters to if they appear in a filename that force the filename
+	to be quoted.
+	(set_completer_quote_characters): The characters that the readline
+	completion function considers as quotation characters.
+	(set_quoting_function, set_dequoting_function,
+	set_char_is_quoted_function, set_user_accept_line_function):
+	Functions to set the Octave functions to perform quoting and the
+	acceptance of a line of text by readline.
+	(get_quoting_function, get_dequoting_function,
+	get_char_is_quoted_function, get_user_accept_line_function):
+	Functions to get the above functions.
+	(accept_line): New method for the command_editor to accept a line
+	of text.
+	(file_quoting_desired): Function to set whether readline should
+	attempt to quote filenames.
+	(do_set_filename_quoting_characters, 
+	do_set_completer_quote_characters, do_set_quoting_function,
+	do_set_dequoting_function, do_set_char_is_quoted_function,
+	do_set_user_accept_line_function, do_get_quoting_function,
+	do_get_dequoting_function, do_get_char_is_quoted_function,
+	do_get_user_accept_line_function, do_filename_quoting_desired):
+	Virtual functions to control the behavior of readline quoting and
+	acceptance of lines.
+	(do_accept_line): Virtual function for the accept line function.
+	* cmd-edit.cc (class gnu_readline do_set_filename_quote_characters, 
+	do_completer_quote_characters, do_set_quoting_function,
+	do_set_dequoting_function, do_set_char_is_quoted_function,
+	do_set_user_accept_line_function, do_get_quoting_function,
+	do_get_dequoting_function, do_get_user_accept_line_function, 
+	do_accept_line, do_filename_quoting_desired, command_quoter,
+	command_dequoter, command_char_is_quoted, command_accept_line):
+	New functions in gnu_readline class to control filename quoting 
+	and line acceptance.
+	(quoting_function, dequoting_function, char_is_quoted_function,
+	user_accept_line_function): private variable to store functions
+	supplied for readline quoting and line acceptance.
+	(gnu_readline::gnu_readline): Also set the new function pointers
+	to zero.
+	(gnu_readline::do_newline): Adapt to new octave_rl_newline
+	interface.
+	(gnu_readeline::operate_and_get_next): Use new accept_line
+	function rather than newline.
+	(default_ommand_editor::do_accept_line): New method.
+	(class command_editor set_filename_quote_characters, 
+	set_completer_quote_characters, set_quoting_function,
+	set_dequoting_function, set_char_is_quoted_function,
+	set_user_accept_line_function, get_quoting_function,
+	get_dequoting_function, get_user_accept_line_function, 
+	accept_line, filename_quoting_desired): New functions checking
+	instance before calling virtual function.
+
+	* CMatrix.h, dMatrix.h, boolMatrix.h, chMatrix.h, MArray2.h,
+	Array2.h: Add dim_vector constructors.
+	* charNDArray.h (charNDArray (const dim_vector&)): Add missing
+	const to dim_vector constructors. 
+	* boolMatrix.cc, chMatrix.cc, intNDArray.cc (diag (void), diag
+	(octave_idx_type)): New methods to constructor diagonal matrices.
+	* boolMatrix.h, chMatrix.h, intNDArray.h (diag (void), diag
+	(octave_idx_type)): Declare them.
+
+
 2007-10-06  John W. Eaton  <jwe@octave.org>
 
 	* lo-specfun.cc: (zlgamma): Delete.
--- a/liboctave/MArray2.h	Mon Oct 08 19:41:28 2007 +0000
+++ b/liboctave/MArray2.h	Mon Oct 08 20:26:01 2007 +0000
@@ -51,6 +51,10 @@
 
   MArray2 (octave_idx_type n, octave_idx_type m, const T& val) : Array2<T> (n, m, val) { }
 
+  MArray2 (const dim_vector& dv) : Array2<T> (dv) { }
+
+  MArray2 (const dim_vector& dv, const T& val) : Array2<T> (dv, val) { }
+
   MArray2 (const MArray2<T>& a) : Array2<T> (a) { }
 
   MArray2 (const Array2<T>& a) : Array2<T> (a) { }
--- a/liboctave/boolMatrix.cc	Mon Oct 08 19:41:28 2007 +0000
+++ b/liboctave/boolMatrix.cc	Mon Oct 08 20:26:01 2007 +0000
@@ -77,6 +77,53 @@
 
 // other operations
 
+boolMatrix
+boolMatrix::diag (void) const
+{
+  return diag (0);
+}
+
+boolMatrix
+boolMatrix::diag (octave_idx_type k) const
+{
+  octave_idx_type nnr = rows ();
+  octave_idx_type nnc = cols ();
+  if (k > 0)
+    nnc -= k;
+  else if (k < 0)
+    nnr += k;
+
+  boolMatrix d;
+
+  if (nnr > 0 && nnc > 0)
+    {
+      octave_idx_type ndiag = (nnr < nnc) ? nnr : nnc;
+
+      d.resize (ndiag, 1);
+
+      if (k > 0)
+	{
+	  for (octave_idx_type i = 0; i < ndiag; i++)
+	    d.xelem (i) = elem (i, i+k);
+	}
+      else if (k < 0)
+	{
+	  for (octave_idx_type i = 0; i < ndiag; i++)
+	    d.xelem (i) = elem (i-k, i);
+	}
+      else
+	{
+	  for (octave_idx_type i = 0; i < ndiag; i++)
+	    d.xelem (i) = elem (i, i);
+	}
+    }
+  else
+    (*current_liboctave_error_handler)
+      ("diag: requested diagonal out of range");
+
+  return d;
+}
+
 // FIXME Do these really belong here?  Maybe they should be
 // in a base class?
 
--- a/liboctave/boolMatrix.h	Mon Oct 08 19:41:28 2007 +0000
+++ b/liboctave/boolMatrix.h	Mon Oct 08 20:26:01 2007 +0000
@@ -38,6 +38,8 @@
   boolMatrix (void) : Array2<bool> () { }
   boolMatrix (octave_idx_type r, octave_idx_type c) : Array2<bool> (r, c) { }
   boolMatrix (octave_idx_type r, octave_idx_type c, bool val) : Array2<bool> (r, c, val) { }
+  boolMatrix (const dim_vector& dv) : Array2<bool> (dv) { }
+  boolMatrix (const dim_vector& dv, bool val) : Array2<bool> (dv, val) { }
   boolMatrix (const Array2<bool>& a) : Array2<bool> (a) { }
   boolMatrix (const boolMatrix& a) : Array2<bool> (a) { }
 
@@ -62,6 +64,9 @@
 
   // other operations
 
+  boolMatrix diag (void) const;
+  boolMatrix diag (octave_idx_type k) const;
+
   boolMatrix all (int dim = -1) const;
   boolMatrix any (int dim = -1) const;
 
--- a/liboctave/chMatrix.cc	Mon Oct 08 19:41:28 2007 +0000
+++ b/liboctave/chMatrix.cc	Mon Oct 08 20:26:01 2007 +0000
@@ -189,6 +189,53 @@
   return result;
 }
 
+charMatrix
+charMatrix::diag (void) const
+{
+  return diag (0);
+}
+
+charMatrix
+charMatrix::diag (octave_idx_type k) const
+{
+  octave_idx_type nnr = rows ();
+  octave_idx_type nnc = cols ();
+  if (k > 0)
+    nnc -= k;
+  else if (k < 0)
+    nnr += k;
+
+  charMatrix d;
+
+  if (nnr > 0 && nnc > 0)
+    {
+      octave_idx_type ndiag = (nnr < nnc) ? nnr : nnc;
+
+      d.resize (ndiag, 1);
+
+      if (k > 0)
+	{
+	  for (octave_idx_type i = 0; i < ndiag; i++)
+	    d.xelem (i) = elem (i, i+k);
+	}
+      else if (k < 0)
+	{
+	  for (octave_idx_type i = 0; i < ndiag; i++)
+	    d.xelem (i) = elem (i-k, i);
+	}
+      else
+	{
+	  for (octave_idx_type i = 0; i < ndiag; i++)
+	    d.xelem (i) = elem (i, i);
+	}
+    }
+  else
+    (*current_liboctave_error_handler)
+      ("diag: requested diagonal out of range");
+
+  return d;
+}
+
 // FIXME Do these really belong here?  Maybe they should be
 // in a base class?
 
--- a/liboctave/chMatrix.h	Mon Oct 08 19:41:28 2007 +0000
+++ b/liboctave/chMatrix.h	Mon Oct 08 20:26:01 2007 +0000
@@ -42,6 +42,8 @@
   charMatrix (void) : MArray2<char> () { }
   charMatrix (octave_idx_type r, octave_idx_type c) : MArray2<char> (r, c) { }
   charMatrix (octave_idx_type r, octave_idx_type c, char val) : MArray2<char> (r, c, val) { }
+  charMatrix (const dim_vector& dv) : MArray2<char> (dv) { }
+  charMatrix (const dim_vector& dv, char val) : MArray2<char> (dv, val) { }
   charMatrix (const MArray2<char>& a) : MArray2<char> (a) { }
   charMatrix (const charMatrix& a) : MArray2<char> (a) { }
   charMatrix (char c);
@@ -71,6 +73,9 @@
 
   charMatrix extract (octave_idx_type r1, octave_idx_type c1, octave_idx_type r2, octave_idx_type c2) const;
 
+  charMatrix diag (void) const;
+  charMatrix diag (octave_idx_type k) const;
+
   boolMatrix all (int dim = -1) const;
   boolMatrix any (int dim = -1) const;
 
--- a/liboctave/chNDArray.h	Mon Oct 08 19:41:28 2007 +0000
+++ b/liboctave/chNDArray.h	Mon Oct 08 20:26:01 2007 +0000
@@ -38,9 +38,9 @@
 
   charNDArray (void) : MArrayN<char> () { }
 
-  charNDArray (dim_vector& dv) : MArrayN<char> (dv) { }
+  charNDArray (const dim_vector& dv) : MArrayN<char> (dv) { }
 
-  charNDArray (dim_vector& dv, char val) : MArrayN<char> (dv, val) { }
+  charNDArray (const dim_vector& dv, char val) : MArrayN<char> (dv, val) { }
   
   charNDArray (const charNDArray& a) : MArrayN<char> (a) { }
 
--- a/liboctave/cmd-edit.cc	Mon Oct 08 19:41:28 2007 +0000
+++ b/liboctave/cmd-edit.cc	Mon Oct 08 20:26:01 2007 +0000
@@ -107,12 +107,32 @@
 
   void do_set_basic_quote_characters (const std::string& s);
 
+  void do_set_filename_quote_characters (const std::string& s);
+
+  void do_set_completer_quote_characters (const std::string& s);
+
   void do_set_completion_append_character (char c);
 
   void do_set_completion_function (completion_fcn f);
 
+  void do_set_quoting_function (quoting_fcn f);
+
+  void do_set_dequoting_function (dequoting_fcn f);
+
+  void do_set_char_is_quoted_function (char_is_quoted_fcn f);
+
+  void do_set_user_accept_line_function (user_accept_line_fcn f);
+
   completion_fcn do_get_completion_function (void) const;
 
+  quoting_fcn do_get_quoting_function (void) const;
+
+  dequoting_fcn do_get_dequoting_function (void) const;
+
+  char_is_quoted_fcn do_get_char_is_quoted_function (void) const;
+
+  user_accept_line_fcn do_get_user_accept_line_function (void) const;
+
   string_vector
   do_generate_filename_completions (const std::string& text);
 
@@ -120,6 +140,8 @@
 
   void do_newline (void);
 
+  void do_accept_line (void);
+
   void do_clear_undo_list (void);
 
   void set_startup_hook (startup_hook_fcn f);
@@ -136,6 +158,8 @@
 
   bool do_filename_completion_desired (bool);
 
+  bool do_filename_quoting_desired (bool);
+
   static int operate_and_get_next (int, int);
 
   static int history_search_backward (int, int);
@@ -150,14 +174,31 @@
 
   completion_fcn completion_function;
 
+  quoting_fcn quoting_function;
+
+  dequoting_fcn dequoting_function;
+
+  char_is_quoted_fcn char_is_quoted_function;
+
+  user_accept_line_fcn user_accept_line_function;
+
   static char *command_generator (const char *text, int state);
 
+  static char *command_quoter (char *text, int match_type, char *quote_pointer);
+  static char *command_dequoter (char *text, int match_type);
+
+  static int command_char_is_quoted (char *text, int index);
+
+  static int command_accept_line (int count, int key);
+
   static char **command_completer (const char *text, int start, int end);
 };
 
 gnu_readline::gnu_readline ()
   : command_editor (), previous_startup_hook (0),
-    previous_event_hook (0), completion_function (0)
+    previous_event_hook (0), completion_function (0),
+    quoting_function (0), dequoting_function (0),
+    char_is_quoted_function (0), user_accept_line_function (0)
 {
   // FIXME -- need interface to rl_add_defun, rl_initialize, and
   // a function to set rl_terminal_name
@@ -187,8 +228,6 @@
 		       octave_rl_meta ('N'));
 }
 
-
-
 void
 gnu_readline::do_set_name (const std::string& nm)
 {
@@ -319,6 +358,18 @@
 }
 
 void
+gnu_readline::do_set_filename_quote_characters (const std::string& s)
+{
+  ::octave_rl_set_filename_quote_characters (s.c_str ());
+}
+
+void
+gnu_readline::do_set_completer_quote_characters (const std::string& s)
+{
+  ::octave_rl_set_completer_quote_characters (s.c_str ());
+}
+
+void
 gnu_readline::do_set_completion_append_character (char c)
 {
   ::octave_rl_set_completion_append_character (c);
@@ -335,12 +386,82 @@
   ::octave_rl_set_completion_function (fp);
 }
 
+void
+gnu_readline::do_set_quoting_function (quoting_fcn f)
+{
+  quoting_function = f;
+
+  rl_quoting_fcn_ptr fp
+    = f ? gnu_readline::command_quoter : 0;
+
+  ::octave_rl_set_quoting_function (fp);
+}
+
+void
+gnu_readline::do_set_dequoting_function (dequoting_fcn f)
+{
+  dequoting_function = f;
+
+  rl_dequoting_fcn_ptr fp
+    = f ? gnu_readline::command_dequoter : 0;
+
+  ::octave_rl_set_dequoting_function (fp);
+}
+
+void
+gnu_readline::do_set_char_is_quoted_function (char_is_quoted_fcn f)
+{
+  char_is_quoted_function = f;
+
+  rl_char_is_quoted_fcn_ptr fp
+    = f ? gnu_readline::command_char_is_quoted : 0;
+
+  ::octave_rl_set_char_is_quoted_function (fp);
+}
+
+void
+gnu_readline::do_set_user_accept_line_function (user_accept_line_fcn f)
+{
+  user_accept_line_function = f;
+
+  if (f)
+    octave_rl_add_defun ("accept-line", gnu_readline::command_accept_line, 
+			 ::octave_rl_ctrl ('M'));
+  else
+    octave_rl_add_defun ("accept-line", ::octave_rl_newline,
+			 ::octave_rl_ctrl ('M'));
+}
+
 gnu_readline::completion_fcn
 gnu_readline::do_get_completion_function (void) const
 {
   return completion_function;
 }
 
+gnu_readline::quoting_fcn
+gnu_readline::do_get_quoting_function (void) const
+{
+  return quoting_function;
+}
+
+gnu_readline::dequoting_fcn
+gnu_readline::do_get_dequoting_function (void) const
+{
+  return dequoting_function;
+}
+
+gnu_readline::char_is_quoted_fcn
+gnu_readline::do_get_char_is_quoted_function (void) const
+{
+  return char_is_quoted_function;
+}
+
+gnu_readline::user_accept_line_fcn
+gnu_readline::do_get_user_accept_line_function (void) const
+{
+  return user_accept_line_function;
+}
+
 string_vector
 gnu_readline::do_generate_filename_completions (const std::string& text)
 {
@@ -389,7 +510,13 @@
 void
 gnu_readline::do_newline (void)
 {
-  ::octave_rl_newline ();
+  ::octave_rl_newline (1, '\n');
+}
+
+void
+gnu_readline::do_accept_line (void)
+{
+  command_accept_line (1, '\n');
 }
 
 void
@@ -439,12 +566,18 @@
   return ::octave_rl_filename_completion_desired (arg);
 }
 
+bool
+gnu_readline::do_filename_quoting_desired (bool arg)
+{
+  return ::octave_rl_filename_quoting_desired (arg);
+}
+
 int
 gnu_readline::operate_and_get_next (int /* count */, int /* c */)
 {
   // Accept the current line.
 
-  command_editor::newline ();
+  command_editor::accept_line ();
 
   // Find the current line, and find the next line to use.
 
@@ -497,6 +630,69 @@
   return retval;
 }
 
+char *
+gnu_readline::command_quoter (char *text, int matches, char *qcp)
+{
+  char *retval = 0;
+
+  quoting_fcn f = command_editor::get_quoting_function ();
+
+  std::string tmp = f (text, matches, *qcp);
+
+  size_t len = tmp.length ();
+
+  if (len > 0)
+    {
+      retval = static_cast<char *> (malloc (len+1));
+
+      strcpy (retval, tmp.c_str ());
+    }
+
+  return retval;
+}
+
+char *
+gnu_readline::command_dequoter (char *text, int quote)
+{
+  char *retval = 0;
+
+  dequoting_fcn f = command_editor::get_dequoting_function ();
+
+  std::string tmp = f (text, quote);
+
+  size_t len = tmp.length ();
+
+  if (len > 0)
+    {
+      retval = static_cast<char *> (malloc (len+1));
+
+      strcpy (retval, tmp.c_str ());
+    }
+
+  return retval;
+}
+
+int
+gnu_readline::command_char_is_quoted (char *text, int quote)
+{
+  char_is_quoted_fcn f = command_editor::get_char_is_quoted_function ();
+
+  return f (text, quote);
+}
+
+int
+gnu_readline::command_accept_line (int count, int key)
+{
+  user_accept_line_fcn f = command_editor::get_user_accept_line_function ();
+
+  if (f)
+    f (::octave_rl_line_buffer ());
+
+  ::octave_rl_redisplay ();
+
+  return ::octave_rl_newline (count, key);
+}
+
 char **
 gnu_readline::command_completer (const char *text, int, int)
 {
@@ -534,6 +730,8 @@
 
   void do_newline (void);
 
+  void do_accept_line (void);
+
 private:
 
   FILE *input_stream;
@@ -593,6 +791,12 @@
   // FIXME
 }
 
+void
+default_command_editor::do_accept_line (void)
+{
+  // FIXME
+}
+
 bool
 command_editor::instance_ok (void)
 {
@@ -794,6 +998,20 @@
 }
 
 void
+command_editor::set_filename_quote_characters (const std::string& s)
+{
+  if (instance_ok ())
+    instance->do_set_filename_quote_characters (s);
+}
+
+void
+command_editor::set_completer_quote_characters (const std::string& s)
+{
+  if (instance_ok ())
+    instance->do_set_completer_quote_characters (s);
+}
+
+void
 command_editor::set_completion_append_character (char c)
 {
   if (instance_ok ())
@@ -807,6 +1025,34 @@
     instance->do_set_completion_function (f);
 }
 
+void
+command_editor::set_quoting_function (quoting_fcn f)
+{
+  if (instance_ok ())
+    instance->do_set_quoting_function (f);
+}
+
+void
+command_editor::set_dequoting_function (dequoting_fcn f)
+{
+  if (instance_ok ())
+    instance->do_set_dequoting_function (f);
+}
+
+void
+command_editor::set_char_is_quoted_function (char_is_quoted_fcn f)
+{
+  if (instance_ok ())
+    instance->do_set_char_is_quoted_function (f);
+}
+
+void
+command_editor::set_user_accept_line_function (user_accept_line_fcn f)
+{
+  if (instance_ok ())
+    instance->do_set_user_accept_line_function (f);
+}
+
 command_editor::completion_fcn
 command_editor::get_completion_function (void)
 {
@@ -814,6 +1060,34 @@
     ? instance->do_get_completion_function () : 0;
 }
 
+command_editor::quoting_fcn
+command_editor::get_quoting_function (void)
+{
+  return (instance_ok ())
+    ? instance->do_get_quoting_function () : 0;
+}
+
+command_editor::dequoting_fcn
+command_editor::get_dequoting_function (void)
+{
+  return (instance_ok ())
+    ? instance->do_get_dequoting_function () : 0;
+}
+
+command_editor::char_is_quoted_fcn
+command_editor::get_char_is_quoted_function (void)
+{
+  return (instance_ok ())
+    ? instance->do_get_char_is_quoted_function () : 0;
+}
+
+command_editor::user_accept_line_fcn
+command_editor::get_user_accept_line_function (void)
+{
+  return (instance_ok ())
+    ? instance->do_get_user_accept_line_function () : 0;
+}
+
 string_vector
 command_editor::generate_filename_completions (const std::string& text)
 {
@@ -836,6 +1110,13 @@
 }
 
 void
+command_editor::accept_line (void)
+{
+  if (instance_ok ())
+    instance->do_accept_line ();
+}
+
+void
 command_editor::clear_undo_list (void)
 {
   if (instance_ok ())
@@ -912,6 +1193,13 @@
     ? instance->do_filename_completion_desired (arg) : false;
 }
 
+bool
+command_editor::filename_quoting_desired (bool arg)
+{
+  return (instance_ok ())
+    ? instance->do_filename_quoting_desired (arg) : false;
+}
+
 // Return a string which will be printed as a prompt.  The string may
 // contain special characters which are decoded as follows: 
 //   
--- a/liboctave/cmd-edit.h	Mon Oct 08 19:41:28 2007 +0000
+++ b/liboctave/cmd-edit.h	Mon Oct 08 20:26:01 2007 +0000
@@ -48,6 +48,14 @@
 
   typedef std::string (*completion_fcn) (const std::string&, int);
 
+  typedef std::string (*quoting_fcn) (const std::string&, int, char);
+
+  typedef std::string (*dequoting_fcn) (const std::string&, int);
+
+  typedef int (*char_is_quoted_fcn) (const std::string&, int);
+
+  typedef void (*user_accept_line_fcn) (const std::string&);
+
   virtual ~command_editor (void) { }
 
   static void set_name (const std::string& n);
@@ -84,18 +92,40 @@
 
   static void set_basic_quote_characters (const std::string& s);
 
+  static void set_filename_quote_characters (const std::string& s);
+
+  static void set_completer_quote_characters (const std::string& s);
+
   static void set_completion_append_character (char c);
 
   static void set_completion_function (completion_fcn f);
 
+  static void set_quoting_function (quoting_fcn f);
+
+  static void set_dequoting_function (dequoting_fcn f);
+
+  static void set_char_is_quoted_function (char_is_quoted_fcn f);
+
+  static void set_user_accept_line_function (user_accept_line_fcn f);
+
   static completion_fcn get_completion_function (void);
 
+  static quoting_fcn get_quoting_function (void);
+
+  static dequoting_fcn get_dequoting_function (void);
+
+  static char_is_quoted_fcn get_char_is_quoted_function (void);
+
+  static user_accept_line_fcn get_user_accept_line_function (void);
+
   static string_vector generate_filename_completions (const std::string& text);
 
   static void insert_text (const std::string& text);
 
   static void newline (void);
 
+  static void accept_line (void);
+
   static void clear_undo_list (void);
 
   static void add_startup_hook (startup_hook_fcn f);
@@ -110,6 +140,8 @@
 
   static bool filename_completion_desired (bool);
 
+  static bool filename_quoting_desired (bool);
+
   static int current_command_number (void);
 
   static void reset_current_command_number (int n);
@@ -192,18 +224,40 @@
 
   virtual void do_set_basic_quote_characters (const std::string&) { }
 
+  virtual void do_set_filename_quote_characters (const std::string&) { }
+
+  virtual void do_set_completer_quote_characters (const std::string&) { }
+
   virtual void do_set_completion_append_character (char) { }
 
   virtual void do_set_completion_function (completion_fcn) { }
 
+  virtual void do_set_quoting_function (quoting_fcn) { }
+
+  virtual void do_set_dequoting_function (dequoting_fcn) { }
+
+  virtual void do_set_char_is_quoted_function (char_is_quoted_fcn) { }
+
+  virtual void do_set_user_accept_line_function (user_accept_line_fcn) { }
+
   virtual completion_fcn do_get_completion_function (void) const { return 0; }
 
+  virtual quoting_fcn do_get_quoting_function (void) const { return 0; }
+
+  virtual dequoting_fcn do_get_dequoting_function (void) const { return 0; }
+
+  virtual char_is_quoted_fcn do_get_char_is_quoted_function (void) const { return 0; }
+
+  virtual user_accept_line_fcn do_get_user_accept_line_function (void) const { return 0; }
+
   virtual string_vector do_generate_filename_completions (const std::string& text) = 0;
 
   virtual void do_insert_text (const std::string&) = 0;
 
   virtual void do_newline (void) = 0;
 
+  virtual void do_accept_line (void) = 0;
+
   virtual void do_clear_undo_list (void) { }
 
   virtual void set_startup_hook (startup_hook_fcn) { }
@@ -218,6 +272,8 @@
 
   virtual bool do_filename_completion_desired (bool) { return false; }
 
+  virtual bool do_filename_quoting_desired (bool) { return false; }
+
   int read_octal (const std::string& s);
 
   void error (int);
--- a/liboctave/dMatrix.h	Mon Oct 08 19:41:28 2007 +0000
+++ b/liboctave/dMatrix.h	Mon Oct 08 20:26:01 2007 +0000
@@ -45,6 +45,10 @@
 
   Matrix (octave_idx_type r, octave_idx_type c, double val) : MArray2<double> (r, c, val) { }
 
+  Matrix (const dim_vector& dv) : MArray2<double> (dv) { }
+
+  Matrix (const dim_vector& dv, double val) : MArray2<double> (dv, val) { }
+
   Matrix (const Matrix& a) : MArray2<double> (a) { }
 
   Matrix (const MArray2<double>& a) : MArray2<double> (a) { }
--- a/liboctave/intNDArray.cc	Mon Oct 08 19:41:28 2007 +0000
+++ b/liboctave/intNDArray.cc	Mon Oct 08 20:26:01 2007 +0000
@@ -61,6 +61,68 @@
   return false;
 }
 
+
+template <class T>
+intNDArray<T>
+intNDArray<T>::diag (void) const
+{
+  return diag (0);
+}
+
+template <class T>
+intNDArray<T>
+intNDArray<T>::diag (octave_idx_type k) const
+{
+  dim_vector dv = this->dims ();
+  octave_idx_type nd = dv.length ();
+
+  if (nd > 2)
+    {
+      (*current_liboctave_error_handler) ("Matrix must be 2-dimensional");    
+      return intNDArray<T>();
+    }
+  else
+    {
+      octave_idx_type nnr = dv (0);
+      octave_idx_type nnc = dv (1);
+
+      if (k > 0)
+	nnc -= k;
+      else if (k < 0)
+	nnr += k;
+
+      intNDArray<T> d;
+
+      if (nnr > 0 && nnc > 0)
+	{
+	  octave_idx_type ndiag = (nnr < nnc) ? nnr : nnc;
+
+	  d.resize (dim_vector (ndiag, 1));
+
+	  if (k > 0)
+	    {
+	      for (octave_idx_type i = 0; i < ndiag; i++)
+		d.xelem (i) = this->elem (i, i+k);
+	    }
+	  else if (k < 0)
+	    {
+	      for (octave_idx_type i = 0; i < ndiag; i++)
+		d.xelem (i) = this->elem (i-k, i);
+	    }
+	  else
+	    {
+	      for (octave_idx_type i = 0; i < ndiag; i++)
+		d.xelem (i) = this->elem (i, i);
+	    }
+	}
+      else
+	(*current_liboctave_error_handler)
+	  ("diag: requested diagonal out of range");
+
+      return d;
+    }
+}
+
 // FIXME -- this is not quite the right thing.
 
 template <class T>
--- a/liboctave/intNDArray.h	Mon Oct 08 19:41:28 2007 +0000
+++ b/liboctave/intNDArray.h	Mon Oct 08 20:26:01 2007 +0000
@@ -66,6 +66,9 @@
 
   bool any_element_not_one_or_zero (void) const;
 
+  intNDArray diag (void) const;
+  intNDArray diag (octave_idx_type k) const;
+
   // FIXME -- this is not quite the right thing.
 
   boolNDArray all (int dim = -1) const;
--- a/liboctave/oct-rl-edit.c	Mon Oct 08 19:41:28 2007 +0000
+++ b/liboctave/oct-rl-edit.c	Mon Oct 08 20:26:01 2007 +0000
@@ -47,6 +47,12 @@
  \
   strcpy (ss, s)
 
+void
+octave_rl_redisplay (void)
+{
+  rl_redisplay ();
+}
+
 int
 octave_rl_screen_height (void)
 {
@@ -118,10 +124,16 @@
   rl_insert_text (s);
 }
 
-void
-octave_rl_newline (void)
+int
+octave_rl_newline (int count, int key)
 {
-  rl_newline (1, '\n');
+  return rl_newline (count, key);
+}
+
+const char *
+octave_rl_line_buffer (void)
+{
+  return rl_line_buffer;
 }
 
 void
@@ -196,6 +208,14 @@
   return retval;
 }
 
+int
+octave_rl_filename_quoting_desired (int arg)
+{
+  int retval = rl_filename_quoting_desired;
+  rl_filename_quoting_desired = arg;
+  return retval;
+}
+
 char *
 octave_rl_filename_completion_function (const char *text, int state)
 {
@@ -227,6 +247,22 @@
 }
 
 void
+octave_rl_set_filename_quote_characters (const char *s)
+{
+  OCTAVE_RL_SAVE_STRING (ss, s);
+
+  rl_filename_quote_characters = ss;
+}
+
+void
+octave_rl_set_completer_quote_characters (const char *s)
+{
+  OCTAVE_RL_SAVE_STRING (ss, s);
+
+  rl_completer_quote_characters = ss;
+}
+
+void
 octave_rl_set_completion_append_character (char c)
 {
   rl_completion_append_character = c;
@@ -239,6 +275,24 @@
 }
 
 void
+octave_rl_set_quoting_function (rl_quoting_fcn_ptr f)
+{
+  rl_filename_quoting_function = f;
+}
+
+void
+octave_rl_set_dequoting_function (rl_dequoting_fcn_ptr f)
+{
+  rl_filename_dequoting_function = f;
+}
+
+void
+octave_rl_set_char_is_quoted_function (rl_char_is_quoted_fcn_ptr f)
+{
+  rl_char_is_quoted_p = f;
+}
+
+void
 octave_rl_set_startup_hook (rl_startup_hook_fcn_ptr f)
 {
   rl_startup_hook = f;
--- a/liboctave/oct-rl-edit.h	Mon Oct 08 19:41:28 2007 +0000
+++ b/liboctave/oct-rl-edit.h	Mon Oct 08 20:26:01 2007 +0000
@@ -34,11 +34,21 @@
 
 typedef char * (*rl_completer_fcn_ptr) (const char *, int);
 
+typedef char * (*rl_quoting_fcn_ptr) (char *, int, char *);
+
+typedef char * (*rl_dequoting_fcn_ptr) (char *, int);
+
+typedef int (*rl_char_is_quoted_fcn_ptr) (char *, int);
+
+typedef int (*rl_command_fcn_ptr) (int, int);
+
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
+  extern void octave_rl_redisplay (void);
+
 extern int octave_rl_screen_height (void);
 
 extern int octave_rl_screen_width (void);
@@ -55,7 +65,9 @@
 
 extern void octave_rl_insert_text (const char *);
 
-extern void octave_rl_newline (void);
+extern int octave_rl_newline (int, int);
+
+extern const char *octave_rl_line_buffer (void);
 
 extern void octave_rl_clear_undo_list (void);
 
@@ -75,6 +87,8 @@
 
 extern int octave_rl_filename_completion_desired (int);
 
+extern int octave_rl_filename_quoting_desired (int);
+
 extern char *octave_rl_filename_completion_function (const char *, int);
 
 extern void octave_rl_set_basic_word_break_characters (const char *);
@@ -83,11 +97,23 @@
 
 extern void octave_rl_set_basic_quote_characters (const char *);
 
+extern void octave_rl_set_filename_quote_characters (const char *);
+
+extern void octave_rl_set_completer_quote_characters (const char *);
+
 extern void octave_rl_set_completion_append_character (char);
 
 extern void
 octave_rl_set_completion_function (rl_attempted_completion_fcn_ptr);
 
+extern void
+octave_rl_set_quoting_function (rl_quoting_fcn_ptr);
+
+extern void
+octave_rl_set_dequoting_function (rl_dequoting_fcn_ptr);
+
+extern void octave_rl_set_char_is_quoted_function (rl_char_is_quoted_fcn_ptr);
+
 extern void octave_rl_set_startup_hook (rl_startup_hook_fcn_ptr);
 
 extern rl_startup_hook_fcn_ptr octave_rl_get_startup_hook (void);
--- a/scripts/ChangeLog	Mon Oct 08 19:41:28 2007 +0000
+++ b/scripts/ChangeLog	Mon Oct 08 20:26:01 2007 +0000
@@ -1,3 +1,8 @@
+2007-10-08  David Bateman  <dbateman@free.fr>
+
+	* general/interp2.m: Relax test for values outside the grid to
+	allow monotonically decreasing abscissa as well.
+
 2007-10-08  Ben Abbott <bpabbott@mac.com>
 
 	* polynomial/residue.m: Doc fix.  Add tests.  Restore multiplicity
--- a/scripts/general/interp2.m	Mon Oct 08 19:41:28 2007 +0000
+++ b/scripts/general/interp2.m	Mon Oct 08 20:26:01 2007 +0000
@@ -219,7 +219,28 @@
     endif
 
     ## set points outside the table to 'extrapval'
-    ZI (XI < X(1,1) | XI > X(1,end) | YI < Y(1,1) | YI > Y(end,1)) = extrapval;
+    if (X (1, 1) < X (1, end))
+      if (Y (1, 1) < Y (end, 1))
+        ZI (XI < X(1,1) | XI > X(1,end) | YI < Y(1,1) | YI > Y(end,1)) = ...
+		extrapval;
+	disp("1\n");
+      else
+        ZI (XI < X(1,1) | XI > X(1,end) | YI < Y(end,1) | YI > Y(1,1)) = ...
+		extrapval;
+	disp("2\n");
+      endif
+    else
+      if (Y (1, 1) < Y (end, 1))
+        ZI (XI < X(1,end) | XI > X(1,1) | YI < Y(1,1) | YI > Y(end,1)) = ...
+		extrapval;
+	disp("3\n");
+      else
+        ZI (XI < X(1,end) | XI > X(1,1) | YI < Y(end,1) | YI > Y(1,1)) = ...
+		extrapval;
+	disp("4\n");
+      endif
+    endif
+
     ZI = reshape (ZI, shape);
   else
 
--- a/src/ChangeLog	Mon Oct 08 19:41:28 2007 +0000
+++ b/src/ChangeLog	Mon Oct 08 20:26:01 2007 +0000
@@ -1,3 +1,19 @@
+2007-10-08  David Bateman  <dbateman@free.fr>
+
+	*  input.cc (quoting_filename): Function to add a leading quote to
+	a string if needed.
+	(accept_line): Function to check if a string needs a closing quote
+	before calling the rl_newline function.
+	(initialize_command_input): Initialize completer_quote_characters,
+	filename_quote_characters, quoting_function,
+	user_accept_line_function.
+
+	* data.cc (template <class T> static make_diag (...)): New
+	template class version of make_diag. Make other make_diag
+	functions depend on it.
+	( static octave_value make_diag (const octave_value&, 
+	octave_idx_type)): Treat all possible internal Octave types.
+
 2007-10-08  John W. Eaton  <jwe@octave.org>
 
 	* load-save.cc 	(save_vars, dump_octave_core):
--- a/src/data.cc	Mon Oct 08 19:41:28 2007 +0000
+++ b/src/data.cc	Mon Oct 08 20:26:01 2007 +0000
@@ -433,89 +433,160 @@
   DATA_REDUCTION (cumsum);
 }
 
-// FIXME -- we could eliminate some duplicate code here with
-// some template functions or macros.
-
+template <class T>
 static octave_value
-make_diag (const Matrix& v, octave_idx_type k)
+make_diag (const T& v, octave_idx_type k)
 {
-  octave_idx_type nr = v.rows ();
-  octave_idx_type nc = v.columns ();
-  assert (nc == 1 || nr == 1);
-
   octave_value retval;
-
-  octave_idx_type roff = 0;
-  octave_idx_type coff = 0;
-  if (k > 0)
-    {
-      roff = 0;
-      coff = k;
-    }
-  else if (k < 0)
-    {
-      roff = -k;
-      coff = 0;
-    }
-
-  if (nr == 1)
-    {
-      octave_idx_type n = nc + std::abs (k);
-      Matrix m (n, n, 0.0);
-      for (octave_idx_type i = 0; i < nc; i++)
-	m (i+roff, i+coff) = v (0, i);
-      retval = m;
-    }
+  dim_vector dv = v.dims ();
+  octave_idx_type nd = dv.length ();
+
+  if (nd > 2)
+    error ("diag: expecting 2-dimensional matrix");
   else
     {
-      octave_idx_type n = nr + std::abs (k);
-      Matrix m (n, n, 0.0);
-      for (octave_idx_type i = 0; i < nr; i++)
-	m (i+roff, i+coff) = v (i, 0);
-      retval = m;
+      octave_idx_type nr = dv (0);
+      octave_idx_type nc = dv (1);
+
+      if (nr == 0 || nc == 0)
+	retval = T ();
+      else if (nr != 1 && nc != 1)
+	retval = v.diag (k);
+      else
+	{
+	  octave_idx_type roff = 0;
+	  octave_idx_type coff = 0;
+	  if (k > 0)
+	    {
+	      roff = 0;
+	      coff = k;
+	    }
+	  else if (k < 0)
+	    {
+	      roff = -k;
+	      coff = 0;
+	    }
+
+	  if (nr == 1)
+	    {
+	      octave_idx_type n = nc + std::abs (k);
+	      T m (dim_vector (n, n), T::resize_fill_value ());
+
+	      for (octave_idx_type i = 0; i < nc; i++)
+		m (i+roff, i+coff) = v (0, i);
+	      retval = m;
+	    }
+	  else
+	    {
+	      octave_idx_type n = nr + std::abs (k);
+	      T m (dim_vector (n, n), T::resize_fill_value ());
+	      for (octave_idx_type i = 0; i < nr; i++)
+		m (i+roff, i+coff) = v (i, 0);
+	      retval = m;
+	    }
+	}
     }
-
+  
   return retval;
 }
 
+#if !defined (CXX_NEW_FRIEND_TEMPLATE_DECL)
+static octave_value
+make_diag (const Matrix& v, octave_idx_type k);
+
+static octave_value
+make_diag (const ComplexMatrix& v, octave_idx_type k);
+
+static octave_value
+make_diag (const charMatrix& v, octave_idx_type k);
+
+static octave_value
+make_diag (const boolMatrix& v, octave_idx_type k);
+
+static octave_value
+make_diag (const int8NDArray& v, octave_idx_type k);
+
+static octave_value
+make_diag (const int16NDArray& v, octave_idx_type k);
+
+static octave_value
+make_diag (const int32NDArray& v, octave_idx_type k);
+
+static octave_value
+make_diag (const int64NDArray& v, octave_idx_type k);
+
 static octave_value
-make_diag (const ComplexMatrix& v, octave_idx_type k)
+make_diag (const uint8NDArray& v, octave_idx_type k);
+
+static octave_value
+make_diag (const uint16NDArray& v, octave_idx_type k);
+
+static octave_value
+make_diag (const uint32NDArray& v, octave_idx_type k);
+
+static octave_value
+make_diag (const uint64NDArray& v, octave_idx_type k);
+#endif
+
+static octave_value
+make_diag (const octave_value& a, octave_idx_type k)
 {
-  octave_idx_type nr = v.rows ();
-  octave_idx_type nc = v.columns ();
-  assert (nc == 1 || nr == 1);
-
   octave_value retval;
-
-  octave_idx_type roff = 0;
-  octave_idx_type coff = 0;
-  if (k > 0)
-    {
-      roff = 0;
-      coff = k;
-    }
-  else if (k < 0)
+  std::string result_type = a.class_name ();
+
+  if (result_type == "double")
     {
-      roff = -k;
-      coff = 0;
+      if (a.is_real_type ())
+	{
+	  Matrix m = a.matrix_value ();
+	  if (!error_state)
+	    retval = make_diag (m, k);
+	}
+      else
+	{
+	  ComplexMatrix m = a.complex_matrix_value ();
+	  if (!error_state)
+	    retval = make_diag (m, k);
+	}
     }
-
-  if (nr == 1)
+#if 0
+  else if (result_type == "single")
+    retval = make_diag (a.single_array_value (), k);
+#endif
+  else if (result_type == "char")
     {
-      octave_idx_type n = nc + std::abs (k);
-      ComplexMatrix m (n, n, 0.0);
-      for (octave_idx_type i = 0; i < nc; i++)
-	m (i+roff, i+coff) = v (0, i);
-      retval = m;
+      charMatrix m = a.char_matrix_value ();
+      if (!error_state)
+	{
+	  retval = make_diag (m, k);
+	  if (a.is_sq_string ())
+	    retval = octave_value (retval.char_array_value (), true, '\'');
+	}
+    }
+  else if (result_type == "logical")
+    {
+      boolMatrix m = a.bool_matrix_value ();
+      if (!error_state)
+	retval = make_diag (m, k);
     }
+  else if (result_type == "int8")
+    retval = make_diag (a.int8_array_value (), k);
+  else if (result_type == "int16")
+    retval = make_diag (a.int16_array_value (), k);
+  else if (result_type == "int32")
+    retval = make_diag (a.int32_array_value (), k);
+  else if (result_type == "int64")
+    retval = make_diag (a.int64_array_value (), k);
+  else if (result_type == "uint8")
+    retval = make_diag (a.uint8_array_value (), k);
+  else if (result_type == "uint16")
+    retval = make_diag (a.uint16_array_value (), k);
+  else if (result_type == "uint32")
+    retval = make_diag (a.uint32_array_value (), k);
+  else if (result_type == "uint64")
+    retval = make_diag (a.uint64_array_value (), k);
   else
-    {
-      octave_idx_type n = nr + std::abs (k);
-      ComplexMatrix m (n, n, 0.0);
-      for (octave_idx_type i = 0; i < nr; i++)
-	m (i+roff, i+coff) = v (i, 0);
-      retval = m;
-    }
+    gripe_wrong_type_arg ("diag", a);
 
   return retval;
 }
@@ -523,58 +594,7 @@
 static octave_value
 make_diag (const octave_value& arg)
 {
-  octave_value retval;
-
-  if (arg.is_real_type ())
-    {
-      Matrix m = arg.matrix_value ();
-
-      if (! error_state)
-	{
-	  octave_idx_type nr = m.rows ();
-	  octave_idx_type nc = m.columns ();
-
-	  if (nr == 0 || nc == 0)
-	    retval = Matrix ();
-	  else if (nr == 1 || nc == 1)
-	    retval = make_diag (m, 0);
-	  else
-	    {
-	      ColumnVector v = m.diag ();
-	      if (v.numel () > 0)
-		retval = v;
-	    }
-	}
-      else
-	gripe_wrong_type_arg ("diag", arg);
-    }
-  else if (arg.is_complex_type ())
-    {
-      ComplexMatrix cm = arg.complex_matrix_value ();
-
-      if (! error_state)
-	{
-	  octave_idx_type nr = cm.rows ();
-	  octave_idx_type nc = cm.columns ();
-
-	  if (nr == 0 || nc == 0)
-	    retval = Matrix ();
-	  else if (nr == 1 || nc == 1)
-	    retval = make_diag (cm, 0);
-	  else
-	    {
-	      ComplexColumnVector v = cm.diag ();
-	      if (v.numel () > 0)
-		retval = v;
-	    }
-	}
-      else
-	gripe_wrong_type_arg ("diag", arg);
-    }
-  else
-    gripe_wrong_type_arg ("diag", arg);
-
-  return retval;
+  return make_diag (arg, 0);
 }
 
 static octave_value
@@ -585,53 +605,9 @@
   octave_idx_type k = b.int_value ();
 
   if (error_state)
-    {
-      error ("diag: invalid second argument");      
-      return retval;
-    }
-
-  if (a.is_real_type ())
-    {
-      Matrix m = a.matrix_value ();
-
-      if (! error_state)
-	{
-	  octave_idx_type nr = m.rows ();
-	  octave_idx_type nc = m.columns ();
-
-	  if (nr == 1 || nc == 1)
-	    retval = make_diag (m, k);
-	  else if (nr == 0 || nc == 0)
-	    retval = Matrix ();
-	  else
-	    {
-	      ColumnVector d = m.diag (k);
-	      retval = d;
-	    }
-	}
-    }
-  else if (a.is_complex_type ())
-    {
-      ComplexMatrix cm = a.complex_matrix_value ();
-
-      if (! error_state)
-	{
-	  octave_idx_type nr = cm.rows ();
-	  octave_idx_type nc = cm.columns ();
-
-	  if (nr == 1 || nc == 1)
-	    retval = make_diag (cm, k);
-	  else if (nr == 0 || nc == 0)
-	    retval = Matrix ();
-	  else
-	    {
-	      ComplexColumnVector d = cm.diag (k);
-	      retval = d;
-	    }
-	}
-    }
+    error ("diag: invalid second argument");      
   else
-    gripe_wrong_type_arg ("diag", a);
+    retval = make_diag (a, k);
 
   return retval;
 }
--- a/src/input.cc	Mon Oct 08 19:41:28 2007 +0000
+++ b/src/input.cc	Mon Oct 08 20:26:01 2007 +0000
@@ -507,7 +507,7 @@
 	      // FIXME -- looks_like_struct is broken for now,
 	      // so it always returns false.
 
- 	      if (matches == 1 && looks_like_struct (retval))
+	      if (matches == 1 && looks_like_struct (retval))
  		{
  		  // Don't append anything, since we don't know
  		  // whether it should be '(' or '.'.
@@ -526,6 +526,40 @@
   return retval;
 }
 
+static std::string
+quoting_filename (const std::string &text, int, char quote)
+{
+  if (quote)
+    return text;
+  else
+    return (std::string ("'") + text);
+}
+
+static void
+accept_line (const std::string &text)
+{
+  // Close open strings if needed
+  bool sq = false;
+  bool dq = false;
+  bool pass_next = false;
+
+  for (std::string::const_iterator it = text.begin(); it < text.end(); it++)
+    {
+      if (pass_next)
+	pass_next = false;
+      else if (*it == '\\')
+	pass_next = true;
+      else if (*it == '\'' && ! dq)
+	sq = !sq;
+      else if (*it == '"' && ! sq)
+	dq = !dq;
+    }
+  if (sq)
+    command_editor::insert_text("'");
+  if (dq)
+    command_editor::insert_text("\"");
+}
+
 void
 initialize_command_input (void)
 {
@@ -545,7 +579,14 @@
 
   command_editor::set_basic_quote_characters ("\"");
 
+  command_editor::set_filename_quote_characters (" \t\n\\\"'@<>=;|&()#$`?*[!:{");
+  command_editor::set_completer_quote_characters ("'\"");
+
   command_editor::set_completion_function (generate_completion);
+
+  command_editor::set_quoting_function (quoting_filename);
+
+  command_editor::set_user_accept_line_function (accept_line);
 }
 
 static bool