Merge from mainline.

1 files changed, 1 insertions, 1 deletions

diff --git a/src/doc.c b/src/doc.c
index 009616f4f87..d3f8fde08f6 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -905,7 +905,7 @@ Otherwise, return a new string, without any text properties.  */)
                  If this one's not active, get nil.  */
               earlier_maps = Fcdr (Fmemq (tem, Freverse (active_maps)));
               describe_map_tree (tem, 1, Fnreverse (earlier_maps),
-                                 Qnil, (char *)0, 1, 0, 0, 1);
+                                 Qnil, 0, 1, 0, 0, 1);
             }
           tem = Fbuffer_string ();
           Ferase_buffer ();