Changeset a70441f in git for emacs

Timestamp:

Apr 27, 2000, 12:07:30 PM (24 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

e5f8ae07e0b41bb1b0e5aaaac2dad244e619d563

Parents:

eec9b2d2a332c04f20d743bdd4ccc107766fbc61

Message:

Windows and gcc 2.95 porting


git-svn-id: file:///usr/local/Singular/svn/trunk@4273 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

emacs

Files:

• Makefile.in (modified) (3 diffs)
• singular.el (modified) (2 diffs)

emacs/Makefile.in

@@ -12 +12 @@
 emacsdir        = ${install_prefix}/emacs
 
-PERL5           = @PERL5@
+PERL            = @PERL@
 INSTALL         = ../install-sh -c
 INSTALL_DATA    = ${INSTALL} -m 644
@@ -22 +22 @@
 
 cmd-cmpl.el: ${SINGULAR} cmpl.pl
-        ${PERL5} cmpl.pl -Singular ${SINGULAR} -cmpl cmd > cmd-cmpl.el
+        ${PERL} cmpl.pl -Singular ${SINGULAR} -cmpl cmd > cmd-cmpl.el
 
 hlp-cmpl.el: ${SINGULAR_HLP} cmpl.pl
-        ${PERL5} cmpl.pl -hlp ${SINGULAR_HLP} -cmpl hlp > hlp-cmpl.el
+        ${PERL} cmpl.pl -hlp ${SINGULAR_HLP} -cmpl hlp > hlp-cmpl.el
 
 ex-cmpl.el: cmpl.pl ${examplesdir}
-                ${PERL5} cmpl.pl -cmpl ex -ex_dir ${examplesdir} > ex-cmpl.el
+                ${PERL} cmpl.pl -cmpl ex -ex_dir ${examplesdir} > ex-cmpl.el
 
 # this is weird, if I work directly with _one_ pipe, 
@@ -34 +34 @@
 lib-cmpl.el: ${prefix}/Singular/Makefile cmpl.pl
         ${MAKE} --no-print-directory -s -f ${prefix}/Singular/Makefile echoLIBS > lib-temp
-        cat lib-temp | ${PERL5} cmpl.pl -cmpl lib > lib-cmpl.el
+        cat lib-temp | ${PERL} cmpl.pl -cmpl lib > lib-cmpl.el
         rm lib-temp
 

emacs/singular.el

@@ -1 +1 @@
 ;;; singular.el --- Emacs support for Computer Algebra System Singular
 
-;; $Id: singular.el,v 1.54 1999-12-06 19:00:27 wichmann Exp $
+;; $Id: singular.el,v 1.55 2000-04-27 10:07:27 obachman Exp $
 
 ;;; Commentary:
@@ -3801 +3801 @@
   "History list of Singular switches.")
 
-(defvar singular-switches-magic '("-t" "--exec" "if (system(\"version\") > 1304){system(\"--emacs\", 1);};")
+; (defvar singular-switches-magic '("-t" "--exec" "if (system(\"version\") > 1304){system(\"--emacs\", 1);};")
+(defvar singular-switches-magic '("-t" "--emacs")
   "Additional magic switches for Singular process.
 List of switch-strings which are automagically added when new Singular