[Emacs-diffs] Changes to emacs/lispref/display.texi

[Richard M . Stallman]

Index: emacs/lispref/display.texi
diff -c emacs/lispref/display.texi:1.163 emacs/lispref/display.texi:1.164
*** emacs/lispref/display.texi:1.163    Wed Jun  8 15:33:10 2005
--- emacs/lispref/display.texi  Sat Jun 18 13:44:01 2005
***************
*** 547,561 ****
  reporting operation progress.  Here is a working example that does
  nothing useful:
  
! @example
  (let ((progress-reporter
!        (make-progress-reporter "Collecting some mana for Emacs..."
                                 0  500)))
    (dotimes (k 500)
      (sit-for 0.01)
      (progress-reporter-update progress-reporter k))
    (progress-reporter-done progress-reporter))
! @end example
  
  @defun make-progress-reporter message min-value max-value &optional 
current-value min-change min-time
  This function creates and returns a @dfn{progress reporter}---an
--- 547,561 ----
  reporting operation progress.  Here is a working example that does
  nothing useful:
  
! @smallexample
  (let ((progress-reporter
!        (make-progress-reporter "Collecting mana for Emacs..."
                                 0  500)))
    (dotimes (k 500)
      (sit-for 0.01)
      (progress-reporter-update progress-reporter k))
    (progress-reporter-done progress-reporter))
! @end smallexample
  
  @defun make-progress-reporter message min-value max-value &optional 
current-value min-change min-time
  This function creates and returns a @dfn{progress reporter}---an
***************
*** 1296,1303 ****
  @code{(background-color . @var{color-name})}.  These elements specify
  just the foreground color or just the background color.
  
! @code{(foreground-color . @var{color-name})} is equivalent to
! @code{(:foreground @var{color-name})}, and likewise for the background.
  @end itemize
  
  @item mouse-face
--- 1296,1303 ----
  @code{(background-color . @var{color-name})}.  These elements specify
  just the foreground color or just the background color.
  
! @code{(foreground-color . @var{color-name})} has the same effect as
! @code{(:foreground @var{color-name})}; likewise for the background.
  @end itemize
  
  @item mouse-face
***************
*** 2757,2766 ****
  registry name is @samp{JISX0208.1983} for all characters belonging to
  the charset @code{japanese-jisx0208}.
  
! @example
  (set-fontset-font nil 'japanese-jisx0208 '(nil . "JISX0208.1983"))
! @end example
! 
  @end defun
  
  @defun char-displayable-p char
--- 2757,2765 ----
  registry name is @samp{JISX0208.1983} for all characters belonging to
  the charset @code{japanese-jisx0208}.
  
! @smallexample
  (set-fontset-font nil 'japanese-jisx0208 '(nil . "JISX0208.1983"))
! @end smallexample
  @end defun
  
  @defun char-displayable-p char
***************
*** 3137,3143 ****
  Lisp objects as their @code{display} properties are handled
  separately.  Here's a function that illustrates this point:
  
! @example
  (defun foo ()
    (goto-char (point-min))
    (dotimes (i 5)
--- 3136,3142 ----
  Lisp objects as their @code{display} properties are handled
  separately.  Here's a function that illustrates this point:
  
! @smallexample
  (defun foo ()
    (goto-char (point-min))
    (dotimes (i 5)
***************
*** 3146,3152 ****
        (forward-char 1)
        (put-text-property (point) (1+ (point)) 'display string)
        (forward-char 1))))
! @end example
  
  @noindent
  It gives each of the first ten characters in the buffer string
--- 3145,3151 ----
        (forward-char 1)
        (put-text-property (point) (1+ (point)) 'display string)
        (forward-char 1))))
! @end smallexample
  
  @noindent
  It gives each of the first ten characters in the buffer string
***************
*** 3158,3164 ****
  characters appear as five A's.  This function would have the same
  results:
  
! @example
  (defun foo ()
    (goto-char (point-min))
    (dotimes (i 5)
--- 3157,3163 ----
  characters appear as five A's.  This function would have the same
  results:
  
! @smallexample
  (defun foo ()
    (goto-char (point-min))
    (dotimes (i 5)
***************
*** 3166,3172 ****
        (put-text-property (point) (2+ (point)) 'display string)
        (put-text-property (point) (1+ (point)) 'display string)
        (forward-char 2))))
! @end example
  
  @noindent
  This illustrates that what matters is the property value for
--- 3165,3171 ----
        (put-text-property (point) (2+ (point)) 'display string)
        (put-text-property (point) (1+ (point)) 'display string)
        (forward-char 2))))
! @end smallexample
  
  @noindent
  This illustrates that what matters is the property value for
***************
*** 3262,3279 ****
  
    The following expressions are supported:
  
! @example
  @group
    @var{expr} ::= @var{num} | (@var{num}) | @var{unit} | @var{elem} | 
@var{pos} | @var{image} | @var{form}
    @var{num}  ::= @var{integer} | @var{float} | @var{symbol}
    @var{unit} ::= in | mm | cm | width | height
    @var{elem} ::= left-fringe | right-fringe | left-margin | right-margin
          |  scroll-bar | text
    @var{pos}  ::= left | center | right
    @var{form} ::= (@var{num} . @var{expr}) | (@var{op} @var{expr} ...)
    @var{op}   ::= + | -
  @end group
! @end example
  
    The form @var{num} specifies a fraction of the default frame font
  height or width.  The form @code{(@var{num})} specifies an absolute
--- 3261,3280 ----
  
    The following expressions are supported:
  
! @smallexample
  @group
    @var{expr} ::= @var{num} | (@var{num}) | @var{unit} | @var{elem} | 
@var{pos} | @var{image} | @var{form}
    @var{num}  ::= @var{integer} | @var{float} | @var{symbol}
    @var{unit} ::= in | mm | cm | width | height
+ @end group
+ @group
    @var{elem} ::= left-fringe | right-fringe | left-margin | right-margin
          |  scroll-bar | text
    @var{pos}  ::= left | center | right
    @var{form} ::= (@var{num} . @var{expr}) | (@var{op} @var{expr} ...)
    @var{op}   ::= + | -
  @end group
! @end smallexample
  
    The form @var{num} specifies a fraction of the default frame font
  height or width.  The form @code{(@var{num})} specifies an absolute
***************
*** 3331,3337 ****
  Display @var{string} instead of the text that has this property.
  
  @item (image . @var{image-props})
! This display specification is an image descriptor (@pxref{Images}).
  When used as a display specification, it means to display the image
  instead of the text that has the display specification.
  
--- 3332,3338 ----
  Display @var{string} instead of the text that has this property.
  
  @item (image . @var{image-props})
! This kind of display specification is an image descriptor (@pxref{Images}).
  When used as a display specification, it means to display the image
  instead of the text that has the display specification.