Annotation of OpenXM/src/texmacs/texmacs/TeXmacs.diff, Revision 1.1
1.1 ! ohara 1: diff -urN TeXmacs-1.0.4.5-src.orig/plugins/lisp/bin/tm_lisp TeXmacs-1.0.4.5-src/plugins/lisp/bin/tm_lisp
! 2: --- TeXmacs-1.0.4.5-src.orig/plugins/lisp/bin/tm_lisp Mon Dec 6 02:12:14 2004
! 3: +++ TeXmacs-1.0.4.5-src/plugins/lisp/bin/tm_lisp Wed Dec 15 09:47:03 2004
! 4: @@ -1,4 +1,4 @@
! 5: -#!/bin/bash
! 6: +#!/bin/sh
! 7:
! 8: export TEXMACS_LISP_PATH=$TEXMACS_PATH/plugins/lisp
! 9: cd $TEXMACS_LISP_PATH
! 10: diff -urN TeXmacs-1.0.4.5-src.orig/plugins/lush/bin/tm_lush TeXmacs-1.0.4.5-src/plugins/lush/bin/tm_lush
! 11: --- TeXmacs-1.0.4.5-src.orig/plugins/lush/bin/tm_lush Mon Dec 6 02:12:14 2004
! 12: +++ TeXmacs-1.0.4.5-src/plugins/lush/bin/tm_lush Wed Dec 15 09:47:03 2004
! 13: @@ -1,4 +1,4 @@
! 14: -#!/bin/bash
! 15: +#!/bin/sh
! 16: cd $TEXMACS_PATH/plugins/lush
! 17: echo -ne "\002verbatim:"
! 18: cat << EOF
! 19: diff -urN TeXmacs-1.0.4.5-src.orig/plugins/matlab/bin/tm_matlab TeXmacs-1.0.4.5-src/plugins/matlab/bin/tm_matlab
! 20: --- TeXmacs-1.0.4.5-src.orig/plugins/matlab/bin/tm_matlab Mon Dec 6 02:12:14 2004
! 21: +++ TeXmacs-1.0.4.5-src/plugins/matlab/bin/tm_matlab Wed Dec 15 09:47:03 2004
! 22: @@ -1,4 +1,4 @@
! 23: -#!/bin/bash
! 24: +#!/bin/sh
! 25: echo -ne "\002verbatim:"
! 26: cd $TEXMACS_PATH/plugins/matlab/code
! 27: matlab -nojvm -r tmrepl
! 28: diff -urN TeXmacs-1.0.4.5-src.orig/plugins/maxima/bin/maxima_detect TeXmacs-1.0.4.5-src/plugins/maxima/bin/maxima_detect
! 29: --- TeXmacs-1.0.4.5-src.orig/plugins/maxima/bin/maxima_detect Mon Dec 6 02:12:14 2004
! 30: +++ TeXmacs-1.0.4.5-src/plugins/maxima/bin/maxima_detect Wed Dec 15 09:47:03 2004
! 31: @@ -1,5 +1,5 @@
! 32: -#!/bin/bash
! 33: -MAXIMA=`type -p maxima 2>/dev/null`
! 34: +#!/bin/sh
! 35: +MAXIMA=`which maxima 2>/dev/null`
! 36: if [ $? -eq 0 ]
! 37: then
! 38: if grep -F list-avail $MAXIMA >/dev/null
! 39: diff -urN TeXmacs-1.0.4.5-src.orig/plugins/octave/bin/tm_octave TeXmacs-1.0.4.5-src/plugins/octave/bin/tm_octave
! 40: --- TeXmacs-1.0.4.5-src.orig/plugins/octave/bin/tm_octave Mon Dec 6 02:12:14 2004
! 41: +++ TeXmacs-1.0.4.5-src/plugins/octave/bin/tm_octave Wed Dec 15 09:47:03 2004
! 42: @@ -1,4 +1,4 @@
! 43: -#!/bin/bash
! 44: +#!/bin/sh
! 45: echo -ne "\002verbatim:"
! 46: octave -v
! 47: cd $TEXMACS_PATH/plugins/octave/octave; exec octave -qi tm-start.oct
! 48: diff -urN TeXmacs-1.0.4.5-src.orig/plugins/octave/doc/README TeXmacs-1.0.4.5-src/plugins/octave/doc/README
! 49: --- TeXmacs-1.0.4.5-src.orig/plugins/octave/doc/README Mon Dec 6 02:12:14 2004
! 50: +++ TeXmacs-1.0.4.5-src/plugins/octave/doc/README Wed Dec 15 09:47:03 2004
! 51: @@ -26,7 +26,7 @@
! 52: have TeXmacs call a script like the following (this script is included as
! 53: "tm_octave"):
! 54:
! 55: -#!/bin/bash
! 56: +#!/bin/sh
! 57: echo -ne "\002verbatim:"
! 58: octave -v
! 59: exec octave -qi
! 60: diff -urN TeXmacs-1.0.4.5-src.orig/src/System/Link/pipe_link.cpp TeXmacs-1.0.4.5-src/src/System/Link/pipe_link.cpp
! 61: --- TeXmacs-1.0.4.5-src.orig/src/System/Link/pipe_link.cpp Mon Dec 6 02:12:23 2004
! 62: +++ TeXmacs-1.0.4.5-src/src/System/Link/pipe_link.cpp Wed Dec 15 09:43:55 2004
! 63: @@ -23,8 +23,11 @@
! 64: #ifdef OS_WIN32
! 65: #include <sys/pipe.h>
! 66: #endif
! 67: -#ifndef __APPLE__
! 68: +
! 69: +#if defined(linux) || defined(__linux__) || defined(OS_WIN32)
! 70: #include <malloc.h>
! 71: +#else /* __APPLE__ */
! 72: +#include <stdlib.h>
! 73: #endif
! 74:
! 75: hashset<pointer> pipe_link_set;
! 76: diff -urN TeXmacs-1.0.4.5-src.orig/src/Window/display.hpp TeXmacs-1.0.4.5-src/src/Window/display.hpp
! 77: --- TeXmacs-1.0.4.5-src.orig/src/Window/display.hpp Mon Dec 6 02:12:23 2004
! 78: +++ TeXmacs-1.0.4.5-src/src/Window/display.hpp Wed Dec 15 09:40:33 2004
! 79: @@ -14,11 +14,7 @@
! 80: #define DISPLAY_H
! 81: #include "tree.hpp"
! 82: #include "bitmap_font.hpp"
! 83: -
! 84: -#ifndef _TIME_T
! 85: -#define _TIME_T
! 86: -typedef long time_t;
! 87: -#endif
! 88: +#include <time.h>
! 89:
! 90: struct font;
! 91: class widget;
! 92: diff -urN TeXmacs-1.0.4.5-src.orig/src/Window/event.hpp TeXmacs-1.0.4.5-src/src/Window/event.hpp
! 93: --- TeXmacs-1.0.4.5-src.orig/src/Window/event.hpp Mon Dec 6 02:12:23 2004
! 94: +++ TeXmacs-1.0.4.5-src/src/Window/event.hpp Wed Dec 15 09:40:33 2004
! 95: @@ -14,11 +14,7 @@
! 96: #define EVENT_H
! 97: #include "tree.hpp"
! 98: #include "command.hpp"
! 99: -
! 100: -#ifndef _TIME_T
! 101: -#define _TIME_T
! 102: -typedef long time_t;
! 103: -#endif
! 104: +#include <time.h>
! 105:
! 106: class window_rep;
! 107: typedef window_rep* window;
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>