Show
Ignore:
Timestamp:
2005年11月26日 08時33分26秒 (3 years ago)
Author:
miyoshi
Message:

Sync up with Emacs CVS HEAD.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • vendor/emacs-CVS_HEAD/lisp/help.el

    r3806 r3988  
    7878 
    7979(define-key help-map "c" 'describe-key-briefly) 
     80 
     81(define-key help-map "d" 'apropos-documentation) 
    8082 
    8183(define-key help-map "e" 'view-echo-area-messages) 
    …… 
    189191\(Use SPC or DEL to scroll through this text.  Type \\<help-map>\\[help-quit] to exit the Help command.) 
    190192 
    191 a  command-apropos.  Give a substring, and see a list of commands 
    192         (functions that are interactively callable) that contain 
    193         that substring.  See also the  apropos  command. 
     193a  command-apropos.  Give a list of words or a regexp, to get a list of 
     194        commands whose names match (they contain two or more of the words, 
     195        or a match for the regexp).  See also the  apropos  command. 
    194196b  describe-bindings.  Display table of all key bindings. 
    195197c  describe-key-briefly.  Type a command key sequence; 
    …… 
    198200        (if you type its name) or the coding systems currently in use 
    199201        (if you type just RET). 
     202d  apropos-documentation.  Give a pattern (a list or words or a regexp), and 
     203        see a list of functions, variables, and other items whose built-in 
     204        doucmentation string matches that pattern.  See also the apropos command. 
    200205e  view-echo-area-messages.  Show the buffer where the echo-area messages 
    201206        are stored. 
    …… 
    607612(defun describe-key (key &optional untranslated up-event) 
    608613  "Display documentation of the function invoked by KEY. 
    609 KEY should be a key sequence--when calling from a program, 
    610 pass a string or a vector. 
    611 If non-nil UNTRANSLATED is a vector of the untranslated events. 
    612 It can also be a number in which case the untranslated events from 
    613 the last key hit are used." 
     614KEY can be any kind of a key sequence; it can include keyboard events, 
     615mouse events, and/or menu events.  When calling from a program, 
     616pass KEY as a string or a vector. 
     617 
     618If non-nil, UNTRANSLATED is a vector of the correspondinguntranslated events. 
     619It can also be a number, in which case the untranslated events from 
     620the last key sequence entered are used." 
    614621  ;; UP-EVENT is the up-event that was discarded by reading KEY, or nil. 
    615   (interactive "kDescribe key: \np\nU") 
     622  (interactive "kDescribe key (or click or menu item): \np\nU") 
    616623  (if (numberp untranslated) 
    617624      (setq untranslated (this-single-command-raw-keys)))