octave-maintainers
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: distributing Octave in August


From: poti
Subject: Re: distributing Octave in August
Date: Mon, 18 Jun 2007 15:16:34 -0400
User-agent: Mutt/1.5.13 (2006-08-11)

On 12:17 Mon 18 Jun     , John W. Eaton wrote:
> On 17-Jun-2007, address@hidden wrote:
> 
> | On 16:51 Sat 16 Jun     , address@hidden wrote:
> | > On 16:57 Fri 15 Jun     , John W. Eaton wrote:
> | > > On 15-Jun-2007, address@hidden wrote:
> | > > 
> | > > | > 5) Added the following line to my .octaverc:
> | > > | > 
> | > > | > PS1(">> ");
> | > > | >
> | > > | 
> | > > | If I can set this through an environment variable, it will solve my
> | > > | problem. Working through a startup file will be a little more
> | > > 
> | > > It seems to me there must be some other solution since all this seems
> | > > to be doing is setting the prompt to something that will be recognized
> | > > by Emacs as a prompt.  And that is already supposed to be true (the
> | > > default is "octave:NN> " and I think octave-inf.el sends commands to
> | > > Octave to set it to "octave> ".  If that's not working, will someone
> | > > please try to debug why it is failing?
> | The above poster has provided the solution as follows, off list:
> | 
> | 
> | >Hello!
> | >
> | >I did a little experiment (I am working on a Mac, where run-octave
> | >works out-of-the-box).
> | >
> | >First, I add the following line to my .octaverc:
> | >
> | >PS1("\\s.exe:\\#> ");
> | >
> | >Now I have the same inital prompt as you have on Windows. When I try
> | >to do M-x run-octave emacs freezes just like it does for you. Then I
> | >go into octave-inf.el and change inferior-octave-prompt to read (just
> | >added "\\|.exe" in the right place):
> | >
> | >(defcustom inferior-octave-prompt
> | >  
> "\\(^octave\\(\\|.bin\\|.exe\\)\\(-[.0-9]+\\)?\\(:[0-9]+\\)?\\|^debug\\|^\\)>+
> 
> I fixed this in the version of octave-inf.el that is distributed with
> Octave.  Would someone please report this to the Emacs maintainers and
> get the fix included in the version that is distribute with Emacs?
> 
I posted this issue to help-gnu-emacs, where Eli Zaretskii posted about 
it before the answer was found here. I will forward this solution to
that thread.


> Also, it would be helpful if someone would like to work to ensure that
> the versions of the Octave modes that are distributed with Emacs and
> Octave are not diverging.  If they are essentially the same, then
> maybe it is time to stop distributing the files with Octave, and
> instead just assume that people who have Emacs will have them?
> 
> Thanks,
> 
> jwe
Included is a diff of some changes in the CVS versions of this file in 
Emacs and Octave 
(
cvs -z 9 -d :ext:address@hidden:/cvs checkout octave
and 
cvs -z3 -d:pserver:address@hidden:/sources/emacs co emacs
)

which contains places where the Emacs code seemed right.
octave-mod.el has a larger number of differences. Until I finish 
other commitments, I cannot volunteer to sit down with the reference manual 
and learn how to reconcile the substantive differences. 
-Poti

--- octave-inf.el       2007-06-18 14:35:42.000000000 -0400
+++ potioctave-inf.el   2007-06-18 14:33:54.000000000 -0400
@@ -1,6 +1,7 @@
 ;;; octave-inf.el --- running Octave as an inferior Emacs process
 
-;; Copyright (C) 1997 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;; Free Software Foundation, Inc.
 
 ;; Author: Kurt Hornik <address@hidden>
 ;; Author: John Eaton <address@hidden>
@@ -223,21 +224,21 @@
                   'identity inferior-octave-output-list "\n")
                  "\n"))))
 
-    ;; Find out whether Octave has built-in variables.
-    (inferior-octave-send-list-and-digest
-     (list "exist \"LOADPATH\"\n"))
-    (setq inferior-octave-has-built-in-variables
-         (string-match "101$" (car inferior-octave-output-list)))
+     ;; Find out whether Octave has built-in variables.
+     (inferior-octave-send-list-and-digest
+      (list "exist \"LOADPATH\"\n"))
+     (setq inferior-octave-has-built-in-variables
+         (string-match "101$" (car inferior-octave-output-list)))
 
     ;; An empty secondary prompt, as e.g. obtained by '--braindead',
     ;; means trouble.
     (inferior-octave-send-list-and-digest (list "PS2\n"))
     (if (string-match "\\(PS2\\|ans\\) = *$" (car inferior-octave-output-list))
-       (inferior-octave-send-list-and-digest
-        (list (if inferior-octave-has-built-in-variables
-                  "PS2 = \"> \"\n"
-                "PS2 (\"> \");\n"))))
-    
+       (inferior-octave-send-list-and-digest
+        (list (if inferior-octave-has-built-in-variables
+                  "PS2 = \"> \"\n"
+                "PS2 (\"> \");\n"))))
+
     ;; O.k., now we are ready for the Inferior Octave startup commands.
     (let* (commands
           (program (file-name-nondirectory inferior-octave-program))
@@ -269,8 +270,9 @@
     ;; And finally, everything is back to normal.
     (set-process-filter proc 'inferior-octave-output-filter)
     (run-hooks 'inferior-octave-startup-hook)
-    ;; just in case, to be sure a cd in the startup file 
-    ;; won't have detrimental effects
+    (run-hooks 'inferior-octave-startup-hook)
+    ;; Just in case, to be sure a cd in the startup file
+    ;; won't have detrimental effects.
     (inferior-octave-resync-dirs)))
 
 
@@ -311,7 +313,7 @@
            command inferior-octave-output-list)))))
 
 (defun inferior-octave-dynamic-list-input-ring ()
-  "List the buffer's input history in a help buffer"
+  "List the buffer's input history in a help buffer."
   ;; We cannot use `comint-dynamic-list-input-ring', because it replaces
   ;; "completion" by "history reference" ...
   (interactive)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]