patch 8.1.1194: typos and small problems in source files

Problem:    Typos and small problems in source files.
Solution:   Small fixes.

diff --git a/src/channel.c b/src/channel.c
index dd47c5b02b5bcbbcd542e0b1d5dfd0b197e94bb4..ca8310258ecf1a9f108ba7ea0f7a8d5d72f385bb 100644 (file)
--- a/src/channel.c
+++ b/src/channel.c
@@ -1906,7 +1906,7 @@ channel_save(channel_T *channel, ch_part_T part, char_u *buf, int len,
 
     if (prepend)
     {
-       /* preend node to the head of the queue */
+       // prepend node to the head of the queue
        node->rq_next = head->rq_next;
        node->rq_prev = NULL;
        if (head->rq_next == NULL)
@@ -1917,7 +1917,7 @@ channel_save(channel_T *channel, ch_part_T part, char_u *buf, int len,
     }
     else
     {
-       /* append node to the tail of the queue */
+       // append node to the tail of the queue
        node->rq_next = NULL;
        node->rq_prev = head->rq_prev;
        if (head->rq_prev == NULL)

diff --git a/src/crypt.c b/src/crypt.c
index e9c52aa1439a14fa0c2479221fb3d6934a5c7d0c..085f8bb81396f989a4e8b96186df73d53e66001a 100644 (file)
--- a/src/crypt.c
+++ b/src/crypt.c
@@ -42,7 +42,7 @@ typedef struct {
     /* Optional function pointer for a self-test. */
     int (* self_test_fn)();
 
-    // Function pointer for initializing encryption/description.
+    // Function pointer for initializing encryption/decryption.
     void (* init_fn)(cryptstate_T *state, char_u *key,
                      char_u *salt, int salt_len, char_u *seed, int seed_len);
 

diff --git a/src/edit.c b/src/edit.c
index 43c8a8b63bd2f21f68fae07b3b77d552523367dd..483ef4abcb5e785d9047292b0a985d0ddac264e9 100644 (file)
--- a/src/edit.c
+++ b/src/edit.c
@@ -4558,10 +4558,8 @@ ins_esc(
        /* Re-enable bracketed paste mode. */
        out_str(T_BE);
 
-    /*
-     * When recording or for CTRL-O, need to display the new mode.
-     * Otherwise remove the mode message.
-     */
+    // When recording or for CTRL-O, need to display the new mode.
+    // Otherwise remove the mode message.
     if (reg_recording != 0 || restart_edit != NUL)
        showmode();
     else if (p_smd && (got_int || !skip_showmode()))

diff --git a/src/installman.sh b/src/installman.sh
index 23fc32568b3ade0967e36e9a20820dbff22af2a5..00a33a2954b3044db00d03ce327988790a8f2a61 100755 (executable)
--- a/src/installman.sh
+++ b/src/installman.sh
@@ -6,7 +6,7 @@
 # 2  target directory                     e.g., "/usr/local/man/it/man1"
 # 3  language addition                    e.g., "" or "-it"
 # 4  vim location as used in manual pages  e.g., "/usr/local/share/vim"
-# 5  runtime dir for menu.vim et al.      e.g., "/usr/local/share/vim/vim70"
+# 5  runtime dir for menu.vim et al.      e.g., "/usr/local/share/vim/vim81"
 # 6  runtime dir for global vimrc file    e.g., "/usr/local/share/vim"
 # 7  source dir for help files            e.g., "../runtime/doc"
 # 8  mode bits for manpages               e.g., "644"

diff --git a/src/regexp.h b/src/regexp.h
index fa3ff42dcef64929deebff93fdc4e49304635a87..c2fafef9aabc0faa2c4ab9b03d707bf1f143499d 100644 (file)
--- a/src/regexp.h
+++ b/src/regexp.h
@@ -81,7 +81,7 @@ typedef struct
 
 /*
  * Structure representing a NFA state.
- * A NFA state may have no outgoing edge, when it is a NFA_MATCH state.
+ * An NFA state may have no outgoing edge, when it is a NFA_MATCH state.
  */
 typedef struct nfa_state nfa_state_T;
 struct nfa_state

diff --git a/src/tag.c b/src/tag.c
index 6a85e747a8d944186c464d647ffb8a98eefc5964..1afeaa273b4fa61a6cf587347f88dbdedeaf997c 100644 (file)
--- a/src/tag.c
+++ b/src/tag.c
@@ -2368,9 +2368,9 @@ parse_line:
                     * Don't add identical matches.
                     * Add all cscope tags, because they are all listed.
                     * "mfp" is used as a hash key, there is a NUL byte to end
-                    * the part matters for comparing, more bytes may follow
-                    * after it.  E.g. help tags store the priority after the
-                    * NUL.
+                    * the part that matters for comparing, more bytes may
+                    * follow after it.  E.g. help tags store the priority
+                    * after the NUL.
                     */
 #ifdef FEAT_CSCOPE
                    if (use_cscope)

diff --git a/src/term.c b/src/term.c
index ff1adc9ad6ace3a9578af0e93a0787f2753b09bf..c7e8ddf0c5a999f265e2685bbf483bb8c50649ac 100644 (file)
--- a/src/term.c
+++ b/src/term.c
@@ -21,8 +21,8 @@
  * (char **). This define removes that prototype. We include our own prototype
  * below.
  */
-
 #define tgetstr tgetstr_defined_wrong
+
 #include "vim.h"
 
 #ifdef HAVE_TGETENT

diff --git a/src/terminal.c b/src/terminal.c
index 7dd0387dd3c25f5a852e5aa789a45b989384ece7..a8a1618e66205fa254c5839f1f6cc8204c30b56e 100644 (file)
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -5671,9 +5671,9 @@ typedef int *DWORD_PTR;
 typedef int HPCON;
 typedef int HRESULT;
 typedef int LPPROC_THREAD_ATTRIBUTE_LIST;
+typedef int SIZE_T;
 typedef int PSIZE_T;
 typedef int PVOID;
-typedef int SIZE_T;
 typedef int WINAPI;
 #endif
 

diff --git a/src/userfunc.c b/src/userfunc.c
index 41c660c0c10ce105ea40963a87f2b2d1af32a902..bd7d2f7d81c365c72f9b32b0e0990e250bb2f0eb 100644 (file)
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -508,7 +508,8 @@ fname_trans_sid(char_u *name, char_u *fname_buf, char_u **tofree, int *error)
                *error = ERROR_SCRIPT;
            else
            {
-               sprintf((char *)fname_buf + 3, "%ld_", (long)current_sctx.sc_sid);
+               sprintf((char *)fname_buf + 3, "%ld_",
+                                                   (long)current_sctx.sc_sid);
                i = (int)STRLEN(fname_buf);
            }
        }

diff --git a/src/version.c b/src/version.c
index e6de24bca4e75cc83f1bd3d21a5910a678550486..a4e01292235832863cef4be1ff7e75584b4d3424 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -771,6 +771,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1194,
 /**/
     1193,
 /**/