Changeset 4018 for vendor/emacs-CVS_HEAD/lisp/help.el

Timestamp:

01/28/06 09:46:44 (3 years ago)

Author:

miyoshi

Message:

Update.

Files:

• vendor/emacs-CVS_HEAD/lisp/help.el (modified) (10 diffs)

vendor/emacs-CVS_HEAD/lisp/help.el

@@ -39 +39 @@
-(add-hook 'temp-buffer-show-hook 'help-mode-finish)
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  "Keymap for characters following the Help key.")
-
@@ -47 +97 @@
-(fset 'help-command help-map)
-
-(define-key help-map (char-to-string help-char) 'help-for-help)
-(define-key help-map [help] 'help-for-help)
-(define-key help-map [f1] 'help-for-help)
-(define-key help-map "." 'display-local-help)
-(define-key help-map "?" 'help-for-help)
-
-(define-key help-map "\C-c" 'describe-copying)
-(define-key help-map "\C-d" 'describe-distribution)
-(define-key help-map "\C-e" 'view-emacs-problems)
-(define-key help-map "\C-f" 'view-emacs-FAQ)
-(define-key help-map "\C-m" 'view-order-manuals)
-(define-key help-map "\C-n" 'view-emacs-news)
-(define-key help-map "\C-p" 'describe-project)
-(define-key help-map "\C-t" 'view-todo)
-(define-key help-map "\C-w" 'describe-no-warranty)
-
-;; This does not fit the pattern, but it is natural given the C-\ command.
-(define-key help-map "\C-\\" 'describe-input-method)
-
-(define-key help-map "C" 'describe-coding-system)
-(define-key help-map "F" 'Info-goto-emacs-command-node)
-(define-key help-map "I" 'describe-input-method)
-(define-key help-map "K" 'Info-goto-emacs-key-command-node)
-(define-key help-map "L" 'describe-language-environment)
-(define-key help-map "S" 'info-lookup-symbol)
-
-(define-key help-map "a" 'apropos-command)
-
-(define-key help-map "b" 'describe-bindings)
-
-(define-key help-map "c" 'describe-key-briefly)
-
-(define-key help-map "d" 'apropos-documentation)
-
-(define-key help-map "e" 'view-echo-area-messages)
-
-(define-key help-map "f" 'describe-function)
-
-(define-key help-map "h" 'view-hello-file)
-
-(define-key help-map "i" 'info)
-(define-key help-map "4i" 'info-other-window)
-
-(define-key help-map "k" 'describe-key)
-
-(define-key help-map "l" 'view-lossage)
-
-(define-key help-map "m" 'describe-mode)
-
-(define-key help-map "n" 'view-emacs-news)
-
-(define-key help-map "p" 'finder-by-keyword)
-(autoload 'finder-by-keyword "finder"
-  "Find packages matching a given keyword." t)
-
-(define-key help-map "r" 'info-emacs-manual)
-
-(define-key help-map "s" 'describe-syntax)
-
-(define-key help-map "t" 'help-with-tutorial)
-
-(define-key help-map "w" 'where-is)
-
-(define-key help-map "v" 'describe-variable)
-
-(define-key help-map "q" 'help-quit)
-
-;; insert-button makes the action nil if it is not store somewhere
@@ -126 +112 @@
-  "What to do to \"exit\" the help buffer.
-This is a list
-
+
+
- (WINDOW . quit-window)    do quit-window, then select WINDOW.
- (WINDOW BUF START POINT)  display BUF at START, POINT, then select WINDOW.")
@@ -134 +121 @@
-This function assumes that `standard-output' is the help buffer.
-It computes a message, and applies the optional argument FUNCTION to it.
-
+
+
+
-  (and (not (get-buffer-window standard-output))
-       (let ((first-message
-
+
+
+
-                     (setq help-return-method (cons (selected-window) t))
-                     ;; If the help output buffer is a special display buffer,
@@ -169 +160 @@
-                   ;; If the help buffer will go in a separate frame,
-                   ;; it's no use mentioning a command to scroll, so don't.
-
+
+
-                       nil
-                     (if (same-window-p (buffer-name standard-output))
@@ -187 +179 @@
-;; It can't find this, but nobody will look.
-(make-help-screen help-for-help-internal
-
+r 
-  "You have typed %THIS-KEY%, the help character.  Type a Help option:
-\(Use SPC or DEL to scroll through this text.  Type \\<help-map>\\[help-quit] to exit the Help command.)
-
-a  command-apropos.  Give a list of words or a regexp, to get a list of
-
-
+
-b  describe-bindings.  Display table of all key bindings.
-c  describe-key-briefly.  Type a command key sequence;
@@ -226 +217 @@
-n  view-emacs-news.  Display news of recent Emacs changes.
-p  finder-by-keyword. Find packages matching a given topic keyword.
+r  info-emacs-manual.  Display the Emacs manual in Info mode.
-s  describe-syntax.  Display contents of syntax table, plus explanations.
-S  info-lookup-symbol.  Display the definition of a specific symbol
@@ -591 +583 @@
-      ;; Ok, now look up the key and name the command.
-      (let ((defn (or (string-key-binding key)
-
+ t
-            key-desc)
-        ;; Don't bother user with strings from (e.g.) the select-paste menu.
@@ -616 +608 @@
-pass KEY as a string or a vector.
-
-
+ 
-It can also be a number, in which case the untranslated events from
-the last key sequence entered are used."
@@ -636 +628 @@
-            (set-buffer (window-buffer window))
-        (goto-char position))
-
+ t
-        (if (or (null defn) (integerp defn) (equal defn 'undefined))
-            (message "%s is undefined" (help-key-description key untranslated))