procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* progmodes/octave.el (inferior-octave-startup): Use OCTAVE_SRCDIR

Browse source 
instead.
(octave-source-directories): Don't check process.
(octave-source-directories, octave-find-definition): Doc fix.
This commit is contained in:
Leo Liu 2013-05-18 09:17:50 +08:00
parent 254826b811
commit 5e80b74f7a
2 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lisp/ChangeLog
View file

@ -1,3 +1,10 @@
2013-05-18 Leo Liu <sdl.web@gmail.com>
* 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 <rgm@gnu.org>
* progmodes/vhdl-mode.el (vhdl-mode-map-init):

16
lisp/progmodes/octave.el
View file

@ -738,8 +738,10 @@ startup file, `~/.emacs-octave'."
(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 @@ if ismember(exist(\"%s\"), [2 3 5 103]) print_usage(\"%s\") endif\n"
: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 @@ if ismember(exist(\"%s\"), [2 3 5 103]) print_usage(\"%s\") endif\n"
(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