aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/marker.c12
2 files changed, 5 insertions, 9 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index c438f1fb41a..bcc1f156e62 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12011-03-15 Paul Eggert <eggert@cs.ucla.edu> 12011-03-15 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 * marker.c (bytepos_to_charpos): Remove; unused.
4
3 * lisp.h (verify_bytepos, count_markers): New decls, 5 * lisp.h (verify_bytepos, count_markers): New decls,
4 so that gcc does not warn that these functions aren't declared. 6 so that gcc does not warn that these functions aren't declared.
5 7
diff --git a/src/marker.c b/src/marker.c
index 72c564f420f..7d461099140 100644
--- a/src/marker.c
+++ b/src/marker.c
@@ -257,9 +257,10 @@ verify_bytepos (EMACS_INT charpos)
257 return below_byte; 257 return below_byte;
258} 258}
259 259
260/* bytepos_to_charpos returns the char position corresponding to BYTEPOS. */ 260/* buf_bytepos_to_charpos returns the char position corresponding to
261 BYTEPOS. */
261 262
262/* This macro is a subroutine of bytepos_to_charpos. 263/* This macro is a subroutine of buf_bytepos_to_charpos.
263 It is used when BYTEPOS is actually the byte position. */ 264 It is used when BYTEPOS is actually the byte position. */
264 265
265#define CONSIDER(BYTEPOS, CHARPOS) \ 266#define CONSIDER(BYTEPOS, CHARPOS) \
@@ -303,12 +304,6 @@ verify_bytepos (EMACS_INT charpos)
303} 304}
304 305
305EMACS_INT 306EMACS_INT
306bytepos_to_charpos (EMACS_INT bytepos)
307{
308 return buf_bytepos_to_charpos (current_buffer, bytepos);
309}
310
311EMACS_INT
312buf_bytepos_to_charpos (struct buffer *b, EMACS_INT bytepos) 307buf_bytepos_to_charpos (struct buffer *b, EMACS_INT bytepos)
313{ 308{
314 struct Lisp_Marker *tail; 309 struct Lisp_Marker *tail;
@@ -896,4 +891,3 @@ syms_of_marker (void)
896 doc: /* Non-nil enables debugging checks in byte/char position conversions. */); 891 doc: /* Non-nil enables debugging checks in byte/char position conversions. */);
897 byte_debug_flag = 0; 892 byte_debug_flag = 0;
898} 893}
899