The R Project SVN – R – Diff – /trunk/src/gnuwin32/console.c

 /*
  *  R : A Computer Language for Statistical Data Analysis
  *  file console.c
  *  Copyright (C) 1998--2003  Guido Masarotto and Brian Ripley
  *  Copyright (C) 2004-8      The R Foundation
- *  Copyright (C) 2004-2024   The R Core Team
+ *  Copyright (C) 2004-2025   The R Core Team
+ *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
 	l1 = wcslen(stmp);
 	wcsncpy(s, stmp, l1);
 	if(l1 > l) l = l1;
 	s[l] = L'\0';
 	len = l; /* for redraw that uses len */
-	/* and reset cursor position */
-	{
-	    wchar_t *P = s;
-	    int w0;
-	    for (w0 = 0; *P; P++) w0 += wcwidth(*P);
-	    CURCOL = w0;
-	}
+    }
     col1 = COLS - 1;
     insel = p->sel ? ((i - p->my0) * (i - p->my1)) : 1;
     if (insel < 0) {
 	WLHELPER(0, col1, bg, fg);
     prompt_len = wcslen(aLine);
     for (; P < aLine + pre_prompt_len; P++)
 	if(*P == L'\r') w0 = 0;
 	else w0 += mbcslocale ? Ri18n_wcwidth(*P) : 1;
     USER(NUMLINES - 1) = w0;
+    for(; *P; P++)
+	if(*P == L'\r') w0 = 0;
+	else w0 += mbcslocale ? Ri18n_wcwidth(*P) : 1;
-    prompt_wid = wcswidth(aLine);
+    prompt_wid = w0;
     if (NUMLINES > ROWS) {
 	CURROW = ROWS - 1;
 	NEWFV = NUMLINES - ROWS;
     } else {
 	CURROW = NUMLINES - 1;

The R Project SVN R