patch 9.1.1636: style issues

Problem:  style issues
Solution: Fix indentation of function parameters exceeding 80 character
          length (Yegappan Lakshmanan).

closes: #18013

Signed-off-by: Yegappan Lakshmanan <yegappan@yahoo.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/channel.c b/src/channel.c
index a369c716096b78ad5210236ab2e8f5d7f2ce3eed..0eac3d6bf38e156ef407591f7075bde1281f51df 100644 (file)
--- a/src/channel.c
+++ b/src/channel.c
@@ -2714,7 +2714,11 @@ invoke_one_time_callback(
 }
 
     static void
-append_to_buffer(buf_T *buffer, char_u *msg, channel_T *channel, ch_part_T part)
+append_to_buffer(
+    buf_T      *buffer,
+    char_u     *msg,
+    channel_T  *channel,
+    ch_part_T  part)
 {
     aco_save_T aco;
     linenr_T    lnum = buffer->b_ml.ml_line_count;

diff --git a/src/dict.c b/src/dict.c
index 5339bb52cd973d0e4a61ab1d620a365bcbd2cee9..b4e971e5657d11e28e7b8fc81e81e588380149b5 100644 (file)
--- a/src/dict.c
+++ b/src/dict.c
@@ -387,7 +387,11 @@ dict_add(dict_T *d, dictitem_T *item)
  * Returns FAIL when out of memory and when key already exists.
  */
     static int
-dict_add_number_special(dict_T *d, char *key, varnumber_T nr, vartype_T vartype)
+dict_add_number_special(
+    dict_T     *d,
+    char       *key,
+    varnumber_T        nr,
+    vartype_T  vartype)
 {
     dictitem_T *item;
 

diff --git a/src/diff.c b/src/diff.c
index b8d9de539d404d2d1bedd23d24a4682b9e7b9bc2..13afade25c8127e7a7cb2653428c67b1e19b5ed5 100644 (file)
--- a/src/diff.c
+++ b/src/diff.c
@@ -2750,7 +2750,11 @@ diff_set_topline(win_T *fromwin, win_T *towin)
  * syntax is correct.
  */
     static int
-parse_diffanchors(int check_only, buf_T *buf, linenr_T *anchors, int *num_anchors)
+parse_diffanchors(
+    int                check_only,
+    buf_T      *buf,
+    linenr_T   *anchors,
+    int                *num_anchors)
 {
     int i;
     char_u *dia = (*buf->b_p_dia == NUL) ? p_dia : buf->b_p_dia;

diff --git a/src/gui_gtk_f.c b/src/gui_gtk_f.c
index 54828a1085b6cfdbcd9c14c582c9ba5b72ec06e7..dea7dd0b01df319bf237d1b6c3ac4ee7ef7b45eb 100644 (file)
--- a/src/gui_gtk_f.c
+++ b/src/gui_gtk_f.c
@@ -745,7 +745,10 @@ form_realize_child(GtkForm *form, GtkFormChild *child)
 }
 
     static void
-form_position_child(GtkForm *form, GtkFormChild *child, gboolean force_allocate)
+form_position_child(
+    GtkForm            *form,
+    GtkFormChild       *child,
+    gboolean           force_allocate)
 {
     gint x;
     gint y;

diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 6b587385aa8dc59087fc6d92046549bfae7ebcdc..f52f3855485737c2ab072f446e88c3778399fdc8 100644 (file)
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -5419,7 +5419,10 @@ gui_mch_free_font(GuiFont font)
  * monospace fonts as it's unlikely other fonts would be useful.
  */
     void
-gui_mch_expand_font(optexpand_T *args, void *param, int (*add_match)(char_u *val))
+gui_mch_expand_font(
+    optexpand_T        *args,
+    void       *param,
+    int                (*add_match)(char_u *val))
 {
     PangoFontFamily    **font_families = NULL;
     int                        n_families = 0;

diff --git a/src/gui_photon.c b/src/gui_photon.c
index 9bce94ddfaa125a4a48e8c86bcfafed44b7c0347..24426655f3852f1031306f7f101bf10d6a82b193 100644 (file)
--- a/src/gui_photon.c
+++ b/src/gui_photon.c
@@ -348,7 +348,10 @@ gui_ph_handle_timer_cursor(
 }
 
     static int
-gui_ph_handle_timer_timeout(PtWidget_t *widget, void *data, PtCallbackInfo_t *info)
+gui_ph_handle_timer_timeout(
+    PtWidget_t         *widget,
+    void               *data,
+    PtCallbackInfo_t   *info)
 {
     is_timeout = TRUE;
 
@@ -1476,7 +1479,10 @@ gui_ph_dialog_close(int button, void *data)
 }
 
     static int
-gui_ph_dialog_text_enter(PtWidget_t *widget, void *data, PtCallbackInfo_t *info)
+gui_ph_dialog_text_enter(
+    PtWidget_t         *widget,
+    void               *data,
+    PtCallbackInfo_t   *info)
 {
     if (info->reason_subtype == Pt_EDIT_ACTIVATE)
        gui_ph_dialog_close(1, data);

diff --git a/src/if_mzsch.c b/src/if_mzsch.c
index 4a8644c50f3292d7e7398a401f72398763f5f1f8..450b43b8f53f8388ddc158a4d39013b8f63d230d 100644 (file)
--- a/src/if_mzsch.c
+++ b/src/if_mzsch.c
@@ -841,7 +841,11 @@ static void remove_timer(void);
 // timers are presented in GUI only
 # if defined(FEAT_GUI_MSWIN)
     static void CALLBACK
-timer_proc(HWND hwnd UNUSED, UINT uMsg UNUSED, UINT_PTR idEvent UNUSED, DWORD dwTime UNUSED)
+timer_proc(
+    HWND       hwnd UNUSED,
+    UINT       uMsg UNUSED,
+    UINT_PTR   idEvent UNUSED,
+    DWORD      dwTime UNUSED)
 # elif defined(FEAT_GUI_GTK)
     static gboolean
 timer_proc(gpointer data UNUSED)
@@ -1306,7 +1310,10 @@ mzscheme_init(void)
  * Evaluate command with exception handling
  */
     static int
-eval_with_exn_handling(void *data, Scheme_Closed_Prim *what, Scheme_Object **ret)
+eval_with_exn_handling(
+    void               *data,
+    Scheme_Closed_Prim *what,
+    Scheme_Object      **ret)
 {
     Scheme_Object   *value = NULL;
     Scheme_Object   *exn = NULL;
@@ -1698,7 +1705,10 @@ vim_eval(void *data UNUSED, int argc UNUSED, Scheme_Object **argv UNUSED)
  * (range-start)
  */
     static Scheme_Object *
-get_range_start(void *data UNUSED, int argc UNUSED, Scheme_Object **argv UNUSED)
+get_range_start(
+    void               *data UNUSED,
+    int                        argc UNUSED,
+    Scheme_Object      **argv UNUSED)
 {
     return scheme_make_integer(range_start);
 }
@@ -1883,7 +1893,10 @@ get_curr_win(void *data UNUSED, int argc UNUSED, Scheme_Object **argv UNUSED)
  * (win-count)
  */
     static Scheme_Object *
-get_window_count(void *data UNUSED, int argc UNUSED, Scheme_Object **argv UNUSED)
+get_window_count(
+    void               *data UNUSED,
+    int                        argc UNUSED,
+    Scheme_Object      **argv UNUSED)
 {
     int            n = 0;
     win_T   *w;
@@ -2275,7 +2288,10 @@ get_buffer_num(void *data, int argc, Scheme_Object **argv)
  * (buff-count)
  */
     static Scheme_Object *
-get_buffer_count(void *data UNUSED, int argc UNUSED, Scheme_Object **argv UNUSED)
+get_buffer_count(
+    void               *data UNUSED,
+    int                        argc UNUSED,
+    Scheme_Object      **argv UNUSED)
 {
     buf_T   *b;
     int            n = 0;
@@ -2300,7 +2316,10 @@ get_buffer_name(void *data, int argc, Scheme_Object **argv)
  * (curr-buff)
  */
     static Scheme_Object *
-get_curr_buffer(void *data UNUSED, int argc UNUSED, Scheme_Object **argv UNUSED)
+get_curr_buffer(
+    void               *data UNUSED,
+    int                        argc UNUSED,
+    Scheme_Object      **argv UNUSED)
 {
     return (Scheme_Object *)get_vim_curr_buffer();
 }
@@ -2997,7 +3016,10 @@ vim_to_mzscheme(typval_T *vim_value)
 }
 
     static Scheme_Object *
-vim_to_mzscheme_impl(typval_T *vim_value, int depth, Scheme_Hash_Table *visited)
+vim_to_mzscheme_impl(
+    typval_T           *vim_value,
+    int                        depth,
+    Scheme_Hash_Table  *visited)
 {
     Scheme_Object   *result = NULL;
     int                    new_value = TRUE;

diff --git a/src/if_python.c b/src/if_python.c
index 012a3e776948bfcbf56ff04b02f8b437b0d68c64..43b780be75bd963b528b2ab8c02014c836f24392 100644 (file)
--- a/src/if_python.c
+++ b/src/if_python.c
@@ -1016,7 +1016,12 @@ fail:
  * External interface
  */
     static void
-DoPyCommand(const char *cmd, dict_T* locals, rangeinitializer init_range, runner run, void *arg)
+DoPyCommand(
+    const char         *cmd,
+    dict_T*            locals,
+    rangeinitializer   init_range,
+    runner             run,
+    void               *arg)
 {
 #ifndef PY_CAN_RECURSE
     static int         recursive = 0;

diff --git a/src/optionstr.c b/src/optionstr.c
index 03cf4391ccdcaa3da5a1950be46a598aefb02677..bbae3397366535654d93ac3c542dc1732d3e0d65 100644 (file)
--- a/src/optionstr.c
+++ b/src/optionstr.c
@@ -1279,7 +1279,10 @@ did_set_breakindentopt(optset_T *args)
 }
 
     int
-expand_set_breakindentopt(optexpand_T *args, int *numMatches, char_u ***matches)
+expand_set_breakindentopt(
+    optexpand_T                *args,
+    int                        *numMatches,
+    char_u             ***matches)
 {
     return expand_set_opt_string(
            args,
@@ -3756,7 +3759,10 @@ did_set_sessionoptions(optset_T *args)
 }
 
     int
-expand_set_sessionoptions(optexpand_T *args, int *numMatches, char_u ***matches)
+expand_set_sessionoptions(
+    optexpand_T                *args,
+    int                        *numMatches,
+    char_u             ***matches)
 {
     return expand_set_opt_string(
            args,
@@ -4308,7 +4314,10 @@ did_set_toolbariconsize(optset_T *args UNUSED)
 }
 
     int
-expand_set_toolbariconsize(optexpand_T *args, int *numMatches, char_u ***matches)
+expand_set_toolbariconsize(
+    optexpand_T        *args,
+    int                *numMatches,
+    char_u     ***matches)
 {
     return expand_set_opt_string(
            args,

diff --git a/src/os_mswin.c b/src/os_mswin.c
index 7a323f327b09dcdf80d3e57e9ed0b810b827111c..c2c1bd0c27d96acaac832ddcce6681a4e2d77ed4 100644 (file)
--- a/src/os_mswin.c
+++ b/src/os_mswin.c
@@ -3001,7 +3001,10 @@ expand_font_enumproc(
  * platform code.
  */
     void
-gui_mch_expand_font(optexpand_T *args, void *param UNUSED, int (*add_match)(char_u *val))
+gui_mch_expand_font(
+    optexpand_T        *args,
+    void       *param UNUSED,
+    int                (*add_match)(char_u *val))
 {
     expand_T       *xp = args->oe_xp;
     if (xp->xp_pattern > args->oe_set_arg && *(xp->xp_pattern-1) == ':')

diff --git a/src/os_vms.c b/src/os_vms.c
index 42dbc4b0072db79dc163b31e103b6ee6bb7a3158..3955c8bfe589120652dde74e3c5e39d76d02db88 100644 (file)
--- a/src/os_vms.c
+++ b/src/os_vms.c
@@ -443,7 +443,12 @@ vms_wproc(char *name, int val)
  *
  */
     int
-mch_expand_wildcards(int num_pat, char_u **pat, int *num_file, char_u ***file, int flags)
+mch_expand_wildcards(
+    int                num_pat,
+    char_u     **pat,
+    int                *num_file,
+    char_u     ***file,
+    int                flags)
 {
     int                i, cnt = 0;
     char_u     buf[MAXPATHL];

diff --git a/src/os_win32.c b/src/os_win32.c
index cc379da549eebb52751e9a761de58338c8f39070..6bd03bd1c8a9682fb58afff7fa2210499726ba5a 100644 (file)
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -2810,7 +2810,12 @@ executable_file(char *name, char_u **path)
  * the allocated memory.
  */
     static int
-executable_exists(char *name, size_t namelen, char_u **path, int use_path, int use_pathext)
+executable_exists(
+    char       *name,
+    size_t     namelen,
+    char_u     **path,
+    int                use_path,
+    int                use_pathext)
 {
     // WinNT and later can use _MAX_PATH wide characters for a pathname, which
     // means that the maximum pathname is _MAX_PATH * 3 bytes when 'enc' is

diff --git a/src/regexp.c b/src/regexp.c
index 305ca896e3ca20459e0a3c75577954801e9b6399..27112bc530fb3f38ab383170b58ab649953d8f32 100644 (file)
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -1253,7 +1253,11 @@ typedef enum
 // note:
 //     submatch is available only if FEAT_EVAL is defined.
     static void
-reg_getline_common(linenr_T lnum, reg_getline_flags_T flags, char_u **line, colnr_T *length)
+reg_getline_common(
+    linenr_T           lnum,
+    reg_getline_flags_T        flags,
+    char_u             **line,
+    colnr_T            *length)
 {
     int get_line = flags & RGLF_LINE;
     int get_length = flags & RGLF_LENGTH;

diff --git a/src/search.c b/src/search.c
index 12bf6f7ffe2ad4dafb86d6733d29de20bbd39ea1..677d1735ab51064b26d788824bb80cedfc350c13 100644 (file)
--- a/src/search.c
+++ b/src/search.c
@@ -2922,7 +2922,12 @@ showmatch(
  * Returns TRUE, FALSE or -1 for failure.
  */
     static int
-is_zero_width(char_u *pattern, size_t patternlen, int move, pos_T *cur, int direction)
+is_zero_width(
+    char_u     *pattern,
+    size_t     patternlen,
+    int                move,
+    pos_T      *cur,
+    int                direction)
 {
     regmmatch_T        regmatch;
     int                nmatched = 0;

diff --git a/src/sign.c b/src/sign.c
index e997a770ab03c89ae23d96f3ceccba2fe1c7eb2e..69837a4946d1e0267a1d767d77580341a73389c1 100644 (file)
--- a/src/sign.c
+++ b/src/sign.c
@@ -822,7 +822,11 @@ sign_list_placed(buf_T *rbuf, char_u *sign_group)
  * Adjust a placed sign for inserted/deleted lines.
  */
 void
-sign_mark_adjust(linenr_T line1, linenr_T line2, long amount, long amount_after)
+sign_mark_adjust(
+    linenr_T    line1,
+    linenr_T    line2,
+    long        amount,
+    long        amount_after)
 {
     sign_entry_T *sign = NULL; // a sign in a b_signlist
     FOR_ALL_SIGNS_IN_BUF(curbuf, sign)

diff --git a/src/usercmd.c b/src/usercmd.c
index 7c10a51dfa3c448fba576674abb472216c910428..9308cd98275f4d31272863b69fdaba0e41984c9a 100644 (file)
--- a/src/usercmd.c
+++ b/src/usercmd.c
@@ -1543,7 +1543,12 @@ uc_split_args(char_u *arg, size_t *lenp)
 }
 
     static size_t
-add_cmd_modifier(char_u *buf, size_t buflen, char *mod_str, size_t mod_strlen, int *multi_mods)
+add_cmd_modifier(
+    char_u     *buf,
+    size_t     buflen,
+    char       *mod_str,
+    size_t     mod_strlen,
+    int                *multi_mods)
 {
     if (buf != NULL)
     {

diff --git a/src/version.c b/src/version.c
index 2a2d0598c1337faa1a034cf3c0e7a8a5d87c870b..3c38765d4368be00082dd2d6aee264eea0e2b681 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1636,
 /**/
     1635,
 /**/