HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove stale comment from fileio.c.
[bpt/emacs.git]
/
src
/
intervals.c
diff --git
a/src/intervals.c
b/src/intervals.c
index
ded536c
..
0e3b684
100644
(file)
--- a/
src/intervals.c
+++ b/
src/intervals.c
@@
-40,8
+40,6
@@
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
#include <config.h>
-#define INTERVALS_INLINE EXTERN_INLINE
-
#include <intprops.h>
#include "lisp.h"
#include "intervals.h"
#include <intprops.h>
#include "lisp.h"
#include "intervals.h"
@@
-1406,10
+1404,7
@@
offset_intervals (struct buffer *buffer, ptrdiff_t start, ptrdiff_t length)
adjust_intervals_for_insertion (buffer_intervals (buffer),
start, length);
else
adjust_intervals_for_insertion (buffer_intervals (buffer),
start, length);
else
- {
- lint_assume (- TYPE_MAXIMUM (ptrdiff_t) <= length);
- adjust_intervals_for_deletion (buffer, start, -length);
- }
+ adjust_intervals_for_deletion (buffer, start, -length);
}
\f
/* Merge interval I with its lexicographic successor. The resulting
}
\f
/* Merge interval I with its lexicographic successor. The resulting
@@
-1794,8
+1789,7
@@
temp_set_point_both (struct buffer *buffer,
ptrdiff_t charpos, ptrdiff_t bytepos)
{
/* In a single-byte buffer, the two positions must be equal. */
ptrdiff_t charpos, ptrdiff_t bytepos)
{
/* In a single-byte buffer, the two positions must be equal. */
- if (BUF_ZV (buffer) == BUF_ZV_BYTE (buffer))
- eassert (charpos == bytepos);
+ eassert (BUF_ZV (buffer) != BUF_ZV_BYTE (buffer) || charpos == bytepos);
eassert (charpos <= bytepos);
eassert (charpos <= BUF_ZV (buffer) || BUF_BEGV (buffer) <= charpos);
eassert (charpos <= bytepos);
eassert (charpos <= BUF_ZV (buffer) || BUF_BEGV (buffer) <= charpos);
@@
-2238,7
+2232,7
@@
get_local_map (ptrdiff_t position, struct buffer *buffer, Lisp_Object type)
editing a field with a `local-map' property, we want insertion at the end
to obey the `local-map' property. */
if (NILP (prop))
editing a field with a `local-map' property, we want insertion at the end
to obey the `local-map' property. */
if (NILP (prop))
- prop = get_pos_property (lispy_position, type, lispy_buffer);
+ prop =
F
get_pos_property (lispy_position, type, lispy_buffer);
SET_BUF_BEGV_BOTH (buffer, old_begv, old_begv_byte);
SET_BUF_ZV_BOTH (buffer, old_zv, old_zv_byte);
SET_BUF_BEGV_BOTH (buffer, old_begv, old_begv_byte);
SET_BUF_ZV_BOTH (buffer, old_zv, old_zv_byte);