--- a/liboctave/ChangeLog	Thu Sep 26 21:10:46 2002 +0000
+++ b/liboctave/ChangeLog	Thu Sep 26 21:32:07 2002 +0000
@@ -1,5 +1,8 @@
 2002-09-26  Paul Kienzle <pkienzle@users.sf.net>
 
+	* lo-mappers.cc (xerf, xerfc): Delete.
+	* lo-mappers.h (xerf, xerfc): Delete decls.
+
 	* lo-mappers.cc: Remove unused #define M_PI.
 	* lo-specfun.cc: Add #define M_PI if needed.
 

--- a/liboctave/lo-mappers.cc	Thu Sep 26 21:10:46 2002 +0000
+++ b/liboctave/lo-mappers.cc	Thu Sep 26 21:32:07 2002 +0000
@@ -111,28 +111,6 @@
 #endif
 }
 
-double
-xerf (double x)
-{
-#if defined (HAVE_ERF)
-  return erf (x);
-#else
-  (*current_liboctave_error_handler)
-    ("erf (x) not available on this system");
-#endif
-}
-
-double
-xerfc (double x)
-{
-#if defined (HAVE_ERFC)
-  return erfc (x);
-#else
-  (*current_liboctave_error_handler)
-    ("erfc (x) not available on this system");
-#endif
-}
-
 // double -> bool mappers.
 
 bool

--- a/liboctave/lo-mappers.h	Thu Sep 26 21:10:46 2002 +0000
+++ b/liboctave/lo-mappers.h	Thu Sep 26 21:32:07 2002 +0000
@@ -32,8 +32,6 @@
 extern double real (double x);
 extern double round (double x);
 extern double signum (double x);
-extern double xerf (double x);
-extern double xerfc (double x);
 
 extern bool xisnan (double x);
 extern bool xfinite (double x);

--- a/liboctave/lo-specfun.cc	Thu Sep 26 21:10:46 2002 +0000
+++ b/liboctave/lo-specfun.cc	Thu Sep 26 21:32:07 2002 +0000
@@ -105,7 +105,7 @@
 asinh (double x)
 {
   double retval;
-  F77_XFCN (dasinh, DASINH, (x, retval));
+  F77_XFCN (xdasinh, XDASINH, (x, retval));
   return retval;
 }
 #endif
@@ -115,7 +115,7 @@
 atanh (double x)
 {
   double retval;
-  F77_XFCN (datanh, DATANH, (x, retval));
+  F77_XFCN (xdatanh, XDATANH, (x, retval));
   return retval;
 }
 #endif
@@ -125,7 +125,7 @@
 erf (double x)
 {
   double retval;
-  F77_XFCN (derf, DERF, (x, retval));
+  F77_XFCN (xderf, XDERF, (x, retval));
   return retval;
 }
 #endif
@@ -135,7 +135,7 @@
 erfc (double x)
 {
   double retval;
-  F77_XFCN (derfc, DERFC, (x, retval));
+  F77_XFCN (xderfc, XDERFC, (x, retval));
   return retval;
 }
 #endif

--- a/src/ChangeLog	Thu Sep 26 21:10:46 2002 +0000
+++ b/src/ChangeLog	Thu Sep 26 21:32:07 2002 +0000
@@ -1,5 +1,8 @@
 2002-09-26  Paul Kienzle <pkienzle@users.sf.net>
 
+	* mappers.cc (install_mapper_functions): Install erf, not xerf.
+	Install erfc, not xerfc.
+
 	* pt-bp.cc (tree_breakpoint::visit_unwind_protect_command):
 	Rename lst1 and lst2 to avoid dlgs.h conflict.
 

--- a/src/mappers.cc	Thu Sep 26 21:10:46 2002 +0000
+++ b/src/mappers.cc	Thu Sep 26 21:32:07 2002 +0000
@@ -281,7 +281,7 @@
 Compute the hyperbolic cosine of each element of @var{x}.\n\
 @end deftypefn");
 
-  DEFUN_MAPPER (erf, 0, 0, 0, xerf, 0, 0, 0.0, 0.0, 0,
+  DEFUN_MAPPER (erf, 0, 0, 0, erf, 0, 0, 0.0, 0.0, 0,
     "-*- texinfo -*-\n\
 @deftypefn {Mapping Function} {} erf (@var{z})\n\
 Computes the error function,\n\
@@ -305,7 +305,7 @@
 @end deftypefn\n\
 @seealso{erfc and erfinv}");
 
-  DEFUN_MAPPER (erfc, 0, 0, 0, xerfc, 0, 0, 0.0, 0.0, 0,
+  DEFUN_MAPPER (erfc, 0, 0, 0, erfc, 0, 0, 0.0, 0.0, 0,
     "-*- texinfo -*-\n\
 @deftypefn {Mapping Function} {} erfc (@var{z})\n\
 Computes the complementary error function,\n\

--- a/src/octave.gperf	Thu Sep 26 21:10:46 2002 +0000
+++ b/src/octave.gperf	Thu Sep 26 21:32:07 2002 +0000
@@ -77,5 +77,5 @@
 varargin, VARARGIN, varargin_kw
 varargout, VARARGOUT, varargout_kw
 while, WHILE, while_kw
-__FILE__, TEXT, magic_file_kw
+__FILE__, STRING, magic_file_kw
 __LINE__, NUM, magic_line_kw