diff options
| author | Paul Eggert | 2011-04-15 00:48:51 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-04-15 00:48:51 -0700 |
| commit | 4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9 (patch) | |
| tree | e993b231bb5555c9c961f5d0b20d90ac76f77bbd /src/marker.c | |
| parent | 1963a2e0bb07cc8dee6d27f972f93d9cfd7c6b2d (diff) | |
| parent | 49093f601b69d91126aefd328ee8f6bfeb797407 (diff) | |
| download | emacs-4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9.tar.gz emacs-4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9.zip | |
Merge from mainline.
Diffstat (limited to 'src/marker.c')
| -rw-r--r-- | src/marker.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/marker.c b/src/marker.c index 7d461099140..675bbc5ad73 100644 --- a/src/marker.c +++ b/src/marker.c | |||
| @@ -242,6 +242,7 @@ buf_charpos_to_bytepos (struct buffer *b, EMACS_INT charpos) | |||
| 242 | /* Used for debugging: recompute the bytepos corresponding to CHARPOS | 242 | /* Used for debugging: recompute the bytepos corresponding to CHARPOS |
| 243 | in the simplest, most reliable way. */ | 243 | in the simplest, most reliable way. */ |
| 244 | 244 | ||
| 245 | extern EMACS_INT verify_bytepos (EMACS_INT charpos) EXTERNALLY_VISIBLE; | ||
| 245 | EMACS_INT | 246 | EMACS_INT |
| 246 | verify_bytepos (EMACS_INT charpos) | 247 | verify_bytepos (EMACS_INT charpos) |
| 247 | { | 248 | { |
| @@ -864,6 +865,7 @@ DEFUN ("buffer-has-markers-at", Fbuffer_has_markers_at, Sbuffer_has_markers_at, | |||
| 864 | 865 | ||
| 865 | /* For debugging -- count the markers in buffer BUF. */ | 866 | /* For debugging -- count the markers in buffer BUF. */ |
| 866 | 867 | ||
| 868 | extern int count_markers (struct buffer *) EXTERNALLY_VISIBLE; | ||
| 867 | int | 869 | int |
| 868 | count_markers (struct buffer *buf) | 870 | count_markers (struct buffer *buf) |
| 869 | { | 871 | { |