[gnumeric] Deps: write position for dependents if they have any.

[Morten Welinder <mortenw src gnome org>]

commit 0cce6bbc1891ad6d67da364e47fe5ee474304e9e
Author: Morten Welinder <terra gnome org>
Date:   Thu Jul 30 21:12:54 2020 -0400

    Deps: write position for dependents if they have any.
    
    Not cells -- the name is the position.

 src/dependent.c | 6 ++++++
 src/mstyle.c    | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)
---
diff --git a/src/dependent.c b/src/dependent.c
index 9b87a85285..34109bdbe8 100644
--- a/src/dependent.c
+++ b/src/dependent.c
@@ -3173,12 +3173,18 @@ dependent_debug_name_for_sheet (GnmDependent const *dep, Sheet *sheet,
        t = dependent_type (dep);
        klass = g_ptr_array_index (dep_classes, t);
        klass->debug_name (dep, target);
+
+       if (dependent_has_pos (dep) && !dependent_is_cell (dep)) {
+               g_string_append_c (target, '@');
+               g_string_append (target, cellpos_as_string (dependent_pos (dep)));
+       }
 }
 
 
 /**
  * dependent_debug_name:
  * @dep: The dependent we are interested in.
+ * @target: (inout): location to append @dep's name.
  *
  * A useful little debugging utility.
  */
diff --git a/src/mstyle.c b/src/mstyle.c
index e8f9e513bb..70f0dd547e 100644
--- a/src/mstyle.c
+++ b/src/mstyle.c
@@ -1241,6 +1241,7 @@ gnm_style_cmp (GnmStyle const *a, GnmStyle const *b)
        return a < b ? -1 : +1;
 }
 
+#undef CMP_TRY_NUMBER_RAW
 #undef CMP_TRY_NUMBER
 #undef CMP_TRY_COLOR
 
@@ -2252,7 +2253,7 @@ gnm_style_get_input_msg (GnmStyle const *style)
 /**
  * gnm_style_set_conditions:
  * @style: #GnmStyle to change
- * @sc: (transfer full): #GnmStyleConditions
+ * @sc: (transfer full) (nullable): #GnmStyleConditions
  *
  * This sets conditional style for @style.
  **/