From 63dae8e97d343fd4ebfe3dc08f0e8dc932630a4c Mon Sep 17 00:00:00 2001
From: Joakim Verona
Date: Tue, 10 Sep 2013 23:52:26 +0200
Subject: merge upstream

---
 src/buffer.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/buffer.h')

diff --git a/src/buffer.h b/src/buffer.h
index bedb7890939..169a15c7d0f 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -249,6 +249,7 @@ extern void temp_set_point (struct buffer *, ptrdiff_t);
 extern void set_point_both (ptrdiff_t, ptrdiff_t);
 extern void temp_set_point_both (struct buffer *,
 				 ptrdiff_t, ptrdiff_t);
+extern void set_point_from_marker (Lisp_Object);
 extern void enlarge_buffer_text (struct buffer *, ptrdiff_t);
 
 
-- 
cgit v1.2.1