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

Fix octave-mode ElDoc support

Browse source 
* lisp/progmodes/octave.el (octave-eldoc-function-signatures): Fix the
regexp used, so no match happens when there is no defined function FN.
Also, tweak the regexp to support GNU Octave 4.2.x and newer.  (Bug#36459)
This commit is contained in:
Mauro Aranda 2019-08-06 12:45:28 -03:00 • committed by Leo Liu
parent 691790b8ea
commit cb0403d746
1 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lisp/progmodes/octave.el
View file

@ -1591,8 +1591,23 @@ code line."
(list (format "print_usage ('%s');\n" fn)))
(let (result)
(dolist (line inferior-octave-output-list)
;; The help output has changed a few times in GNU Octave.
;; Earlier versions output "usage: " before the function signature.
;; After deprecating the usage function, and up until GNU Octave 4.0.3,
;; the output looks like this:
;; -- Mapping Function: abs (Z).
;; After GNU Octave 4.2.0, the output is less verbose and it looks like
;; this:
;; -- abs (Z)
;; The following regexp matches these three formats.
;; The "usage: " alternative matches the symbol, because a call to
;; print_usage with a non-existent function (e.g., print_usage ('A'))
;; would output:
;; error: print_usage: 'A' not found
;; and we wouldn't like to match anything in this case.
;; See bug #36459.
(when (string-match
"\\s-*\\(?:--[^:]+\\|usage\\):\\s-*\\(.*\\)$"
"\\s-*\\(?:--[^:]+:\\|\\_<usage:\\|--\\)\\s-*\\(.*\\)$"
line)
(push (match-string 1 line) result)))
(setq octave-eldoc-cache