Mercurial > emacs
annotate lisp/help-macro.el @ 110523:a5ad4f188e19
Synch Semantic to CEDET 1.0.
Move CEDET ChangeLog entries to new file lisp/cedet/ChangeLog.
* semantic.el (semantic-version): Update to 2.0.
(semantic-mode-map): Add "," and "m" bindings.
(navigate-menu): Update.
* semantic/symref.el (semantic-symref-calculate-rootdir):
New function.
(semantic-symref-detect-symref-tool): Use it.
* semantic/symref/grep.el (semantic-symref-grep-shell): New var.
(semantic-symref-perform-search): Use it. Calculate root dir with
semantic-symref-calculate-rootdir.
(semantic-symref-derive-find-filepatterns): Improve error message.
* semantic/symref/list.el
(semantic-symref-results-mode-map): New bindings.
(semantic-symref-auto-expand-results): New option.
(semantic-symref-results-dump): Obey auto-expand.
(semantic-symref-list-expand-all, semantic-symref-regexp)
(semantic-symref-list-contract-all)
(semantic-symref-list-map-open-hits)
(semantic-symref-list-update-open-hits)
(semantic-symref-list-create-macro-on-open-hit)
(semantic-symref-list-call-macro-on-open-hits): New functions.
(semantic-symref-list-menu-entries)
(semantic-symref-list-menu): New vars.
(semantic-symref-list-map-open-hits): Move cursor to beginning of
match before calling the mapped function.
* semantic/doc.el
(semantic-documentation-comment-preceeding-tag): Do nothing if the
mode doesn't provide comment-start-skip.
* semantic/scope.el
(semantic-analyze-scope-nested-tags-default): Strip duplicates.
(semantic-analyze-scoped-inherited-tag-map): Take the tag we are
looking for as part of the scoped tags list.
* semantic/html.el (semantic-default-html-setup): Add
senator-step-at-tag-classes.
* semantic/decorate/include.el
(semantic-decoration-on-unknown-includes): Change light bgcolor.
(semantic-decoration-on-includes-highlight-default): Check that
the include tag has a postion.
* semantic/complete.el (semantic-collector-local-members):
(semantic-complete-read-tag-local-members)
(semantic-complete-jump-local-members): New class and functions.
(semantic-complete-self-insert): Save excursion before completing.
* semantic/analyze/complete.el
(semantic-analyze-possible-completions-default): If no completions
are found, return the raw by-name-only completion list. Add FLAGS
arguments. Add support for 'no-tc (type constraint) and
'no-unique, or no stripping duplicates.
(semantic-analyze-possible-completions-default): Add FLAGS arg.
* semantic/util-modes.el
(semantic-stickyfunc-show-only-functions-p): New option.
(semantic-stickyfunc-fetch-stickyline): Don't show stickytext for
the very first line in a buffer.
* semantic/util.el (semantic-hack-search)
(semantic-recursive-find-nonterminal-by-name)
(semantic-current-tag-interactive): Deleted.
(semantic-describe-buffer): Fix expand-nonterminal. Add
lex-syntax-mods, type relation separator char, and command
separation char.
(semantic-sanity-check): Only message if called interactively.
* semantic/tag.el (semantic-tag-deep-copy-one-tag): Copy the
:filename property and the tag position.
* semantic/lex-spp.el (semantic-lex-spp-lex-text-string):
Add recursion limit.
* semantic/imenu.el (semantic-imenu-bucketize-type-members):
Make this buffer local, not the obsoleted variable.
* semantic/idle.el: Add breadcrumbs support.
(semantic-idle-summary-current-symbol-info-default)
(semantic-idle-tag-highlight)
(semantic-idle-completion-list-default): Use
semanticdb-without-unloaded-file-searches for speed, and to
conform to the controls that specify if the idle timer is supposed
to be parsing unparsed includes.
(semantic-idle-symbol-highlight-face)
(semantic-idle-symbol-maybe-highlight): Rename from *-summary-*.
Callers changed.
(semantic-idle-work-parse-neighboring-files-flag): Default to nil.
(semantic-idle-work-update-headers-flag): New var.
(semantic-idle-work-for-one-buffer): Use it.
(semantic-idle-local-symbol-highlight): Rename from
semantic-idle-tag-highlight.
(semantic-idle-truncate-long-summaries): New option.
* semantic/ia.el (semantic-ia-cache)
(semantic-ia-get-completions): Deleted. Callers changed.
(semantic-ia-show-variants): New command.
(semantic-ia-show-doc): If doc is empty, don't make a temp buffer.
(semantic-ia-show-summary): If there isn't anything to show, say so.
* semantic/grammar.el (semantic-grammar-create-package):
Save the buffer even in batch mode.
* semantic/fw.el
(semanticdb-without-unloaded-file-searches): New macro.
* semantic/dep.el (semantic-dependency-find-file-on-path):
Fix case dereferencing ede-object when it is a list.
* semantic/db-typecache.el (semanticdb-expand-nested-tag)
(semanticdb-typecache-faux-namespace): New functions.
(semanticdb-typecache-file-tags)
(semanticdb-typecache-merge-streams): Use them.
(semanticdb-typecache-file-tags): When deriving tags from a file,
give the mode a chance to monkey with the tag copy.
(semanticdb-typecache-find-default): Wrap find in save-excursion.
(semanticdb-typecache-find-by-name-helper): Merge found names down.
* semantic/db-global.el
(semanticdb-enable-gnu-global-in-buffer): Don't show messages if
GNU Global is not available and we don't want to throw an error.
* semantic/db-find.el (semanticdb-find-result-nth-in-buffer):
When trying to normalize the tag to a buffer, don't error if
set-buffer method doesn't exist.
* semantic/db-file.el (semanticdb-save-db): Simplify msg.
* semantic/db.el (semanticdb-refresh-table): If forcing a
refresh on a file not in a buffer, use semantic-find-file-noselect
and delete the buffer after use.
(semanticdb-current-database-list): When calculating root via
hooks, force it through true-filename and skip the list of
possible roots.
* semantic/ctxt.el (semantic-ctxt-imported-packages): New.
* semantic/analyze/debug.el
(semantic-analyzer-debug-insert-tag): Reset standard output to
current buffer.
(semantic-analyzer-debug-global-symbol)
(semantic-analyzer-debug-missing-innertype): Change "prefix" to
"symbol" in messages.
* semantic/analyze/refs.el: (semantic-analyze-refs-impl)
(semantic-analyze-refs-proto): When calculating value, make sure
the found tag is 'similar' to the originating tag.
(semantic--analyze-refs-find-tags-with-parent): Attempt to
identify matches via imported symbols of parents.
(semantic--analyze-refs-full-lookup-with-parents): Do a deep
search during the brute search.
* semantic/analyze.el
(semantic-analyze-find-tag-sequence-default): Be robust to
calculated scopes being nil.
* semantic/bovine/c.el (semantic-c-describe-environment): Add
project macro symbol array.
(semantic-c-parse-lexical-token): Add recursion limit.
(semantic-ctxt-imported-packages, semanticdb-expand-nested-tag):
New overrides.
(semantic-expand-c-tag-namelist): Split a full type from a typedef
out to its own tag.
(semantic-expand-c-tag-namelist): Do not split out a typedef'd
inline type if it is an anonymous type.
(semantic-c-reconstitute-token): Use the optional initializers as
a clue that some function is probably a constructor. When
defining the type of these constructors, split the parent name,
and use only the class part, if applicable.
* semantic/bovine/c-by.el:
* semantic/wisent/python-wy.el: Regenerate.
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Sat, 18 Sep 2010 22:49:54 -0400 |
parents | 1d1d5d9bd884 |
children | 280c8ae2476d 376148b31b5e |
rev | line source |
---|---|
38412
253f761ad37b
Some fixes to follow coding conventions in files maintained by FSF.
Pavel Janík <Pavel@Janik.cz>
parents:
25298
diff
changeset
|
1 ;;; help-macro.el --- makes command line help such as help-for-help |
2456 | 2 |
74442 | 3 ;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, |
106815 | 4 ;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
2456 | 5 |
6 ;; Author: Lynn Slater <lrs@indetech.com> | |
17976 | 7 ;; Maintainer: FSF |
38412
253f761ad37b
Some fixes to follow coding conventions in files maintained by FSF.
Pavel Janík <Pavel@Janik.cz>
parents:
25298
diff
changeset
|
8 ;; Created: Mon Oct 1 11:42:39 1990 |
2456 | 9 ;; Adapted-By: ESR |
10 | |
11 ;; This file is part of GNU Emacs. | |
12 | |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
13 ;; GNU Emacs is free software: you can redistribute it and/or modify |
2456 | 14 ;; it under the terms of the GNU General Public License as published by |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
15 ;; the Free Software Foundation, either version 3 of the License, or |
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
16 ;; (at your option) any later version. |
2456 | 17 |
18 ;; GNU Emacs is distributed in the hope that it will be useful, | |
19 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
20 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
21 ;; GNU General Public License for more details. | |
22 | |
23 ;; You should have received a copy of the GNU General Public License | |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
24 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
2456 | 25 |
26 ;;; Commentary: | |
14169 | 27 |
28 ;; This file supplies the macro make-help-screen which constructs | |
2456 | 29 ;; single character dispatching with browsable help such as that provided |
30 ;; by help-for-help. This can be used to make many modes easier to use; for | |
38412
253f761ad37b
Some fixes to follow coding conventions in files maintained by FSF.
Pavel Janík <Pavel@Janik.cz>
parents:
25298
diff
changeset
|
31 ;; example, the GNU Emacs Empire Tool uses this for every "nested" mode map |
2456 | 32 ;; called from the main mode map. |
33 | |
2530
1e1a30d5d523
Name changed to fit in a 14-character limit.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2456
diff
changeset
|
34 ;; The name of this package was changed from help-screen.el to |
1e1a30d5d523
Name changed to fit in a 14-character limit.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2456
diff
changeset
|
35 ;; help-macro.el in order to fit in a 14-character limit. |
1e1a30d5d523
Name changed to fit in a 14-character limit.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2456
diff
changeset
|
36 |
2456 | 37 ;;-> *********************** Example of use ********************************* |
38 | |
39 ;;->(make-help-screen help-for-empire-redistribute-map | |
40 ;;-> "c:civ m:mil p:population f:food ?" | |
41 ;;-> "You have discovered the GEET redistribution commands | |
42 ;;-> From here, you can use the following options: | |
43 ;;-> | |
44 ;;->c Redistribute civs from overfull sectors into connected underfull ones | |
45 ;;-> The functions typically named by empire-ideal-civ-fcn control | |
25298 | 46 ;;-> based in part on empire-sector-civ-threshold |
2456 | 47 ;;->m Redistribute military using levels given by empire-ideal-mil-fcn |
48 ;;->p Redistribute excess population to highways for max pop growth | |
49 ;;-> Excess is any sector so full babies will not be born. | |
50 ;;->f Even out food on highways to highway min and leave levels | |
51 ;;-> This is good to pump max food to all warehouses/dist pts | |
52 ;;-> | |
53 ;;-> | |
54 ;;->Use \\[help-for-empire-redistribute-map] for help on redistribution. | |
55 ;;->Use \\[help-for-empire-extract-map] for help on data extraction. | |
56 ;;->Please use \\[describe-key] to find out more about any of the other keys." | |
57 ;;-> empire-shell-redistribute-map) | |
58 | |
59 ;;-> (define-key c-mp "\C-h" 'help-for-empire-redistribute-map) | |
60 ;;-> (define-key c-mp help-character 'help-for-empire-redistribute-map) | |
61 | |
62 ;;; Change Log: | |
63 ;; | |
25298 | 64 ;; 22-Jan-1991 Lynn Slater x2048 |
2456 | 65 ;; Last Modified: Mon Oct 1 11:43:52 1990 #3 (Lynn Slater) |
66 ;; documented better | |
67 | |
68 ;;; Code: | |
69 | |
70 (require 'backquote) | |
71 | |
5679
90ba98c692b5
(three-step-help): New option.
Richard M. Stallman <rms@gnu.org>
parents:
5640
diff
changeset
|
72 ;;;###autoload |
25298 | 73 (defcustom three-step-help nil |
99664
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
74 "Non-nil means give more info about Help command in three steps. |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
75 The three steps are simple prompt, prompt with all options, and |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
76 window listing and describing the options. |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
77 A value of nil means skip the middle step, so that \\[help-command] \\[help-command] |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
78 gives the window that lists the options." |
25298 | 79 :type 'boolean |
80 :group 'help) | |
5679
90ba98c692b5
(three-step-help): New option.
Richard M. Stallman <rms@gnu.org>
parents:
5640
diff
changeset
|
81 |
2456 | 82 (defmacro make-help-screen (fname help-line help-text helped-map) |
5378
32a291ab0c5f
(make-help-screen): Use read-key-sequence.
Richard M. Stallman <rms@gnu.org>
parents:
3128
diff
changeset
|
83 "Construct help-menu function name FNAME. |
32a291ab0c5f
(make-help-screen): Use read-key-sequence.
Richard M. Stallman <rms@gnu.org>
parents:
3128
diff
changeset
|
84 When invoked, FNAME shows HELP-LINE and reads a command using HELPED-MAP. |
8709 | 85 If the command is the help character, FNAME displays HELP-TEXT |
5378
32a291ab0c5f
(make-help-screen): Use read-key-sequence.
Richard M. Stallman <rms@gnu.org>
parents:
3128
diff
changeset
|
86 and continues trying to read a command using HELPED-MAP. |
23331
8e860ff326de
(make-help-screen): Keep HELP-TEXT
Richard M. Stallman <rms@gnu.org>
parents:
21120
diff
changeset
|
87 If HELP-TEXT contains the sequence `%THIS-KEY%', that is replaced |
8e860ff326de
(make-help-screen): Keep HELP-TEXT
Richard M. Stallman <rms@gnu.org>
parents:
21120
diff
changeset
|
88 with the key sequence that invoked FNAME. |
5378
32a291ab0c5f
(make-help-screen): Use read-key-sequence.
Richard M. Stallman <rms@gnu.org>
parents:
3128
diff
changeset
|
89 When FNAME finally does get a command, it executes that command |
32a291ab0c5f
(make-help-screen): Use read-key-sequence.
Richard M. Stallman <rms@gnu.org>
parents:
3128
diff
changeset
|
90 and then returns." |
99664
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
91 (let ((doc-fn (intern (concat (symbol-name fname) "-doc")))) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
92 `(progn |
105216
fb7e59394e9b
* help.el (help-for-help-internal): Don't purecopy the text (bug#4560).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
100908
diff
changeset
|
93 (defun ,doc-fn () ,help-text nil) |
99664
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
94 (defun ,fname () |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
95 "Help command." |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
96 (interactive) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
97 (let ((line-prompt |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
98 (substitute-command-keys ,help-line))) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
99 (when three-step-help |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
100 (message "%s" line-prompt)) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
101 (let* ((help-screen (documentation (quote ,doc-fn))) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
102 ;; We bind overriding-local-map for very small |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
103 ;; sections, *excluding* where we switch buffers |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
104 ;; and where we execute the chosen help command. |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
105 (local-map (make-sparse-keymap)) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
106 (new-minor-mode-map-alist minor-mode-map-alist) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
107 (prev-frame (selected-frame)) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
108 config new-frame key char) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
109 (when (string-match "%THIS-KEY%" help-screen) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
110 (setq help-screen |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
111 (replace-match (key-description |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
112 (substring (this-command-keys) 0 -1)) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
113 t t help-screen))) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
114 (unwind-protect |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
115 (let ((minor-mode-map-alist nil)) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
116 (setcdr local-map ,helped-map) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
117 (define-key local-map [t] 'undefined) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
118 ;; Make the scroll bar keep working normally. |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
119 (define-key local-map [vertical-scroll-bar] |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
120 (lookup-key global-map [vertical-scroll-bar])) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
121 (if three-step-help |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
122 (progn |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
123 (setq key (let ((overriding-local-map local-map)) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
124 (read-key-sequence nil))) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
125 ;; Make the HELP key translate to C-h. |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
126 (if (lookup-key function-key-map key) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
127 (setq key (lookup-key function-key-map key))) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
128 (setq char (aref key 0))) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
129 (setq char ??)) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
130 (when (or (eq char ??) (eq char help-char) |
12423
ee433b44920d
(make-help-screen): Handle help-event-list.
Richard M. Stallman <rms@gnu.org>
parents:
11424
diff
changeset
|
131 (memq char help-event-list)) |
99664
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
132 (setq config (current-window-configuration)) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
133 (switch-to-buffer-other-window "*Help*") |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
134 (and (fboundp 'make-frame) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
135 (not (eq (window-frame (selected-window)) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
136 prev-frame)) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
137 (setq new-frame (window-frame (selected-window)) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
138 config nil)) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
139 (setq buffer-read-only nil) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
140 (let ((inhibit-read-only t)) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
141 (erase-buffer) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
142 (insert help-screen)) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
143 (let ((minor-mode-map-alist new-minor-mode-map-alist)) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
144 (help-mode) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
145 (setq new-minor-mode-map-alist minor-mode-map-alist)) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
146 (goto-char (point-min)) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
147 (while (or (memq char (append help-event-list |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
148 (cons help-char '(?? ?\C-v ?\s ?\177 delete backspace vertical-scroll-bar ?\M-v)))) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
149 (eq (car-safe char) 'switch-frame) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
150 (equal key "\M-v")) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
151 (condition-case nil |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
152 (cond |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
153 ((eq (car-safe char) 'switch-frame) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
154 (handle-switch-frame char)) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
155 ((memq char '(?\C-v ?\s)) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
156 (scroll-up)) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
157 ((or (memq char '(?\177 ?\M-v delete backspace)) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
158 (equal key "\M-v")) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
159 (scroll-down))) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
160 (error nil)) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
161 (let ((cursor-in-echo-area t) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
162 (overriding-local-map local-map)) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
163 (setq key (read-key-sequence |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
164 (format "Type one of the options listed%s: " |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
165 (if (pos-visible-in-window-p |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
166 (point-max)) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
167 "" ", or SPACE or DEL to scroll"))) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
168 char (aref key 0))) |
20029
857e1ce3f14b
(make-help-screen): Make scroll bar work normally.
Richard M. Stallman <rms@gnu.org>
parents:
18656
diff
changeset
|
169 |
99664
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
170 ;; If this is a scroll bar command, just run it. |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
171 (when (eq char 'vertical-scroll-bar) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
172 (command-execute (lookup-key local-map key) nil key)))) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
173 ;; We don't need the prompt any more. |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
174 (message "") |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
175 ;; Mouse clicks are not part of the help feature, |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
176 ;; so reexecute them in the standard environment. |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
177 (if (listp char) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
178 (setq unread-command-events |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
179 (cons char unread-command-events) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
180 config nil) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
181 (let ((defn (lookup-key local-map key))) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
182 (if defn |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
183 (progn |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
184 (when config |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
185 (set-window-configuration config) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
186 (setq config nil)) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
187 ;; `defn' must make sure that its frame is |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
188 ;; selected, so we won't iconify it below. |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
189 (call-interactively defn) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
190 (when new-frame |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
191 ;; Do not iconify the selected frame. |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
192 (unless (eq new-frame (selected-frame)) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
193 (iconify-frame new-frame)) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
194 (setq new-frame nil))) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
195 (ding))))) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
196 (when config |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
197 (set-window-configuration config)) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
198 (when new-frame |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
199 (iconify-frame new-frame)) |
77d381812b04
(three-step-help): Remove * from defcustom.
Martin Rudalics <rudalics@gmx.at>
parents:
98216
diff
changeset
|
200 (setq minor-mode-map-alist new-minor-mode-map-alist)))))))) |
2456 | 201 |
25298 | 202 (provide 'help-macro) |
2456 | 203 |
93975
1e3a407766b9
Fix up comment convention on the arch-tag lines.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
79721
diff
changeset
|
204 ;; arch-tag: 59fee949-1686-485a-8a05-83418073e257 |
25298 | 205 ;;; help-macro.el ends here |