Mercurial > hg > octave-max

changeset 3607:0ecd1696605d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2000-03-08 22:01:16 by jwe]
author jwe
date Wed, 08 Mar 2000 22:01:17 +0000
parents 89f958b5358f
children ccfafa1d8510
files ChangeLog emacs/octave-mod.el liboctave/ChangeLog liboctave/oct-time.cc
diffstat 4 files changed, 20 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
--- a/emacs/octave-mod.el
+++ b/emacs/octave-mod.el
@@ -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 "\\|")
--- a/liboctave/ChangeLog
+++ b/liboctave/ChangeLog
@@ -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
--- a/liboctave/oct-time.cc
+++ b/liboctave/oct-time.cc
@@ -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"