Mercurial > emacs
changeset 31827:7c50babd3f4f
*** empty log message ***
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Thu, 21 Sep 2000 19:27:29 +0000 |
| parents | 2c8c52a67b91 |
| children | c6cdd9deac21 |
| files | etc/NEWS lisp/ChangeLog src/ChangeLog |
| diffstat | 3 files changed, 28 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/etc/NEWS Thu Sep 21 18:41:57 2000 +0000 +++ b/etc/NEWS Thu Sep 21 19:27:29 2000 +0000 @@ -3571,11 +3571,23 @@ +++ ** 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
--- a/lisp/ChangeLog Thu Sep 21 18:41:57 2000 +0000 +++ b/lisp/ChangeLog Thu Sep 21 19:27:29 2000 +0000 @@ -13,6 +13,9 @@ 2000-09-21 Gerd Moellmann <gerd@gnu.org> + * 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)
--- a/src/ChangeLog Thu Sep 21 18:41:57 2000 +0000 +++ b/src/ChangeLog Thu Sep 21 19:27:29 2000 +0000 @@ -1,5 +1,15 @@ 2000-09-21 Gerd Moellmann <gerd@gnu.org> + * 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.