From: Kim F. Storm <storm@cua.dk>
Date: Tue, 20 Apr 2004 22:22:45 +0000 (+0000)
Subject: (image_ascent): Remove prototype.
X-Git-Tag: ttn-vms-21-2-B4~6694
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c7b08a9de6a9906101148912aeefb394e0fd37d1;p=emacs.git

(image_ascent): Remove prototype.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8ba6c959b01..f0dd96b68b3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,11 @@
+2004-04-21  Kim F. Storm  <storm@cua.dk>
+
+	* image.el (insert-image): Add optional SLICE arg.
+	(insert-sliced-image): New defun.
+
 2004-04-20  Richard M. Stallman  <rms@gnu.org>
 
-	* window.el (split-window-save-restore-data): 
+	* window.el (split-window-save-restore-data):
 	Don't update the data if OLD-INFO is nil.
 
 	* view.el (view-return-to-alist): Mark it permanent local.
diff --git a/src/w32term.h b/src/w32term.h
index de28620c7b9..a9cdacf49d4 100644
--- a/src/w32term.h
+++ b/src/w32term.h
@@ -721,7 +721,6 @@ XGCValues *XCreateGC (void *, Window, unsigned long, XGCValues *);
 struct frame * check_x_frame (Lisp_Object);
 EXFUN (Fx_display_color_p, 1);
 EXFUN (Fx_display_grayscale_p, 1);
-int image_ascent P_ ((struct image *, struct face *));
 
 #define FONT_TYPE_FOR_UNIBYTE(font, ch)			\
   ((font)->bdf ? BDF_1D_FONT : ANSI_FONT)
diff --git a/src/xterm.h b/src/xterm.h
index 1d43414cf54..3bc2c5994bd 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -938,7 +938,6 @@ Lisp_Object display_x_get_resource P_ ((struct x_display_info *,
 struct frame *check_x_frame P_ ((Lisp_Object));
 EXFUN (Fx_display_color_p, 1);
 EXFUN (Fx_display_grayscale_p, 1);
-int image_ascent P_ ((struct image *, struct face *));
 extern void x_free_gcs P_ ((struct frame *));
 
 /* From xrdb.c.  */