*** empty log message ***

3 files changed, 34 insertions, 8 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 59ee3abf580..7551aa41188 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1802,6 +1802,17 @@ of live and free strings.
 strings that have been consed so far.
 
 
+* Lisp-level Display features added after release 2.6 of the Emacs
+Lisp Manual
+
+** Image specifications may contain the property `:ascent center'.
+
+When this property is specified, the image is vertically centered
+around a centerline which would be the vertical center of text drawn
+at the position of the image, in the manner specified by the text
+properties and overlays that apply to the image.
+
+
 * New Lisp-level Display features in Emacs 21.1
 
 Note that +++ before an item means the Lisp manual has been updated.
@@ -2334,10 +2345,10 @@ to use for its ascent.
 If not specified, ASCENT defaults to the value 50 which means that the
 image will be centered with the base line of the row it appears in.
 
-If ASCENT is `center' the image is vertically centered with text drawn
-in the same face as the image.  The point the image is aligned with is
-the middle of the height of the face's font.  That point is usually
-different from the font's base line.
+If ASCENT is `center' the image is vertically centered around a 
+centerline which is the vertical center of text drawn at the position
+of the image, in the manner specified by the text properties and
+overlays that apply to the image.
 
 `:margin MARGIN'
 
diff --git a/lispref/display.texi b/lispref/display.texi
index 5992c36171d..5dd1dcec1fe 100644
--- a/lispref/display.texi
+++ b/lispref/display.texi
@@ -2387,10 +2387,20 @@ types:
 
 @table @code
 @item :ascent @var{ascent}
-The @code{:ascent} property specifies the percentage of the image's
-height to use for its ascent---that is, the part above the baseline.  The
-value, @var{ascent}, must be a number in the range 0 to 100.  If this
-property is omitted, it defaults to 50.
+The @code{:ascent} property specifies the amount of the image's
+height to use for its ascent---that is, the part above the baseline.
+The value, @var{ascent}, must be a number in the range 0 to 100, or
+the symbol @code{center}.
+
+If @var{ascent} is a number, that percentage of the image's height is
+used for its ascent.
+
+If @var{ascent} is @code{center}, the image is vertically centered
+around a centerline which would be the vertical centerline of text drawn
+at the position of the image, in the manner specified by the text
+properties and overlays that apply to the image.
+
+If this property is omitted, it defaults to 50.
 
 @item :margin @var{margin}
 The @code{:margin} property specifies how many pixels to add as an extra
diff --git a/src/ChangeLog b/src/ChangeLog
index cf5514554d4..16737c6f38f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-24  Gerd Moellmann  <gerd@gnu.org>
+
+        * callproc.c, emacs.c, sysdep.c (setpgrp): Don't define if USG and
+        BSD_PGRPS are not defined.
+
 2000-05-24  Kenichi Handa  <handa@etl.go.jp>
 
         * charset.c (update_charset_table): Accept nil in LONG_NAME and