# HG changeset patch
# User Jordi Gutiérrez Hermoso <jordigh@octave.org>
# Date 1319137925 18000
# Node ID 7ee61e56eaedcdc3156bcdb3c838021be400183f
# Parent  30414ff19d5e5b52eb1b0b2ffc051a5b31d639cc# Parent  fcdf0993b8c9c0c9a9313931db8c74b7fa62bc75
Periodic merge of stable to default

diff -r 30414ff19d5e -r 7ee61e56eaed scripts/image/imshow.m
--- a/scripts/image/imshow.m	Thu Oct 20 15:35:44 2011 +0100
+++ b/scripts/image/imshow.m	Thu Oct 20 14:12:05 2011 -0500
@@ -115,6 +115,12 @@
     endif
   endwhile
 
+  ## Check for complex images.
+  if (iscomplex (im))
+    warning ("imshow: only showing real part of complex image");
+    im = real (im);
+  endif
+
   ## Set default display range if display_range not set yet.
   if (isempty (display_range))
     display_range = [min(im(:)), max(im(:))];
@@ -130,12 +136,6 @@
     endswitch
   endif
 
-  ## Check for complex images.
-  if (iscomplex (im))
-    warning ("imshow: only showing real part of complex image");
-    im = real (im);
-  endif
-
   nans = isnan (im(:));
   if (any (nans))
     warning ("Octave:imshow-NaN",
diff -r 30414ff19d5e -r 7ee61e56eaed src/DLD-FUNCTIONS/max.cc
--- a/src/DLD-FUNCTIONS/max.cc	Thu Oct 20 15:35:44 2011 +0100
+++ b/src/DLD-FUNCTIONS/max.cc	Thu Oct 20 14:12:05 2011 -0500
@@ -178,7 +178,7 @@
             }
 
           if (! args(1).is_empty ())
-            warning ("%s: second argument is ignored");
+            warning ("%s: second argument is ignored", func);
         }
 
       switch (arg.builtin_type ())