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

[Luc Teirlinck]

Index: emacs/man/display.texi
diff -c emacs/man/display.texi:1.86 emacs/man/display.texi:1.87
*** emacs/man/display.texi:1.86 Sat Apr  9 16:18:51 2005
--- emacs/man/display.texi      Mon May 16 21:16:50 2005
***************
*** 177,189 ****
  for more information about Transient Mark mode and activation and
  deactivation of the mark.
  
!   One easy way to use faces is to turn on Font Lock mode.  This minor
! mode, which is always local to a particular buffer, arranges to
! choose faces according to the syntax of the text you are editing.  It
! can recognize comments and strings in most languages; in several
! languages, it can also recognize and properly highlight various other
! important constructs.  @xref{Font Lock}, for more information about
! Font Lock mode and syntactic highlighting.
  
    You can print out the buffer with the highlighting that appears
  on your screen using the command @code{ps-print-buffer-with-faces}.
--- 177,185 ----
  for more information about Transient Mark mode and activation and
  deactivation of the mark.
  
!   One easy way to use faces is to turn on Font Lock mode.  @xref{Font
! Lock}, for more information about Font Lock mode and syntactic
! highlighting.
  
    You can print out the buffer with the highlighting that appears
  on your screen using the command @code{ps-print-buffer-with-faces}.
***************
*** 206,216 ****
  
  @findex font-lock-mode
  @findex turn-on-font-lock
!   The command @kbd{M-x font-lock-mode} turns Font Lock mode on or off
! according to the argument, and toggles the mode when it has no argument.
! The function @code{turn-on-font-lock} unconditionally enables Font Lock
! mode.  This is useful in mode-hook functions.  For example, to enable
! Font Lock mode whenever you edit a C file, you can do this:
  
  @example
  (add-hook 'c-mode-hook 'turn-on-font-lock)
--- 202,213 ----
  
  @findex font-lock-mode
  @findex turn-on-font-lock
!   The command @kbd{M-x font-lock-mode} turns Font Lock mode on with
! positive argument, off with negative or zero argument, and toggles the
! mode when it has no argument.  The function @code{turn-on-font-lock}
! unconditionally enables Font Lock mode.  This is useful in mode-hook
! functions.  For example, to enable Font Lock mode whenever you edit a
! C file, you can do this:
  
  @example
  (add-hook 'c-mode-hook 'turn-on-font-lock)
***************
*** 219,227 ****
  @findex global-font-lock-mode
  @vindex global-font-lock-mode
    To turn on Font Lock mode automatically in all modes which support
! it, customize the variable @code{global-font-lock-mode} or use the
! function @code{global-font-lock-mode} in your @file{.emacs} file, like
! this:
  
  @example
  (global-font-lock-mode 1)
--- 216,224 ----
  @findex global-font-lock-mode
  @vindex global-font-lock-mode
    To turn on Font Lock mode automatically in all modes which support
! it, customize the variable @code{global-font-lock-mode} using the
! Customize interface (@pxref{Easy Customization}) or use the function
! @code{global-font-lock-mode} in your @file{.emacs} file, like this:
  
  @example
  (global-font-lock-mode 1)
***************
*** 641,647 ****
  meaning ``there's more text on this line which is scrolled
  horizontally out of view;'' clicking the mouse on one of the arrows
  scrolls the display horizontally in the direction of the arrow.   The
! fringes also indicate other things such as empty lines, or where a
  program you are debugging is executing (@pxref{Debuggers}).
  
  @findex set-fringe-style
--- 638,644 ----
  meaning ``there's more text on this line which is scrolled
  horizontally out of view;'' clicking the mouse on one of the arrows
  scrolls the display horizontally in the direction of the arrow.   The
! fringes can also indicate other things, such as empty lines, or where a
  program you are debugging is executing (@pxref{Debuggers}).
  
  @findex set-fringe-style
***************
*** 728,738 ****
  of columns (you specify how many columns).  You can use this to get an
  overview of a part of a program.
  
!   To hide lines, type @kbd{C-x $} (@code{set-selective-display}) with a
! numeric argument @var{n}.  Then lines with at least @var{n} columns of
! indentation disappear from the screen.  The only indication of their
! presence is that three dots (@address@hidden) appear at the end of each
! visible line that is followed by one or more hidden ones.
  
    The commands @kbd{C-n} and @kbd{C-p} move across the hidden lines as
  if they were not there.
--- 725,736 ----
  of columns (you specify how many columns).  You can use this to get an
  overview of a part of a program.
  
!   To hide lines in the current buffer, type @kbd{C-x $}
! (@code{set-selective-display}) with a numeric argument @var{n}.  Then
! lines with at least @var{n} columns of indentation disappear from the
! screen.  The only indication of their presence is that three dots
! (@address@hidden) appear at the end of each visible line that is
! followed by one or more hidden ones.
  
    The commands @kbd{C-n} and @kbd{C-p} move across the hidden lines as
  if they were not there.