Use DEF_CMD_CLOSED for Close:mark

Rather than special strcmp handling, use DEF_CMD_CLOSED to ensure
Close:mark can be called after a pane has been closed.

Signed-off-by: NeilBrown <neil@brown.name>

diff --git a/core-pane.h b/core-pane.h
index 65a43ff3ecb7080c62ec997ee126faa0428f7658..8e54f3c73d2a20fc2694335dd04d36298135e5d0 100644 (file)
--- a/core-pane.h
+++ b/core-pane.h
@@ -136,9 +136,9 @@ static inline int do_call_val(enum target_type type, struct pane *home,
                    ci.key[0] != 'C' && /* Compile will often optimise
                                         * the strncmp away
                                         */
-                   strncmp(ci.key, "Close", 5) != 0)
+                   strcmp(ci.key, "Close") != 0)
                        /* This pane cannot accept anything but
-                        * "Close" or "Close:mark".
+                        * "Close"
                         */
                        return Efallthrough;
                ci.comm = home->handle;

diff --git a/lang-python.c b/lang-python.c
index 6c8ccd1ceacf31b7c1207fc7504896f2c173c043..d236caba2449468e1f7cc9940d0e9e54a830d2db 100644 (file)
--- a/lang-python.c
+++ b/lang-python.c
@@ -683,7 +683,7 @@ static void python_pane_free(struct command *c safe)
        Py_DECREF(p);
 }
 
-DEF_CMD(python_close_mark)
+DEF_CMD_CLOSED(python_close_mark)
 {
        struct mark *m = ci->mark;
 

diff --git a/render-lines.c b/render-lines.c
index f528f5c3797c5239a05e2c518a10c99572557d54..75fa6f6fd160984c1c6130885ca9d36aa4c6af61 100644 (file)
--- a/render-lines.c
+++ b/render-lines.c
@@ -1368,7 +1368,7 @@ DEF_CMD(render_lines_close)
        return 1;
 }
 
-DEF_CMD(render_lines_close_mark)
+DEF_CMD_CLOSED(render_lines_close_mark)
 {
        struct mark *m = ci->mark;