From c59478bce26f5b9ab3cfce01259a2946437b447a Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 2 Apr 2011 18:00:03 -0700 Subject: [PATCH] * indent.c (MULTIBYTE_BYTES_WIDTH): Don't compute wide_column. All callers changed. This avoids the need for an unused var. --- src/ChangeLog | 3 +++ src/indent.c | 13 +++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 2b1f83494f..5805a8c161 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2011-04-03 Paul Eggert + * indent.c (MULTIBYTE_BYTES_WIDTH): Don't compute wide_column. + All callers changed. This avoids the need for an unused var. + * casefiddle.c (casify_region): Remove var that is set but not used. * dired.c (file_name_completion): Remove var that is set but not used. diff --git a/src/indent.c b/src/indent.c index b3028a27b3..8732b2ca5c 100644 --- a/src/indent.c +++ b/src/indent.c @@ -271,14 +271,13 @@ skip_invisible (EMACS_INT pos, EMACS_INT *next_boundary_p, EMACS_INT to, Lisp_Ob DP is a display table or NULL. - This macro is used in current_column_1, Fmove_to_column, and + This macro is used in scan_for_column and in compute_motion. */ #define MULTIBYTE_BYTES_WIDTH(p, dp, bytes, width) \ do { \ int ch; \ \ - wide_column = 0; \ ch = STRING_CHAR_AND_LENGTH (p, bytes); \ if (BYTES_BY_CHAR_HEAD (*p) != bytes) \ width = bytes * 4; \ @@ -288,8 +287,6 @@ skip_invisible (EMACS_INT pos, EMACS_INT *next_boundary_p, EMACS_INT to, Lisp_Ob width = XVECTOR (DISP_CHAR_VECTOR (dp, ch))->size; \ else \ width = CHAR_WIDTH (ch); \ - if (width > 1) \ - wide_column = width; \ } \ } while (0) @@ -666,7 +663,7 @@ scan_for_column (EMACS_INT *endpos, EMACS_INT *goalcol, EMACS_INT *prevcol) { /* Start of multi-byte form. */ unsigned char *ptr; - int bytes, width, wide_column; + int bytes, width; ptr = BYTE_POS_ADDR (scan_byte); MULTIBYTE_BYTES_WIDTH (ptr, dp, bytes, width); @@ -1657,14 +1654,14 @@ compute_motion (EMACS_INT from, EMACS_INT fromvpos, EMACS_INT fromhpos, int did_ { /* Start of multi-byte form. */ unsigned char *ptr; - int mb_bytes, mb_width, wide_column; + int mb_bytes, mb_width; pos_byte--; /* rewind POS_BYTE */ ptr = BYTE_POS_ADDR (pos_byte); MULTIBYTE_BYTES_WIDTH (ptr, dp, mb_bytes, mb_width); pos_byte += mb_bytes; - if (wide_column) - wide_column_end_hpos = hpos + wide_column; + if (mb_width > 1 && BYTES_BY_CHAR_HEAD (*ptr) == mb_bytes) + wide_column_end_hpos = hpos + mb_width; hpos += mb_width; } else if (VECTORP (charvec)) -- 2.39.2