diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-01-09 09:36:10 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-01-09 09:36:10 -0800 |
| commit | 35cf62d95cdcd5323dcea4a5385942c342ff1d9c (patch) | |
| tree | 90358cbb033a126c4d48793a80fd804b7baaca24 /etc/NEWS.21 | |
| parent | 59815c02506eb39b61e672528ed03885749ba529 (diff) | |
| parent | 7655cb66d86564e792b825f1a0e1a4de7d6e6db5 (diff) | |
Merge from trunk.
Diffstat (limited to 'etc/NEWS.21')
| -rw-r--r-- | etc/NEWS.21 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/NEWS.21 b/etc/NEWS.21 index c018567c40..6d50b687fa 100644 --- a/etc/NEWS.21 +++ b/etc/NEWS.21 @@ -1,6 +1,6 @@ GNU Emacs NEWS -- history of user-visible changes. 2006-05-31 -Copyright (C) 2000-2011 Free Software Foundation, Inc. +Copyright (C) 2000-2012 Free Software Foundation, Inc. See the end of the file for license conditions. @@ -4639,7 +4639,7 @@ simpler form STRING as property value. *** Variable width and height spaces To display a space of fractional width or height, use a display -specification of the form `(LOCATION STRECH)'. If LOCATION is +specification of the form `(LOCATION STRETCH)'. If LOCATION is `(margin left-margin)', the space 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)' the space is |