[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r101571: Fix last changes in editfns.
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r101571: Fix last changes in editfns.c and intervals.c. |
Date: |
Thu, 23 Sep 2010 15:18:30 -0400 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 101571
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Thu 2010-09-23 15:18:30 -0400
message:
Fix last changes in editfns.c and intervals.c.
editfns.c (clip_to_bounds): Return an EMACS_INT value.
lisp.h (clip_to_bounds): Adjust prototype.
intervals.c (adjust_for_invis_intang): Return EMACS_INT value.
modified:
src/ChangeLog
src/editfns.c
src/intervals.c
src/lisp.h
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2010-09-23 19:12:18 +0000
+++ b/src/ChangeLog 2010-09-23 19:18:30 +0000
@@ -1,3 +1,11 @@
+2010-09-23 Eli Zaretskii <address@hidden>
+
+ * editfns.c (clip_to_bounds): Return an EMACS_INT value.
+
+ * lisp.h (clip_to_bounds): Adjust prototype.
+
+ * intervals.c (adjust_for_invis_intang): Return EMACS_INT value.
+
2010-09-23 Lars Magne Ingebrigtsen <address@hidden>
* lisp.h: Change the definition of all marker.c functions that
=== modified file 'src/editfns.c'
--- a/src/editfns.c 2010-09-23 17:10:21 +0000
+++ b/src/editfns.c 2010-09-23 19:18:30 +0000
@@ -272,7 +272,7 @@
return buildmark (PT, PT_BYTE);
}
-int
+EMACS_INT
clip_to_bounds (EMACS_INT lower, EMACS_INT num, EMACS_INT upper)
{
if (num < lower)
=== modified file 'src/intervals.c'
--- a/src/intervals.c 2010-09-23 18:54:49 +0000
+++ b/src/intervals.c 2010-09-23 19:18:30 +0000
@@ -1926,7 +1926,7 @@
Note that `stickiness' is determined by overlay marker insertion types,
if the invisible property comes from an overlay. */
-static int
+static EMACS_INT
adjust_for_invis_intang (EMACS_INT pos, EMACS_INT test_offs, EMACS_INT adj,
int test_intang)
{
=== modified file 'src/lisp.h'
--- a/src/lisp.h 2010-09-23 19:12:18 +0000
+++ b/src/lisp.h 2010-09-23 19:18:30 +0000
@@ -2991,7 +2991,7 @@
EXFUN (Fuser_login_name, 1);
EXFUN (Fsystem_name, 0);
EXFUN (Fcurrent_time, 0);
-extern int clip_to_bounds (EMACS_INT, EMACS_INT, EMACS_INT);
+extern EMACS_INT clip_to_bounds (EMACS_INT, EMACS_INT, EMACS_INT);
extern Lisp_Object make_buffer_string (EMACS_INT, EMACS_INT, int);
extern Lisp_Object make_buffer_string_both (EMACS_INT, EMACS_INT, EMACS_INT,
EMACS_INT, int);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r101571: Fix last changes in editfns.c and intervals.c.,
Eli Zaretskii <=