aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2010-11-23 22:27:22 +0200
committerEli Zaretskii2010-11-23 22:27:22 +0200
commitf8ab8c1f816bac2eebb86581bc50cd1434effe50 (patch)
treed936fe3a9f524ac0cc3a907053daf9de64febf23 /src
parent628e219faf38943e266eb0286ddda7e1390cb0bf (diff)
downloademacs-f8ab8c1f816bac2eebb86581bc50cd1434effe50.tar.gz
emacs-f8ab8c1f816bac2eebb86581bc50cd1434effe50.zip
Avoid GCC warning with inline functions.
intervals.c (temp_set_point_both): Define before calling, to avoid GCC warnings.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/intervals.c18
2 files changed, 14 insertions, 9 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 9de862d06f5..c18c84a42cb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12010-11-23 Eli Zaretskii <eliz@gnu.org>
2
3 * intervals.c (temp_set_point_both): Define before calling, to
4 avoid GCC warnings.
5
12010-11-23 Dan Nicolaescu <dann@ics.uci.edu> 62010-11-23 Dan Nicolaescu <dann@ics.uci.edu>
2 7
3 * nsmenu.m: Use #include <config.h> instead of "config.h". 8 * nsmenu.m: Use #include <config.h> instead of "config.h".
diff --git a/src/intervals.c b/src/intervals.c
index 5e08e13d23b..def63c43cc4 100644
--- a/src/intervals.c
+++ b/src/intervals.c
@@ -1875,15 +1875,6 @@ lookup_char_property (Lisp_Object plist, register Lisp_Object prop, int textprop
1875} 1875}
1876 1876
1877 1877
1878/* Set point "temporarily", without checking any text properties. */
1879
1880INLINE void
1881temp_set_point (struct buffer *buffer, EMACS_INT charpos)
1882{
1883 temp_set_point_both (buffer, charpos,
1884 buf_charpos_to_bytepos (buffer, charpos));
1885}
1886
1887/* Set point in BUFFER "temporarily" to CHARPOS, which corresponds to 1878/* Set point in BUFFER "temporarily" to CHARPOS, which corresponds to
1888 byte position BYTEPOS. */ 1879 byte position BYTEPOS. */
1889 1880
@@ -1906,6 +1897,15 @@ temp_set_point_both (struct buffer *buffer,
1906 BUF_PT (buffer) = charpos; 1897 BUF_PT (buffer) = charpos;
1907} 1898}
1908 1899
1900/* Set point "temporarily", without checking any text properties. */
1901
1902INLINE void
1903temp_set_point (struct buffer *buffer, EMACS_INT charpos)
1904{
1905 temp_set_point_both (buffer, charpos,
1906 buf_charpos_to_bytepos (buffer, charpos));
1907}
1908
1909/* Set point in BUFFER to CHARPOS. If the target position is 1909/* Set point in BUFFER to CHARPOS. If the target position is
1910 before an intangible character, move to an ok place. */ 1910 before an intangible character, move to an ok place. */
1911 1911