[Emacs-diffs] trunk r115183: * progmodes/octave.el (octave-help-mode): Adapt to change to

[Leo Liu]

------------------------------------------------------------
revno: 115183
revision-id: address@hidden
parent: address@hidden
committer: Leo Liu <address@hidden>
branch nick: trunk
timestamp: Fri 2013-11-22 16:09:40 +0800
message:
  * 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.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/progmodes/octave.el       
octavemod.el-20091113204419-o5vbwnq5f7feedwu-1028

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-11-22 02:32:35 +0000
+++ b/lisp/ChangeLog    2013-11-22 08:09:40 +0000
@@ -2,6 +2,9 @@
 
        * progmodes/octave.el (octave-operator-regexp): Exclude newline.
        (Bug#15076)
+       (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.
 
 2013-11-22  Leo Liu  <address@hidden>
 

=== modified file 'lisp/progmodes/octave.el'
--- a/lisp/progmodes/octave.el  2013-11-22 02:32:35 +0000
+++ b/lisp/progmodes/octave.el  2013-11-22 08:09:40 +0000
@@ -599,7 +599,7 @@
   :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 @@
 
 (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 @@
   :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."