aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2002-04-19 13:46:02 +0000
committerJuanma Barranquero2002-04-19 13:46:02 +0000
commit58b1103e0e47d26596ed518fa8a61c2bf5e6edb5 (patch)
treed01eec6ee46fab84eae8f89d541ecbe4ac14b398
parent175e150b915b7810ea3f963d310f64824dc8f17d (diff)
downloademacs-58b1103e0e47d26596ed518fa8a61c2bf5e6edb5.tar.gz
emacs-58b1103e0e47d26596ed518fa8a61c2bf5e6edb5.zip
(Fmove_to_column): Remove unused local variable `next_boundary_byte'.
(current_column_1): Likewise.
-rw-r--r--src/ChangeLog6
-rw-r--r--src/indent.c10
2 files changed, 8 insertions, 8 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index b8f085ec9f0..286ee38b7fc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
12002-04-19 Juanma Barranquero <lektu@terra.es>
2
3 * indent.c (Fmove_to_column): Remove unused local variable
4 `next_boundary_byte'.
5 (current_column_1): Likewise.
6
12002-04-19 Eli Zaretskii <eliz@is.elta.co.il> 72002-04-19 Eli Zaretskii <eliz@is.elta.co.il>
2 8
3 * msdos.c (Qhbar): New variable. 9 * msdos.c (Qhbar): New variable.
diff --git a/src/indent.c b/src/indent.c
index 244e5448653..437875f34da 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -512,7 +512,7 @@ current_column_1 ()
512 /* Start the scan at the beginning of this line with column number 0. */ 512 /* Start the scan at the beginning of this line with column number 0. */
513 register int col = 0; 513 register int col = 0;
514 int scan, scan_byte; 514 int scan, scan_byte;
515 int next_boundary, next_boundary_byte; 515 int next_boundary;
516 int opoint = PT, opoint_byte = PT_BYTE; 516 int opoint = PT, opoint_byte = PT_BYTE;
517 517
518 scan_newline (PT, PT_BYTE, BEGV, BEGV_BYTE, -1, 1); 518 scan_newline (PT, PT_BYTE, BEGV, BEGV_BYTE, -1, 1);
@@ -520,7 +520,6 @@ current_column_1 ()
520 scan = PT, scan_byte = PT_BYTE; 520 scan = PT, scan_byte = PT_BYTE;
521 SET_PT_BOTH (opoint, opoint_byte); 521 SET_PT_BOTH (opoint, opoint_byte);
522 next_boundary = scan; 522 next_boundary = scan;
523 next_boundary_byte = scan_byte;
524 523
525 if (tab_width <= 0 || tab_width > 1000) tab_width = 8; 524 if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
526 525
@@ -540,7 +539,6 @@ current_column_1 ()
540 goto endloop; 539 goto endloop;
541 if (scan != old_scan) 540 if (scan != old_scan)
542 scan_byte = CHAR_TO_BYTE (scan); 541 scan_byte = CHAR_TO_BYTE (scan);
543 next_boundary_byte = CHAR_TO_BYTE (next_boundary);
544 } 542 }
545 543
546 /* Check composition sequence. */ 544 /* Check composition sequence. */
@@ -936,9 +934,7 @@ The return value is the current column. */)
936 Lisp_Object val; 934 Lisp_Object val;
937 int prev_col = 0; 935 int prev_col = 0;
938 int c = 0; 936 int c = 0;
939 int next_boundary; 937 int next_boundary, pos_byte;
940
941 int pos_byte, next_boundary_byte;
942 938
943 if (tab_width <= 0 || tab_width > 1000) tab_width = 8; 939 if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
944 CHECK_NATNUM (column); 940 CHECK_NATNUM (column);
@@ -948,7 +944,6 @@ The return value is the current column. */)
948 pos_byte = PT_BYTE; 944 pos_byte = PT_BYTE;
949 end = ZV; 945 end = ZV;
950 next_boundary = pos; 946 next_boundary = pos;
951 next_boundary_byte = PT_BYTE;
952 947
953 /* If we're starting past the desired column, 948 /* If we're starting past the desired column,
954 back up to beginning of line and scan from there. */ 949 back up to beginning of line and scan from there. */
@@ -968,7 +963,6 @@ The return value is the current column. */)
968 pos = skip_invisible (pos, &next_boundary, end, Qnil); 963 pos = skip_invisible (pos, &next_boundary, end, Qnil);
969 if (pos != prev) 964 if (pos != prev)
970 pos_byte = CHAR_TO_BYTE (pos); 965 pos_byte = CHAR_TO_BYTE (pos);
971 next_boundary_byte = CHAR_TO_BYTE (next_boundary);
972 if (pos >= end) 966 if (pos >= end)
973 goto endloop; 967 goto endloop;
974 } 968 }