diff options
| author | Leo Liu <sdl.web@gmail.com> | 2013-11-22 16:09:40 +0800 |
|---|---|---|
| committer | Leo Liu <sdl.web@gmail.com> | 2013-11-22 16:09:40 +0800 |
| commit | 8c09f64b76ed0be6ad41fe0c58406add0ebf361b (patch) | |
| tree | 42a1dac48795f0ab5b9064486f881cd59058863d /lisp/progmodes/octave.el | |
| parent | 48592bfdf58e26bb6df780ca0a154f7b20d352c6 (diff) | |
| download | emacs-8c09f64b76ed0be6ad41fe0c58406add0ebf361b.tar.gz | |
* progmodes/octave.el (octave-help-mode): Adapt to change to
help-mode-finish to use derived-mode-p on 2013-09-17.
(inferior-octave-prompt): Also match octave-gui.
Diffstat (limited to 'lisp/progmodes/octave.el')
| -rw-r--r-- | lisp/progmodes/octave.el | 27 |
1 files changed, 5 insertions, 22 deletions
diff --git a/lisp/progmodes/octave.el b/lisp/progmodes/octave.el index 3d68b57cd65..49b5a2970d7 100644 --- a/lisp/progmodes/octave.el +++ b/lisp/progmodes/octave.el @@ -599,7 +599,7 @@ definitions can also be stored in files and used in batch mode." :group 'octave) (defcustom inferior-octave-prompt - "\\(^octave\\(\\|.bin\\|.exe\\)\\(-[.0-9]+\\)?\\(:[0-9]+\\)?\\|^debug\\|^\\)>+ " + "\\(^octave\\(\\|.bin\\|.exe\\|-gui\\)\\(-[.0-9]+\\)?\\(:[0-9]+\\)?\\|^debug\\|^\\)>+ " "Regexp to match prompts for the inferior Octave process." :type 'regexp :group 'octave) @@ -1649,7 +1649,7 @@ code line." (defvar octave-help-mode-map (let ((map (make-sparse-keymap))) - (define-key map "\M-." 'octave-find-definition) + (define-key map "\M-." 'octave-find-definition) (define-key map "\C-hd" 'octave-help) (define-key map "\C-ha" 'octave-lookfor) map)) @@ -1659,26 +1659,9 @@ code line." :abbrev-table nil :syntax-table octave-mode-syntax-table (eval-and-compile (require 'help-mode)) - ;; Mostly stolen from `help-make-xrefs'. - (let ((inhibit-read-only t)) - (setq-local info-lookup-mode 'octave-mode) - ;; Delete extraneous newlines at the end of the docstring - (goto-char (point-max)) - (while (and (not (bobp)) (bolp)) - (delete-char -1)) - (insert "\n") - (when (or help-xref-stack help-xref-forward-stack) - (insert "\n")) - (when help-xref-stack - (help-insert-xref-button help-back-label 'help-back - (current-buffer))) - (when help-xref-forward-stack - (when help-xref-stack - (insert "\t")) - (help-insert-xref-button help-forward-label 'help-forward - (current-buffer))) - (when (or help-xref-stack help-xref-forward-stack) - (insert "\n")))) + ;; Don't highlight `EXAMPLE' as elisp symbols by using a regexp that + ;; can never match. + (setq-local help-xref-symbol-regexp "x\\`")) (defun octave-help (fn) "Display the documentation of FN." |