Mercurial > emacs
annotate lisp/minibuf-eldef.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 | 376148b31b5e |
rev | line source |
---|---|
34392 | 1 ;;; minibuf-eldef.el --- Only show defaults in prompts when applicable |
2 ;; | |
64762
41bb365f41c4
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64091
diff
changeset
|
3 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004, |
106815 | 4 ;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
34392 | 5 ;; |
6 ;; Author: Miles Bader <miles@gnu.org> | |
7 ;; Keywords: convenience | |
8 | |
9 ;; This file is part of GNU Emacs. | |
10 | |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79721
diff
changeset
|
11 ;; GNU Emacs is free software: you can redistribute it and/or modify |
34392 | 12 ;; 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:
79721
diff
changeset
|
13 ;; 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:
79721
diff
changeset
|
14 ;; (at your option) any later version. |
34392 | 15 |
16 ;; GNU Emacs is distributed in the hope that it will be useful, | |
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
19 ;; GNU General Public License for more details. | |
20 | |
21 ;; 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:
79721
diff
changeset
|
22 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
34392 | 23 |
24 ;;; Commentary: | |
25 ;; | |
26 ;; Defines the mode `minibuffer-electric-default-mode'. | |
27 ;; | |
28 ;; When active, minibuffer prompts that show a default value only show | |
29 ;; the default when it's applicable -- that is, when hitting RET would | |
30 ;; yield the default value. If the user modifies the input such that | |
31 ;; hitting RET would enter a non-default value, the prompt is modified | |
32 ;; to remove the default indication (which is restored if the input is | |
33 ;; ever restore to the match the initial input). | |
34 | |
35 ;;; Code: | |
36 | |
37 (defvar minibuffer-default-in-prompt-regexps | |
55890
e046a551c6da
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-362
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
38 '(("\\( (default\\>.*)\\):? \\'" . 1) ("\\( \\[.*\\]\\):? *\\'" . 1)) |
34392 | 39 "*A list of regexps matching the parts of minibuffer prompts showing defaults. |
40 When `minibuffer-electric-default-mode' is active, these regexps are | |
41 used to identify the portions of prompts to elide. | |
42 | |
43 Each entry is either a string, which should be a regexp matching the | |
44 default portion of the prompt, or a cons cell, who's car is a regexp | |
45 matching the default part of the prompt, and who's cdr indicates the | |
46 regexp subexpression that matched.") | |
47 | |
48 | |
49 ;;; Internal variables | |
50 | |
51 ;; A list of minibuffers to which we've added a post-command-hook. | |
52 (defvar minibuf-eldef-frobbed-minibufs nil) | |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
41953
diff
changeset
|
53 |
34392 | 54 ;;; The following are all local variables in the minibuffer |
55 | |
56 ;; Input pre-inserted into the minibuffer before the user can edit it. | |
57 (defvar minibuf-eldef-initial-input) | |
58 (make-variable-buffer-local 'minibuf-eldef-initial-input) | |
59 ;; and the length of the buffer with it inserted. | |
60 (defvar minibuf-eldef-initial-buffer-length) | |
61 (make-variable-buffer-local 'minibuf-eldef-initial-buffer-length) | |
62 | |
63 ;; True if the current minibuffer prompt contains the default spec. | |
64 (defvar minibuf-eldef-showing-default-in-prompt) | |
65 (make-variable-buffer-local 'minibuf-eldef-showing-default-in-prompt) | |
66 | |
67 ;; An overlay covering the default portion of the prompt | |
68 (defvar minibuf-eldef-overlay) | |
69 (make-variable-buffer-local 'minibuf-eldef-overlay) | |
70 | |
71 | |
72 ;;; Hook functions | |
73 | |
74 ;; This function goes on minibuffer-setup-hook | |
75 (defun minibuf-eldef-setup-minibuffer () | |
76 "Set up a minibuffer for `minibuffer-electric-default-mode'. | |
77 The prompt and initial input should already have been inserted." | |
39596
fc100d4d02bc
(minibuf-eldef-setup-minibuffer)
Miles Bader <miles@gnu.org>
parents:
34392
diff
changeset
|
78 (let ((regexps minibuffer-default-in-prompt-regexps) |
34392 | 79 (match nil) |
80 (inhibit-point-motion-hooks t)) | |
81 (save-excursion | |
82 (save-restriction | |
83 ;; Narrow to only the prompt | |
84 (goto-char (point-min)) | |
39596
fc100d4d02bc
(minibuf-eldef-setup-minibuffer)
Miles Bader <miles@gnu.org>
parents:
34392
diff
changeset
|
85 (narrow-to-region (point) (minibuffer-prompt-end)) |
34392 | 86 ;; See the prompt contains a default input indicator |
87 (while regexps | |
88 (setq match (pop regexps)) | |
89 (if (re-search-forward (if (stringp match) match (car match)) nil t) | |
90 (setq regexps nil) | |
91 (setq match nil))))) | |
92 (if (not match) | |
93 ;; Nope, so just make sure our post-command-hook isn't left around. | |
94 (remove-hook 'post-command-hook #'minibuf-eldef-update-minibuffer t) | |
95 ;; Yup; set things up so we can frob the prompt as the state of | |
96 ;; the input string changes. | |
97 (setq match (if (consp match) (cdr match) 0)) | |
98 (setq minibuf-eldef-overlay | |
99 (make-overlay (match-beginning match) (match-end match))) | |
100 (setq minibuf-eldef-showing-default-in-prompt t) | |
101 (setq minibuf-eldef-initial-input | |
39596
fc100d4d02bc
(minibuf-eldef-setup-minibuffer)
Miles Bader <miles@gnu.org>
parents:
34392
diff
changeset
|
102 (minibuffer-contents-no-properties)) |
34392 | 103 (setq minibuf-eldef-initial-buffer-length (point-max)) |
104 (add-to-list 'minibuf-eldef-frobbed-minibufs (current-buffer)) | |
105 (add-hook 'post-command-hook #'minibuf-eldef-update-minibuffer nil t)))) | |
106 | |
107 ;; post-command-hook to swap prompts when necessary | |
108 (defun minibuf-eldef-update-minibuffer () | |
109 "Update a minibuffer's prompt to include a default only when applicable. | |
110 This is intended to be used as a minibuffer post-command-hook for | |
111 `minibuffer-electric-default-mode'; the minibuffer should have already | |
112 been set up by `minibuf-eldef-setup-minibuffer'." | |
113 (unless (eq minibuf-eldef-showing-default-in-prompt | |
114 (and (= (point-max) minibuf-eldef-initial-buffer-length) | |
39596
fc100d4d02bc
(minibuf-eldef-setup-minibuffer)
Miles Bader <miles@gnu.org>
parents:
34392
diff
changeset
|
115 (string-equal (minibuffer-contents-no-properties) |
34392 | 116 minibuf-eldef-initial-input))) |
117 ;; swap state | |
118 (setq minibuf-eldef-showing-default-in-prompt | |
119 (not minibuf-eldef-showing-default-in-prompt)) | |
120 (cond (minibuf-eldef-showing-default-in-prompt | |
121 (overlay-put minibuf-eldef-overlay 'invisible nil) | |
122 (overlay-put minibuf-eldef-overlay 'intangible nil)) | |
123 (t | |
124 (overlay-put minibuf-eldef-overlay 'invisible t) | |
125 (overlay-put minibuf-eldef-overlay 'intangible t))))) | |
126 | |
127 | |
128 ;;; Note this definition must be at the end of the file, because | |
129 ;;; `define-minor-mode' actually calls the mode-function if the | |
130 ;;; associated variable is non-nil, which requires that all needed | |
131 ;;; functions be already defined. [This is arguably a bug in d-m-m] | |
132 ;;;###autoload | |
133 (define-minor-mode minibuffer-electric-default-mode | |
41953
395d420d4f73
(minibuffer-electric-default-mode): Doc fix.
Pavel Janík <Pavel@Janik.cz>
parents:
39596
diff
changeset
|
134 "Toggle Minibuffer Electric Default mode. |
34392 | 135 When active, minibuffer prompts that show a default value only show the |
136 default when it's applicable -- that is, when hitting RET would yield | |
137 the default value. If the user modifies the input such that hitting RET | |
138 would enter a non-default value, the prompt is modified to remove the | |
139 default indication. | |
140 | |
141 With prefix argument ARG, turn on if positive, otherwise off. | |
142 Returns non-nil if the new state is enabled." | |
143 :global t | |
144 :group 'minibuffer | |
145 (if minibuffer-electric-default-mode | |
146 ;; Enable the mode | |
147 (add-hook 'minibuffer-setup-hook 'minibuf-eldef-setup-minibuffer) | |
148 ;; Disable the mode | |
149 (remove-hook 'minibuffer-setup-hook 'minibuf-eldef-setup-minibuffer) | |
150 ;; Remove our entry from any post-command-hook variable's it's still in | |
151 (dolist (minibuf minibuf-eldef-frobbed-minibufs) | |
152 (with-current-buffer minibuf | |
153 (remove-hook 'post-command-hook #'minibuf-eldef-update-minibuffer t))) | |
154 (setq minibuf-eldef-frobbed-minibufs nil))) | |
155 | |
156 | |
157 (provide 'minibuf-eldef) | |
158 | |
55890
e046a551c6da
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-362
Miles Bader <miles@gnu.org>
parents:
52401
diff
changeset
|
159 ;; arch-tag: 7e421fae-c275-4729-b0da-7836af377d3d |
34392 | 160 ;;; minibuf-eldef.el ends here |