[Emacs-diffs] emacs/doc/lispref ChangeLog display.texi

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/04/15 22:06:53

Modified files:
        doc/lispref    : ChangeLog display.texi 

Log message:
        * display.texi (Line Height): Emphasize that line-spacing only takes
        effect on graphical terminals.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/doc/lispref/ChangeLog?cvsroot=emacs&r1=1.261&r2=1.262
http://cvs.savannah.gnu.org/viewcvs/emacs/doc/lispref/display.texi?cvsroot=emacs&r1=1.44&r2=1.45

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/doc/lispref/ChangeLog,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -b -r1.261 -r1.262
--- ChangeLog   15 Apr 2009 21:54:15 -0000      1.261
+++ ChangeLog   15 Apr 2009 22:06:52 -0000      1.262
@@ -11,6 +11,8 @@
        (Face Remapping): Copyedits.
        (Low-Level Font): Copyedits.
        (Image Cache): Note that the image cache is shared between frames.
+       (Line Height): Emphasize that line-spacing only takes effect on
+       graphical terminals.
 
 2009-04-13  Chong Yidong  <address@hidden>
 

Index: display.texi
===================================================================
RCS file: /sources/emacs/emacs/doc/lispref/display.texi,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- display.texi        15 Apr 2009 03:07:07 -0000      1.44
+++ display.texi        15 Apr 2009 22:06:53 -0000      1.45
@@ -1765,20 +1765,20 @@
 parts of Emacs text.
 
 @vindex default-line-spacing
-  You can specify the line spacing for all lines in a frame with the
address@hidden frame parameter (@pxref{Layout Parameters}).
-However, if the variable @code{default-line-spacing} is
address@hidden, it overrides the frame's @code{line-spacing}
-parameter.  An integer value specifies the number of pixels put below
-lines on graphical displays.  A floating point number specifies the
-spacing relative to the frame's default line height.
+  On graphical terminals, you can specify the line spacing for all
+lines in a frame, using the @code{line-spacing} frame parameter
+(@pxref{Layout Parameters}).  However, if the variable
address@hidden is address@hidden, it overrides the
+frame's @code{line-spacing} parameter.  An integer value specifies the
+number of pixels put below lines.  A floating point number specifies
+the spacing relative to the frame's default line height.
 
 @vindex line-spacing
   You can specify the line spacing for all lines in a buffer via the
 buffer-local @code{line-spacing} variable.  An integer value specifies
-the number of pixels put below lines on graphical displays.  A floating
-point number specifies the spacing relative to the default frame line
-height.  This overrides line spacings specified for the frame.
+the number of pixels put below lines.  A floating point number
+specifies the spacing relative to the default frame line height.  This
+overrides line spacings specified for the frame.
 
 @kindex line-spacing @r{(text property)}
   Finally, a newline can have a @code{line-spacing} text or overlay
@@ -1792,6 +1792,8 @@
 numeric height value specifies the line spacing, rather than the line
 height.
 
+  On text-only terminals, the line spacing cannot be altered.
+
 @node Faces
 @section Faces
 @cindex faces