Mercurial > hg > octave-lyh

changeset 9475:983de84e4bf3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rename merge -> ifelse
author Jaroslav Hajek <highegg@gmail.com>
date Thu, 30 Jul 2009 21:14:04 +0200
parents 25ed2d6aacf6
children d9b25c5b8ee5
files src/ChangeLog src/data.cc
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-30  Jaroslav Hajek  <highegg@gmail.com>
+
+	* data.cc (Fmerge): Rename to Fifelse.
+
 2009-07-30  David Grundberg  <individ@acc.umu.se>
 
 	* symtab.h (symbol_table::parent_scope): Remove.
--- a/src/data.cc
+++ b/src/data.cc
@@ -6060,9 +6060,9 @@
                          fval.INTX ## _array_value ()); \
     }
 
-DEFUN (merge, args, ,
+DEFUN (ifelse, args, ,
   "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} merge (@var{mask}, @var{tval}, @var{fval})\n\
+@deftypefn {Built-in Function} {} ifelse (@var{mask}, @var{tval}, @var{fval})\n\
 Merges elements of @var{true_val} and @var{false_val}, depending on the value of\n\
 @var{mask}. If @var{mask} is a logical scalar, the other two arguments can be\n\
 arbitrary values. Otherwise, @var{mask} must be a logical array, and @var{tval},\n\