# HG changeset patch
# User jwe
# Date 952552877 0
# Node ID 0ecd1696605dfc62e1f879c0a1b95e092aa52998
# Parent  89f958b5358fd2da66f1fe777b99be6963979d7b
[project @ 2000-03-08 22:01:16 by jwe]

diff -r 89f958b5358f -r 0ecd1696605d ChangeLog
--- a/ChangeLog	Wed Mar 08 09:30:07 2000 +0000
+++ b/ChangeLog	Wed Mar 08 22:01:17 2000 +0000
@@ -1,3 +1,9 @@
+2000-03-08  Stephen Eglen  <stephen@gnu.org>
+
+	* emacs/octave-mod.el (octave-font-lock-keywords): To font-lock
+	the builtin operators, use `font-lock-builtin-face' for Emacs
+	and `font-lock-preprocessor-face' for XEmacs.
+
 2000-03-08  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* configure.in: For building shared libaries, handle
diff -r 89f958b5358f -r 0ecd1696605d emacs/octave-mod.el
--- a/emacs/octave-mod.el	Wed Mar 08 09:30:07 2000 +0000
+++ b/emacs/octave-mod.el	Wed Mar 08 22:01:17 2000 +0000
@@ -177,7 +177,9 @@
 	 'font-lock-keyword-face)
    ;; Fontify all builtin operators.
    (cons "\\(&\\||\\|<=\\|>=\\|==\\|<\\|>\\|!=\\|!\\)"
-	 'font-lock-builtin-face)
+	 (if (boundp 'font-lock-builtin-face)
+	     'font-lock-builtin-face
+	   'font-lock-preprocessor-face))
    ;; Fontify all builtin variables.
    (cons (concat "\\<\\("
 		 (mapconcat 'identity octave-variables "\\|")
diff -r 89f958b5358f -r 0ecd1696605d liboctave/ChangeLog
--- a/liboctave/ChangeLog	Wed Mar 08 09:30:07 2000 +0000
+++ b/liboctave/ChangeLog	Wed Mar 08 22:01:17 2000 +0000
@@ -1,3 +1,7 @@
+2000-03-08  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* oct-time.cc: Include <sys/types.h> and <unistd.h>, if available.
+
 2000-02-18  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* oct-rl-hist.c (octave_history_list): Do something when not
diff -r 89f958b5358f -r 0ecd1696605d liboctave/oct-time.cc
--- a/liboctave/oct-time.cc	Wed Mar 08 09:30:07 2000 +0000
+++ b/liboctave/oct-time.cc	Wed Mar 08 22:01:17 2000 +0000
@@ -46,6 +46,13 @@
 #include <climits>
 #include <cmath>
 
+#ifdef HAVE_UNISTD_H
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#include <unistd.h>
+#endif
+
 #include "lo-error.h"
 #include "lo-utils.h"
 #include "oct-time.h"