# HG changeset patch
# User jwe
# Date 1151865911 0
# Node ID 27771d9cd4f4cc971ced334a821844bcc886cdee
# Parent  50d43cdbec80a005f2ab01294e7e83c810ddfc61
[project @ 2006-07-02 18:45:11 by jwe]

diff --git a/src/ChangeLog b/src/ChangeLog
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-02  John W. Eaton  <jwe@octave.org>
+
+	* ov-str-mat.cc (CHAR_MATRIX_CONV): Omit "warn-" from label.
+	* parse.y (maybe_warn_variable_switch_label): Likewise.
+
 2006-07-01  John W. Eaton  <jwe@octave.org>
 
 	* parse.y (finish_cell): Use finish_matrix to do constant folding.
diff --git a/src/ov-str-mat.cc b/src/ov-str-mat.cc
--- a/src/ov-str-mat.cc
+++ b/src/ov-str-mat.cc
@@ -176,7 +176,7 @@
     gripe_invalid_conversion ("string", TNAME); \
   else \
     { \
-      warning_with_id ("Octave:warn-str-to-num", \
+      warning_with_id ("Octave:str-to-num", \
 		       "implicit conversion from %s to %s", \
 		       "string", TNAME); \
  \
diff --git a/src/parse.y b/src/parse.y
--- a/src/parse.y
+++ b/src/parse.y
@@ -1533,7 +1533,7 @@
 maybe_warn_variable_switch_label (tree_expression *expr)
 {
   if (! expr->is_constant ())
-    warning_with_id ("Octave:warn-variable-switch-label",
+    warning_with_id ("Octave:variable-switch-label",
     		     "variable switch label");
 }