Mercurial > octave-nkf

changeset 6802:3727149c8da1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2007-07-26 13:37:56 by jwe]
author jwe
date Thu, 26 Jul 2007 13:37:56 +0000
parents beb698a16916
children fe19c6cb5bc6
files src/ChangeLog src/pt-bp.h src/version.h
diffstat 3 files changed, 11 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Fri Feb 01 23:17:15 2008 -0500
+++ b/src/ChangeLog	Thu Jul 26 13:37:56 2007 +0000
@@ -1,3 +1,9 @@
+2007-07-26  John W. Eaton  <jwe@octave.org>
+
+	* pt-bp.h (MAYBE_DO_BREAKPOINT): Rename cur_fcn to xfcn.
+
+	* version.h (OCTAVE_VERSION): Now 2.9.13+.
+
 2007-07-25  John W. Eaton  <jwe@octave.org>
 
 	* version.h (OCTAVE_VERSION): Now 2.9.13
--- a/src/pt-bp.h	Fri Feb 01 23:17:15 2008 -0500
+++ b/src/pt-bp.h	Thu Jul 26 13:37:56 2007 +0000
@@ -160,12 +160,12 @@
 #define MAYBE_DO_BREAKPOINT \
   do \
     { \
-      octave_function *curr_fcn = octave_call_stack::current (); \
+      octave_function *xfcn = octave_call_stack::current (); \
  \
       if (octave_debug_on_interrupt_state \
 	  || (tree::break_next && tree::last_line == 0) \
 	  || (tree::break_next \
-	      && curr_fcn == tree::break_function \
+	      && xfcn == tree::break_function \
 	      && tree::last_line != line ()) \
 	  || is_breakpoint ()) \
         { \
@@ -173,8 +173,8 @@
  \
           tree::break_next = false; \
  \
-          if (curr_fcn) \
-            octave_stdout << curr_fcn->name () << ": ";  \
+          if (xfcn) \
+            octave_stdout << xfcn->name () << ": ";  \
  \
           octave_stdout << "line " << line () << ", " \
 			<< "column " << column () \
--- a/src/version.h	Fri Feb 01 23:17:15 2008 -0500
+++ b/src/version.h	Thu Jul 26 13:37:56 2007 +0000
@@ -25,7 +25,7 @@
 #if !defined (octave_version_h)
 #define octave_version_h 1
 
-#define OCTAVE_VERSION "2.9.13"
+#define OCTAVE_VERSION "2.9.13+"
 
 #define OCTAVE_API_VERSION "api-v25"