Mercurial > emacs
view lisp/isearchb.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 |
line wrap: on
line source
;;; isearchb --- a marriage between iswitchb and isearch ;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 ;; Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> ;; Maintainer: FSF ;; Created: 16 Apr 2004 ;; Version: 1.5 ;; Keywords: lisp ;; X-URL: http://www.newartisans.com/johnw/emacs.html ;; This file is part of GNU Emacs. ;; GNU Emacs is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation, either version 3 of the License, or ;; (at your option) any later version. ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. ;;; Commentary: ;; This module allows you to switch to buffers even faster than with ;; iswitchb! It is not intended to replace it, however, as it works ;; well only with buffers whose names don't typically overlap. You'll ;; have to try it first, and see how your mileage varies. ;; ;; The first way to use isearchb is by holding down a modifier key, in ;; which case every letter you type while holding it searches for any ;; buffer matching what you're typing (using the same ordering scheme ;; employed by iswitchb). To use it this way, add to your .emacs: ;; ;; (isearchb-set-keybindings 'super) ; s-x s-y s-z now finds "xyz" ;; ;; The other way is by using a command that puts you into "search" ;; mode, just like with isearch. I use C-z for this. The binding in ;; my .emacs looks like: ;; ;; (define-key global-map [(control ?z)] 'isearchb-activate) ;; ;; Now, after pressing C-z (for example), each self-inserting ;; character thereafter will search for a buffer containing those ;; characters. For instance, typing "C-z xyz" will switch to the ;; first buffer containing "xyz". Once you press a non-self-inserting ;; character (such as any control key sequence), the search will end. ;; ;; C-z after C-z toggles between the previously selected buffer and ;; the current one. ;; ;; C-g aborts the search and returns you to your original buffer. ;; ;; TAB, after typing in a few characters (after C-z), will jump into ;; iswitchb, using the prefix you've typed so far. This is handy when ;; you realize that isearchb is not powerful enough to find the buffer ;; you're looking for. ;; ;; C-s and C-r move forward and backward in the buffer list. If ;; `isearchb-show-completions' is non-nil (the default), the list of ;; possible completions is shown in the minibuffer. ;; ;; If `isearchb-idle-timeout' is set to a number, isearchb will quit ;; after that many seconds of idle time. I recommend trying it set to ;; one or two seconds. Then, if you switch to a buffer and wait for ;; that amount of time, you can start typing without manually exiting ;; isearchb. ;; TODO: ;; C-z C-z is broken ;; killing iswitchb.el and then trying to switch back is broken ;; make sure TAB isn't broken (require 'iswitchb) (defgroup isearchb nil "Switch between buffers using a mechanism like isearch." :group 'iswitchb) (defcustom isearchb-idle-timeout nil "Number of idle seconds before isearchb turns itself off. If nil, don't use a timeout." :type '(choice (integer :tag "Seconds") (const :tag "Disable" nil)) :group 'isearchb) (defcustom isearchb-show-completions t "If non-nil, show possible completions in the minibuffer." :type 'boolean :group 'isearchb) (defvar isearchb-start-buffer nil) (defvar isearchb-last-buffer nil) (defvar isearchb-idle-timer nil) (defun isearchb-stop (&optional return-to-buffer ignore-command) "Called by isearchb to terminate a search in progress." (remove-hook 'pre-command-hook 'isearchb-follow-char) (if return-to-buffer (switch-to-buffer isearchb-start-buffer) (setq isearchb-last-buffer isearchb-start-buffer)) (when isearchb-idle-timer (cancel-timer isearchb-idle-timer) (setq isearchb-idle-timer nil)) (if ignore-command (setq this-command 'ignore last-command 'ignore)) (message nil)) (defun isearchb-iswitchb () "isearchb's custom version of the `iswitchb' command. Its purpose is to pass different call arguments to `iswitchb-read-buffer'." (interactive) (let* ((prompt "iswitch ") (iswitchb-method 'samewindow) (buf (iswitchb-read-buffer prompt nil nil iswitchb-text t))) (if (eq iswitchb-exit 'findfile) (call-interactively 'find-file) (when buf (if (get-buffer buf) ;; buffer exists, so view it and then exit (iswitchb-visit-buffer buf) ;; else buffer doesn't exist (iswitchb-possible-new-buffer buf)))))) (defun isearchb () "Switch to buffer matching a substring, based on chars typed." (interactive) (unless (eq last-command 'isearchb) (setq iswitchb-text nil)) (unless iswitchb-text (setq iswitchb-text "") (iswitchb-make-buflist nil)) (if last-command-event (setq iswitchb-rescan t iswitchb-text (concat iswitchb-text (char-to-string last-command-event)))) (iswitchb-set-matches) (let* ((match (car iswitchb-matches)) (buf (and match (get-buffer match)))) (if (null buf) (progn (isearchb-stop t) (isearchb-iswitchb)) (switch-to-buffer buf) (if isearchb-show-completions (message "isearchb: %s%s" iswitchb-text (iswitchb-completions iswitchb-text)) (if (= 1 (length iswitchb-matches)) (message "isearchb: %s (only match)" iswitchb-text) (message "isearchb: %s" iswitchb-text)))))) (defun isearchb-set-keybindings (modifier) "Setup isearchb on the given MODIFIER." (dotimes (i 128) (if (eq 'self-insert-command (lookup-key global-map (vector i))) (define-key global-map (vector (list modifier i)) 'isearchb)))) (defun isearchb-follow-char () "Function added to `post-command-hook' to handle the isearchb \"mode\"." (let (keys) (if (not (and (memq last-command '(isearchb isearchb-activate)) (setq keys (this-command-keys)) (= 1 (length keys)))) (isearchb-stop) (cond ((or (equal keys "\C-h") (equal keys "\C-?") (equal keys [backspace]) (equal keys [delete])) (setq iswitchb-text (substring iswitchb-text 0 (1- (length iswitchb-text)))) (if (= 0 (length iswitchb-text)) (isearchb-stop t t) (setq last-command-event nil) (setq this-command 'isearchb))) ((or (equal keys "\C-i") (equal keys [tab])) (setq this-command 'isearchb-iswitchb)) ((equal keys "\C-s") (iswitchb-next-match) (setq last-command-event nil) (setq this-command 'isearchb)) ((equal keys "\C-r") (iswitchb-prev-match) (setq last-command-event nil) (setq this-command 'isearchb)) ((equal keys "\C-g") (ding) (isearchb-stop t t)) ((eq (lookup-key global-map keys) 'self-insert-command) (setq this-command 'isearchb))) (if (and isearchb-idle-timeout (null isearchb-idle-timer)) (setq isearchb-idle-timer (run-with-idle-timer isearchb-idle-timeout nil 'isearchb-stop)))))) ;;;###autoload (defun isearchb-activate () "Active isearchb mode for subsequent alphanumeric keystrokes. Executing this command again will terminate the search; or, if the search has not yet begun, will toggle to the last buffer accessed via isearchb." (interactive) (cond ((eq last-command 'isearchb) (isearchb-stop nil t)) ((eq last-command 'isearchb-activate) (if isearchb-last-buffer (switch-to-buffer isearchb-last-buffer) (error "isearchb: There is no previous buffer to toggle to")) (isearchb-stop nil t)) (t (message "isearchb: ") (setq iswitchb-text nil isearchb-start-buffer (current-buffer)) (add-hook 'pre-command-hook 'isearchb-follow-char)))) (provide 'isearchb) ;; arch-tag: 9277523f-a624-4aa0-ba10-b89eeb7b6e99 ;;; isearchb.el ends here