[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r112628: * progmodes/octave.el (infer
From: |
Leo Liu |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r112628: * progmodes/octave.el (inferior-octave-startup): Use OCTAVE_SRCDIR |
Date: |
Sat, 18 May 2013 09:17:50 +0800 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 112628
committer: Leo Liu <address@hidden>
branch nick: trunk
timestamp: Sat 2013-05-18 09:17:50 +0800
message:
* progmodes/octave.el (inferior-octave-startup): Use OCTAVE_SRCDIR
instead.
(octave-source-directories): Don't check process.
(octave-source-directories, octave-find-definition): Doc fix.
modified:
lisp/ChangeLog
lisp/progmodes/octave.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-05-18 00:25:02 +0000
+++ b/lisp/ChangeLog 2013-05-18 01:17:50 +0000
@@ -1,3 +1,10 @@
+2013-05-18 Leo Liu <address@hidden>
+
+ * progmodes/octave.el (inferior-octave-startup): Use OCTAVE_SRCDIR
+ instead.
+ (octave-source-directories): Don't check process.
+ (octave-source-directories, octave-find-definition): Doc fix.
+
2013-05-18 Glenn Morris <address@hidden>
* progmodes/vhdl-mode.el (vhdl-mode-map-init):
=== modified file 'lisp/progmodes/octave.el'
--- a/lisp/progmodes/octave.el 2013-05-17 22:46:10 +0000
+++ b/lisp/progmodes/octave.el 2013-05-18 01:17:50 +0000
@@ -738,8 +738,10 @@
(inferior-octave-send-list-and-digest (list "PS2 (\"> \");\n")))
(inferior-octave-send-list-and-digest
- (list "if exist(\"__octave_srcdir__\") disp(__octave_srcdir__) endif\n"))
- (process-put proc 'octave-srcdir (car inferior-octave-output-list))
+ (list "disp(getenv(\"OCTAVE_SRCDIR\"))\n"))
+ (process-put proc 'octave-srcdir
+ (unless (equal (car inferior-octave-output-list) "")
+ (car inferior-octave-output-list)))
;; O.K., now we are ready for the Inferior Octave startup commands.
(inferior-octave-send-list-and-digest
@@ -1627,14 +1629,16 @@
:type 'octave-help-function))))))))
(defcustom octave-source-directories nil
- "A list of directories for Octave sources."
+ "A list of directories for Octave sources.
+If the environment variable OCTAVE_SRCDIR is set, it is searched first."
:type '(repeat directory)
:group 'octave
:version "24.4")
(defun octave-source-directories ()
- (inferior-octave-check-process)
- (let ((srcdir (process-get inferior-octave-process 'octave-srcdir)))
+ (let ((srcdir (or (and inferior-octave-process
+ (process-get inferior-octave-process 'octave-srcdir))
+ (getenv "OCTAVE_SRCDIR"))))
(if srcdir
(cons srcdir octave-source-directories)
octave-source-directories)))
@@ -1668,7 +1672,7 @@
(defun octave-find-definition (fn)
"Find the definition of FN.
-Definitions for functions implemented in C++ can be found if
+Functions implemented in C++ can be found if
`octave-source-directories' is set correctly."
(interactive (list (octave-completing-read)))
(inferior-octave-send-list-and-digest
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r112628: * progmodes/octave.el (inferior-octave-startup): Use OCTAVE_SRCDIR,
Leo Liu <=