From 623a0aae17d2860be73f7c126a28690406535370 Mon Sep 17 00:00:00 2001 From: Gerd Moellmann Date: Thu, 21 Sep 2000 19:27:29 +0000 Subject: [PATCH] *** empty log message *** --- etc/NEWS | 18 +++++++++++++++--- lisp/ChangeLog | 3 +++ src/ChangeLog | 10 ++++++++++ 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index 794c4d12634..aa84b368a69 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -3571,11 +3571,23 @@ position in the header-line. +++ ** Text property `display' -The `display' text property is used to insert images into text, and -also control other aspects of how text displays. The value of the -`display' property should be a display specification, as described +The `display' text property is used to insert images into text, +replace text with other text, display text in marginal area, and it is +also used to control other aspects of how text displays. The value of +the `display' property should be a display specification, as described below, or a list or vector containing display specifications. +*** Replacing text, displaying text in marginal areas + +To replace the text having the `display' property with some other +text, use a display specification of the form `(LOCATION STRING)'. + +If LOCATION is `(margin left-margin)', STRING is displayed in the left +marginal area, if it is `(margin right-margin)', it is displayed in +the right marginal area, and if LOCATION is `(margin nil)' STRING +is displayed in the text. In the latter case you can also use the +simpler form STRING as property value. + *** Variable width and height spaces To display a space of fractional width or height, use a display diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 120a253520e..5861dc0100d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -13,6 +13,9 @@ 2000-09-21 Gerd Moellmann + * startup.el (command-line): If frame was created with a non-zero + tool-bar-lines parameter, switch tool-bar-mode on. + * add-log.el (change-log-date-face, change-log-name-face) (change-log-email-face, change-log-file-face) (change-log-list-face, change-log-conditionals-face) diff --git a/src/ChangeLog b/src/ChangeLog index 26b9bf3d754..a97d314f674 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,15 @@ 2000-09-21 Gerd Moellmann + * xfns.c (Fx_create_frame): Set default frame parameter value + for tool-bar-lines to 1. + + * dispnew.c (scrolling_window): Compare y-positions of rows + equal at the start. Some simplification. + + * xdisp.c (try_window_reusing_current_matrix): Fix computation of + reused rows' y-position in the case window has a header-line, and + new window start is greater than old window start. + * process.c (process_sent_to): New variable. (send_process): Workaround for a crash on sparc-sun-solaris-2.6 with GCC 2.95.2 caused by a parameter being clobbered by longjmp. -- 2.39.5