Patch 8.1.2237
Problem:    Mode() result after usign "r" depends on whether CURSOR_SHAPE is
            defined. (Christian Brabandt)
Solution:   Move the #ifdef to only skip ui_cursor_shape().
Files:      src/normal.c


*** ../vim-8.1.2236/src/normal.c        2019-10-29 00:46:43.874173757 +0100
--- src/normal.c        2019-10-31 19:46:21.735230981 +0100
***************
*** 870,882 ****
         */
        if (cp != NULL)
        {
- #ifdef CURSOR_SHAPE
            if (repl)
            {
                State = REPLACE;        /* pretend Replace mode */
                ui_cursor_shape();      /* show different cursor shape */
-           }
  #endif
            if (lang && curbuf->b_p_iminsert == B_IMODE_LMAP)
            {
                /* Allow mappings defined with ":lmap". */
--- 870,882 ----
         */
        if (cp != NULL)
        {
            if (repl)
            {
                State = REPLACE;        /* pretend Replace mode */
+ #ifdef CURSOR_SHAPE
                ui_cursor_shape();      /* show different cursor shape */
  #endif
+           }
            if (lang && curbuf->b_p_iminsert == B_IMODE_LMAP)
            {
                /* Allow mappings defined with ":lmap". */
***************
*** 913,921 ****
            }
            p_smd = save_smd;
  #endif
- #ifdef CURSOR_SHAPE
            State = NORMAL_BUSY;
- #endif
  #ifdef FEAT_CMDL_INFO
            need_flushbuf |= add_to_showcmd(*cp);
  #endif
--- 913,919 ----
*** ../vim-8.1.2236/src/version.c       2019-10-31 04:38:31.353833447 +0100
--- src/version.c       2019-10-31 19:47:38.606833326 +0100
***************
*** 743,744 ****
--- 743,746 ----
  {   /* Add new patch number below this line */
+ /**/
+     2237,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
16. You step out of your room and realize that your parents have moved and
    you don't have a clue when it happened.

 /// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///

-- 
-- 
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php

--- 
You received this message because you are subscribed to the Google Groups 
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
To view this discussion on the web visit 
https://groups.google.com/d/msgid/vim_dev/201910311858.x9VIw5YJ017746%40masaka.moolenaar.net.

Raspunde prin e-mail lui