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

[Miles Bader]

Index: emacs/lispref/help.texi
diff -c emacs/lispref/help.texi:1.15 emacs/lispref/help.texi:1.16
*** emacs/lispref/help.texi:1.15        Mon Sep 10 01:29:32 2001
--- emacs/lispref/help.texi     Tue Feb  4 09:47:53 2003
***************
*** 1,7 ****
  @c -*-texinfo-*-
  @c This is part of the GNU Emacs Lisp Reference Manual.
  @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999
! @c   Free Software Foundation, Inc. 
  @c See the file elisp.texi for copying conditions.
  @setfilename ../info/help
  @node Documentation, Files, Modes, Top
--- 1,7 ----
  @c -*-texinfo-*-
  @c This is part of the GNU Emacs Lisp Reference Manual.
  @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999
! @c   Free Software Foundation, Inc.
  @c See the file elisp.texi for copying conditions.
  @setfilename ../info/help
  @node Documentation, Files, Modes, Top
***************
*** 164,170 ****
  in the `*Help*' buffer."
    (interactive "sDescribe symbols matching: ")
    (let ((describe-func
!          (function 
            (lambda (s)
  @end group
  @group
--- 164,170 ----
  in the `*Help*' buffer."
    (interactive "sDescribe symbols matching: ")
    (let ((describe-func
!          (function
            (lambda (s)
  @end group
  @group
***************
*** 172,201 ****
              (if (fboundp s)             ; @r{It is a function.}
                  (princ
                   (format "%s\t%s\n%s\n\n" s
!                    (if (commandp s) 
                         (let ((keys (where-is-internal s)))
                           (if keys
                               (concat
                                "Keys: "
!                               (mapconcat 'key-description 
                                           keys " "))
                             "Keys: none"))
                       "Function")
  @end group
  @group
!                    (or (documentation s) 
                         "not documented"))))
!             
              (if (boundp s)              ; @r{It is a variable.}
  @end group
  @group
                  (princ
                   (format "%s\t%s\n%s\n\n" s
!                    (if (user-variable-p s) 
                         "Option " "Variable")
  @end group
  @group
!                    (or (documentation-property 
                           s 'variable-documentation)
                         "not documented")))))))
          sym-list)
--- 172,201 ----
              (if (fboundp s)             ; @r{It is a function.}
                  (princ
                   (format "%s\t%s\n%s\n\n" s
!                    (if (commandp s)
                         (let ((keys (where-is-internal s)))
                           (if keys
                               (concat
                                "Keys: "
!                               (mapconcat 'key-description
                                           keys " "))
                             "Keys: none"))
                       "Function")
  @end group
  @group
!                    (or (documentation s)
                         "not documented"))))
! 
              (if (boundp s)              ; @r{It is a variable.}
  @end group
  @group
                  (princ
                   (format "%s\t%s\n%s\n\n" s
!                    (if (user-variable-p s)
                         "Option " "Variable")
  @end group
  @group
!                    (or (documentation-property
                           s 'variable-documentation)
                         "not documented")))))))
          sym-list)
***************
*** 203,209 ****
  
  @group
      ;; @r{Build a list of symbols that match pattern.}
!     (mapatoms (function 
                 (lambda (sym)
                   (if (string-match pattern (symbol-name sym))
                       (setq sym-list (cons sym sym-list))))))
--- 203,209 ----
  
  @group
      ;; @r{Build a list of symbols that match pattern.}
!     (mapatoms (function
                 (lambda (sym)
                   (if (string-match pattern (symbol-name sym))
                       (setq sym-list (cons sym sym-list))))))
***************
*** 225,231 ****
  (describe-symbols "goal")
  
  ---------- Buffer: *Help* ----------
! goal-column     Option 
  *Semipermanent goal column for vertical motion, as set by @dots{}
  @end group
  @c Do not blithely break or fill these lines.
--- 225,231 ----
  (describe-symbols "goal")
  
  ---------- Buffer: *Help* ----------
! goal-column     Option
  *Semipermanent goal column for vertical motion, as set by @dots{}
  @end group
  @c Do not blithely break or fill these lines.
***************
*** 306,316 ****
  stands for a key sequence that will invoke @var{command}, or @samp{M-x
  @var{command}} if @var{command} has no key bindings.
  
! @item address@hidden@address@hidden 
  stands for a summary of the keymap which is the value of the variable
  @var{mapvar}.  The summary is made using @code{describe-bindings}.
  
! @item \<@var{mapvar}> 
  stands for no text itself.  It is used only for a side effect: it
  specifies @var{mapvar}'s value as the keymap for any following
  @address@hidden sequences in this documentation string.
--- 306,316 ----
  stands for a key sequence that will invoke @var{command}, or @samp{M-x
  @var{command}} if @var{command} has no key bindings.
  
! @item address@hidden@address@hidden
  stands for a summary of the keymap which is the value of the variable
  @var{mapvar}.  The summary is made using @code{describe-bindings}.
  
! @item \<@var{mapvar}>
  stands for no text itself.  It is used only for a side effect: it
  specifies @var{mapvar}'s value as the keymap for any following
  @address@hidden sequences in this documentation string.
***************
*** 335,347 ****
  
  @smallexample
  @group
! (substitute-command-keys 
     "To abort recursive edit, type: \\[abort-recursive-edit]")
  @result{} "To abort recursive edit, type: C-]"
  @end group
  
  @group
! (substitute-command-keys 
     "The keys that are defined for the minibuffer here are:
    address@hidden@}")
  @result{} "The keys that are defined for the minibuffer here are:
--- 335,347 ----
  
  @smallexample
  @group
! (substitute-command-keys
     "To abort recursive edit, type: \\[abort-recursive-edit]")
  @result{} "To abort recursive edit, type: C-]"
  @end group
  
  @group
! (substitute-command-keys
     "The keys that are defined for the minibuffer here are:
    address@hidden@}")
  @result{} "The keys that are defined for the minibuffer here are:
***************
*** 605,611 ****
  
  @c Emacs 19 feature
  @defmac make-help-screen fname help-line help-text help-map
! This macro defines a help command named @var{fname} that acts like a 
  prefix key that shows a list of the subcommands it offers.
  
  When invoked, @var{fname} displays @var{help-text} in a window, then
--- 605,611 ----
  
  @c Emacs 19 feature
  @defmac make-help-screen fname help-line help-text help-map
! This macro defines a help command named @var{fname} that acts like a
  prefix key that shows a list of the subcommands it offers.
  
  When invoked, @var{fname} displays @var{help-text} in a window, then