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

* progmodes/octave.el (octave-lookfor): Handle empty lookfor

Browse source 
result.  Ask user to retry using '-all' flag.

Fixes: debbugs:15701
This commit is contained in:
Rüdiger Sonderfeld 2013-10-25 08:49:33 +08:00 • committed by Leo Liu
parent 357a508109
commit 6408a65db5
2 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2013-10-25 Rüdiger Sonderfeld <ruediger@c-plusplus.de>
* progmodes/octave.el (octave-lookfor): Handle empty lookfor
result. Ask user to retry using '-all' flag. (Bug#15701)
2013-10-24 Stefan Monnier <monnier@iro.umontreal.ca>
* emacs-lisp/smie.el: New smie-config system.

22
lisp/progmodes/octave.el
View file

@ -1724,20 +1724,32 @@ sentence."
(if all "'-all', " "")
str)))
(let ((lines inferior-octave-output-list))
(when (string-match "error: \\(.*\\)$" (car lines))
(when (and (stringp (car lines))
(string-match "error: \\(.*\\)$" (car lines)))
(error "%s" (match-string 1 (car lines))))
(with-help-window octave-help-buffer
(princ (mapconcat 'identity lines "\n"))
(with-current-buffer octave-help-buffer
(if lines
(insert (mapconcat 'identity lines "\n"))
(insert (format "Nothing found for \"%s\".\n" str)))
;; Bound to t so that `help-buffer' returns current buffer for
;; `help-setup-xref'.
(let ((help-xref-following t))
(help-setup-xref (list 'octave-lookfor str all)
(called-interactively-p 'interactive)))
(goto-char (point-min))
(while (re-search-forward "^\\([^[:blank:]]+\\) " nil 'noerror)
(make-text-button (match-beginning 1) (match-end 1)
:type 'octave-help-function))
(when lines
(while (re-search-forward "^\\([^[:blank:]]+\\) " nil 'noerror)
(make-text-button (match-beginning 1) (match-end 1)
:type 'octave-help-function)))
(unless all
(goto-char (point-max))
(insert "\nRetry with ")
(insert-text-button "'-all'"
'follow-link t
'action #'(lambda (b)
(octave-lookfor str '-all)))
(insert ".\n"))
(octave-help-mode)))))
(defcustom octave-source-directories nil