# HG changeset patch
# User jwe
# Date 1142538434 0
# Node ID 40b08b29dd538ed1bdc5635022d034c5666b9bd1
# Parent  f39adfd0913d798d00914eabafe096a9c98b236a
[project @ 2006-03-16 19:47:14 by jwe]

diff -r f39adfd0913d -r 40b08b29dd53 src/ChangeLog
--- a/src/ChangeLog	Thu Mar 16 18:12:01 2006 +0000
+++ b/src/ChangeLog	Thu Mar 16 19:47:14 2006 +0000
@@ -1,3 +1,15 @@
+2006-03-16  John W. Eaton  <jwe@octave.org>
+
+	* __gnuplot_raw__.l (F__gnuplot_show__): Temporarily use DEFCMD
+	instead of DEFUN.
+	(symbols_of___gnuplot_raw__): Temporarily ark __gnuplot_plot__,
+	__gnuplot_set__, __gnuplot_splot__, and __gnuplot_replot__ as raw
+	commands.
+
+	* variables.cc (is_marked_as_rawcommand, unmark_rawcommand,
+	mark_as_rawcommand): Temporarily not static.
+	* variables.h: Temporarily Provide decls.
+
 2006-03-16  David Bateman  <dbateman@free.fr>
 
 	* sparse-xdiv.cc (result_ok): delete.
diff -r f39adfd0913d -r 40b08b29dd53 src/__gnuplot_raw__.l
--- a/src/__gnuplot_raw__.l	Thu Mar 16 18:12:01 2006 +0000
+++ b/src/__gnuplot_raw__.l	Thu Mar 16 19:47:14 2006 +0000
@@ -1585,6 +1585,12 @@
 
   gnuplot_initialized = true;
 
+  // This is temporary.
+  mark_as_rawcommand ("__gnuplot_plot__");
+  mark_as_rawcommand ("__gnuplot_set__");
+  mark_as_rawcommand ("__gnuplot_splot__");
+  mark_as_rawcommand ("__gnuplot_replot__");
+
   if (is_builtin_variable ("automatic_replot"))
     automatic_replot ();
   else
@@ -1771,7 +1777,7 @@
   return octave_value_list ();
 }
 
-DEFUN (__gnuplot_show__, args, ,
+DEFCMD (__gnuplot_show__, args, ,
   "-*- texinfo -*-\n\
 @deffn {Command} __gnuplot_show__ options\n\
 Show plotting options.\n\
diff -r f39adfd0913d -r 40b08b29dd53 src/variables.cc
--- a/src/variables.cc	Thu Mar 16 18:12:01 2006 +0000
+++ b/src/variables.cc	Thu Mar 16 19:47:14 2006 +0000
@@ -276,20 +276,20 @@
 
 static std::set <std::string> rawcommand_set;
 
-static inline bool
+bool
 is_marked_as_rawcommand (const std::string& s)
 {
   return rawcommand_set.find (s) != rawcommand_set.end ();
 }
 
-static inline void
+void
 mark_as_rawcommand (const std::string& s)
 {
   command_set.insert (s);    
   rawcommand_set.insert (s);
 }
 
-static inline void
+void
 unmark_rawcommand (const std::string& s)
 {
   rawcommand_set.erase (s);
diff -r f39adfd0913d -r 40b08b29dd53 src/variables.h
--- a/src/variables.h	Thu Mar 16 18:12:01 2006 +0000
+++ b/src/variables.h	Thu Mar 16 19:47:14 2006 +0000
@@ -48,6 +48,12 @@
 
 extern bool is_builtin_variable (const std::string&);
 extern bool is_command_name (const std::string&);
+
+// The next three are here temporarily...
+extern bool is_marked_as_rawcommand (const std::string& s);
+extern void mark_as_rawcommand (const std::string& s);
+extern void unmark_rawcommand (const std::string& s);
+
 extern bool is_rawcommand_name (const std::string&);
 extern bool is_mapper_function_name (const std::string&);
 extern bool is_builtin_function_name (const std::string&);