Mercurial > octave-nkf

changeset 9264:be7d8132c139

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Resolve ChangeLog conflict
author Soren Hauberg <hauberg@gmail.com>
date Tue, 26 May 2009 18:59:12 +0200
parents 9eb6e8f2b937 (diff) de255681c85f (current diff)
children 7f3a1a90f4f4
files scripts/ChangeLog
diffstat 2 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/ChangeLog	Tue May 26 12:12:22 2009 -0400
+++ b/scripts/ChangeLog	Tue May 26 18:59:12 2009 +0200
@@ -1,3 +1,7 @@
+2009-05-26 Søren Hauberg  <hauberg@gmail.com>
+
+	* help/__makeinfo__.m: Support several @seealso's in one text. 
+
 2009-05-26  John W. Eaton  <jwe@octave.org>
 
 	* plot/colorbar.m: Downcase location argument.
--- a/scripts/help/__makeinfo__.m	Tue May 26 12:12:22 2009 -0400
+++ b/scripts/help/__makeinfo__.m	Tue May 26 18:59:12 2009 +0200
@@ -89,8 +89,8 @@
   
   ## Handle @seealso macro
   SEE_ALSO = "@seealso";
-  start = strfind (text, SEE_ALSO);
-  if (!isempty (start))
+  starts = strfind (text, SEE_ALSO);
+  for start = starts
     if (start == 1 || (text (start-1) != "@"))
       bracket_start = find (text (start:end) == "{", 1);
       stop = find (text (start:end) == "}", 1);
@@ -111,7 +111,7 @@
       expanded = see_also (see_also_args);
       text = strcat (text (1:start-1), expanded, text (stop+1:end));
     endif
-  endif
+  endfor
   
   if (strcmpi (output_type, "texinfo"))
     status = 0;