Mercurial > vim
changeset 3672:5aad2c444a00 v7.3.596
updated for version 7.3.596
Problem: Can't remove all signs for a file or buffer.
Solution: Support "*" for the sign id. (Christian Brabandt)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Tue, 10 Jul 2012 15:18:22 +0200 |
| parents | 3d49d2dbb626 |
| children | cc076119f07a |
| files | runtime/doc/sign.txt src/buffer.c src/ex_cmds.c src/proto/buffer.pro src/version.c |
| diffstat | 5 files changed, 29 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/doc/sign.txt +++ b/runtime/doc/sign.txt @@ -153,8 +153,14 @@ REMOVING SIGNS *:sign-unplace* *E15 Remove the previously placed sign {id} from file {fname}. See remark above about {fname} |:sign-fname|. +:sign unplace * file={fname} + Remove all placed signs in file {fname}. + :sign unplace {id} buffer={nr} - Same, but use buffer {nr}. + Remove the previously placed sign {id} from buffer {nr}. + +:sign unplace * buffer={nr} + Remove all placed signs in buffer {nr}. :sign unplace {id} Remove the previously placed sign {id} from all files it
--- a/src/buffer.c +++ b/src/buffer.c @@ -57,7 +57,6 @@ static void clear_wininfo __ARGS((buf_T #if defined(FEAT_SIGNS) static void insert_sign __ARGS((buf_T *buf, signlist_T *prev, signlist_T *next, int id, linenr_T lnum, int typenr)); -static void buf_delete_signs __ARGS((buf_T *buf)); #endif #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX) @@ -5537,7 +5536,7 @@ buf_signcount(buf, lnum) /* * Delete signs in buffer "buf". */ - static void + void buf_delete_signs(buf) buf_T *buf; {
--- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -6997,6 +6997,16 @@ ex_sign(eap) lnum = atoi((char *)arg); arg = skiptowhite(arg); } + else if (STRNCMP(arg, "*", 1) == 0 && idx == SIGNCMD_UNPLACE) + { + if (id != -1) + { + EMSG(_(e_invarg)); + return; + } + id = -2; + arg = skiptowhite(arg + 1); + } else if (STRNCMP(arg, "name=", 5) == 0) { arg += 5; @@ -7033,7 +7043,7 @@ ex_sign(eap) { EMSG2(_("E158: Invalid buffer name: %s"), arg); } - else if (id <= 0) + else if (id <= 0 && !(idx == SIGNCMD_UNPLACE && id == -2)) { if (lnum >= 0 || sign_name != NULL) EMSG(_(e_invarg)); @@ -7074,11 +7084,17 @@ ex_sign(eap) } else if (idx == SIGNCMD_UNPLACE) { - /* ":sign unplace {id} file={fname}" */ if (lnum >= 0 || sign_name != NULL) EMSG(_(e_invarg)); + else if (id == -2) + { + /* ":sign unplace * file={fname}" */ + redraw_buf_later(buf, NOT_VALID); + buf_delete_signs(buf); + } else { + /* ":sign unplace {id} file={fname}" */ lnum = buf_delsign(buf, id); update_debug_sign(buf, lnum); }
--- a/src/proto/buffer.pro +++ b/src/proto/buffer.pro @@ -60,6 +60,7 @@ int buf_findsign __ARGS((buf_T *buf, int int buf_findsign_id __ARGS((buf_T *buf, linenr_T lnum)); int buf_findsigntype_id __ARGS((buf_T *buf, linenr_T lnum, int typenr)); int buf_signcount __ARGS((buf_T *buf, linenr_T lnum)); +void buf_delete_signs __ARGS((buf_T *buf)); void buf_delete_all_signs __ARGS((void)); void sign_list_placed __ARGS((buf_T *rbuf)); void sign_mark_adjust __ARGS((linenr_T line1, linenr_T line2, long amount, long amount_after));