Fix to docstring magic (allow spaces after symbol).

2 files changed, 7 insertions, 4 deletions

diff --git a/doc/ProofGeneral.texi b/doc/ProofGeneral.texi
index a9499495..074871be 100644
--- a/doc/ProofGeneral.texi
+++ b/doc/ProofGeneral.texi
@@ -2886,8 +2886,11 @@ of this.  See whether function menu does something sensible by
 default.
 @end defvar
 
-@c TEXI DOCSTRING MAGIC: proof-goal-command-p 
+@c TEXI DOCSTRING MAGIC: proof-goal-command-p
 
+@defvar proof-goal-command-p 
+Is this really a goal command?
+@end defvar
 @c TEXI DOCSTRING MAGIC: proof-completed-proof-behaviour
 @defvar proof-completed-proof-behaviour 
 Indicates how Proof General treats commands beyond the end of a proof.@*
@@ -3919,8 +3922,8 @@ read.
 @c TEXI DOCSTRING MAGIC: proof-shell-proof-completed
 @defvar proof-shell-proof-completed 
 Flag indicating that a completed proof has just been observed.@*
-If non-nil, the value is actually the number of commands that have
-been processed since the proof was completed.
+If non-nil, the value counts the commands from the last command
+of the proof (starting from 1).
 @end defvar
 
 The @file{proof.el} also loads @file{proof-config.el} which declares the
diff --git a/generic/texi-docstring-magic.el b/generic/texi-docstring-magic.el
index 9301eeae..b9de67f7 100644
--- a/generic/texi-docstring-magic.el
+++ b/generic/texi-docstring-magic.el
@@ -298,7 +298,7 @@ Markup as @code{stuff} or @lisp stuff @end lisp."
     (goto-char (point-min))
     (let ((magic (concat "^"
 			 (regexp-quote texi-docstring-magic-comment)
-			 "\\s-*\\(\\(\\w\\|\\-\\)+\\)$"))
+			 "\\s-*\\(\\(\\w\\|\\-\\)+\\)\\s-*$"))
 	  p
 	  symbol)
       (while (re-search-forward magic nil t)