[Emacs-diffs] trunk r112886: * progmodes/octave.el (octave-function-header-regexp): Fix.

[Leo Liu]

------------------------------------------------------------
revno: 112886
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/14570
committer: Leo Liu <address@hidden>
branch nick: trunk
timestamp: Fri 2013-06-07 21:00:47 +0800
message:
  * progmodes/octave.el (octave-function-header-regexp): Fix.
  (octave-help-mode-finish-hook, octave-help-mode-finish):
  Remove.  Just use temp-buffer-show-hook.

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-06-07 11:48:28 +0000
+++ b/lisp/ChangeLog    2013-06-07 13:00:47 +0000
@@ -2,6 +2,9 @@
 
        * progmodes/octave.el (octave-mode): Set comment-use-global-state
        to t.  (Bug#14303)
+       (octave-function-header-regexp): Fix.  (Bug#14570)
+       (octave-help-mode-finish-hook, octave-help-mode-finish):
+       Remove.  Just use temp-buffer-show-hook.
 
        * newcomment.el (comment-search-backward): Revert last change.
        (Bug#14434)

=== modified file 'lisp/progmodes/octave.el'
--- a/lisp/progmodes/octave.el  2013-06-07 11:48:28 +0000
+++ b/lisp/progmodes/octave.el  2013-06-07 13:00:47 +0000
@@ -89,7 +89,7 @@
 
 (defvar octave-function-header-regexp
   (concat "^\\s-*\\_<\\(function\\)\\_>"
-         "\\([^=;\n]*=[ \t]*\\|[ \t]*\\)\\(\\(?:\\w\\|\\s_\\)+\\)\\_>")
+         "\\([^=;(\n]*=[ \t]*\\|[ \t]*\\)\\(\\(?:\\w\\|\\s_\\)+\\)\\_>")
   "Regexp to match an Octave function header.
 The string `function' and its name are given by the first and third
 parenthetical grouping.")
@@ -1607,15 +1607,6 @@
     (when (or help-xref-stack help-xref-forward-stack)
       (insert "\n"))))
 
-(defvar octave-help-mode-finish-hook nil
-  "Octave specific hook for `temp-buffer-show-hook'.")
-
-(defun octave-help-mode-finish ()
-  (when (eq major-mode 'octave-help-mode)
-    (run-hooks 'octave-help-mode-finish-hook)))
-
-(add-hook 'temp-buffer-show-hook 'octave-help-mode-finish)
-
 (defun octave-help (fn)
   "Display the documentation of FN."
   (interactive (list (octave-completing-read)))