Mercurial > emacs
view lisp/eshell/em-rebind.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 | f57f72bb4757 376148b31b5e |
line wrap: on
line source
;;; em-rebind.el --- rebind keys when point is at current input ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, ;; 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> ;; 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: ;;; Code: (eval-when-compile (require 'eshell)) ;;;###autoload (eshell-defgroup eshell-rebind nil "This module allows for special keybindings that only take effect while the point is in a region of input text. By default, it binds C-a to move to the beginning of the input text (rather than just the beginning of the line), and C-p and C-n to move through the input history, C-u kills the current input text, etc. It also, if `eshell-confine-point-to-input' is non-nil, does not allow certain commands to cause the point to leave the input area, such as `backward-word', `previous-line', etc. This module intends to mimic the behavior of normal shells while the user editing new input text." :tag "Rebind keys at input" :group 'eshell-module) ;;; User Variables: (defcustom eshell-rebind-load-hook '(eshell-rebind-initialize) "*A list of functions to call when loading `eshell-rebind'." :type 'hook :group 'eshell-rebind) (defcustom eshell-rebind-keys-alist '(([(control ?a)] . eshell-bol) ([home] . eshell-bol) ([(control ?d)] . eshell-delchar-or-maybe-eof) ([backspace] . eshell-delete-backward-char) ([delete] . eshell-delete-backward-char) ([(control ?w)] . backward-kill-word) ([(control ?u)] . eshell-kill-input)) "*Bind some keys differently if point is in input text." :type '(repeat (cons (vector :tag "Keys to bind" (repeat :inline t sexp)) (function :tag "Command"))) :group 'eshell-rebind) (defcustom eshell-confine-point-to-input t "*If non-nil, do not allow the point to leave the current input. This is more difficult to do nicely in Emacs than one might think. Basically, the `point-left' attribute is added to the input text, and a function is placed on that hook to take the point back to `eshell-last-output-end' every time the user tries to move away. But since there are many cases in which the point _ought_ to move away \(for programmatic reasons), the variable `eshell-cannot-leave-input-list' defines commands which are affected from this rule. However, this list is by no means as complete as it probably should be, so basically all one can hope for is that other people will left the point alone in the Eshell buffer. Sigh." :type 'boolean :group 'eshell-rebind) (defcustom eshell-error-if-move-away t "*If non-nil, consider it an error to try to move outside current input. This is default behavior of shells like bash." :type 'boolean :group 'eshell-rebind) (defcustom eshell-remap-previous-input t "*If non-nil, remap input keybindings on previous prompts as well." :type 'boolean :group 'eshell-rebind) (defcustom eshell-cannot-leave-input-list '(beginning-of-line-text beginning-of-line move-to-column move-to-column-force move-to-left-margin move-to-tab-stop forward-char backward-char delete-char delete-backward-char backward-delete-char backward-delete-char-untabify kill-paragraph backward-kill-paragraph kill-sentence backward-kill-sentence kill-sexp backward-kill-sexp kill-word backward-kill-word kill-region forward-list backward-list forward-page backward-page forward-point forward-paragraph backward-paragraph backward-prefix-chars forward-sentence backward-sentence forward-sexp backward-sexp forward-to-indentation backward-to-indentation backward-up-list forward-word backward-word forward-line previous-line next-line forward-visible-line forward-comment forward-thing) "*A list of commands that cannot leave the input area." :type '(repeat function) :group 'eshell-rebind) ;; Internal Variables: (defvar eshell-input-keymap) (defvar eshell-previous-point) (defvar eshell-lock-keymap) ;;; Functions: (defun eshell-rebind-initialize () "Initialize the inputing code." (unless eshell-non-interactive-p (add-hook 'eshell-mode-hook 'eshell-setup-input-keymap nil t) (make-local-variable 'eshell-previous-point) (add-hook 'pre-command-hook 'eshell-save-previous-point nil t) (make-local-variable 'overriding-local-map) (add-hook 'post-command-hook 'eshell-rebind-input-map nil t) (set (make-local-variable 'eshell-lock-keymap) nil) (define-key eshell-command-map [(meta ?l)] 'eshell-lock-local-map))) (defun eshell-lock-local-map (&optional arg) "Lock or unlock the current local keymap. Within a prefix arg, set the local keymap to its normal value, and lock it at that." (interactive "P") (if (or arg (not eshell-lock-keymap)) (progn (use-local-map eshell-mode-map) (setq eshell-lock-keymap t) (message "Local keymap locked in normal mode")) (use-local-map eshell-input-keymap) (setq eshell-lock-keymap nil) (message "Local keymap unlocked: obey context"))) (defun eshell-save-previous-point () "Save the location of point before the next command is run." (setq eshell-previous-point (point))) (defsubst eshell-point-within-input-p (pos) "Test whether POS is within an input range." (let (begin) (or (and (>= pos eshell-last-output-end) eshell-last-output-end) (and eshell-remap-previous-input (setq begin (save-excursion (eshell-bol) (and (not (bolp)) (point)))) (>= pos begin) (<= pos (line-end-position)) begin)))) (defun eshell-rebind-input-map () "Rebind the input keymap based on the location of the cursor." (ignore-errors (unless eshell-lock-keymap (if (eshell-point-within-input-p (point)) (use-local-map eshell-input-keymap) (let (begin) (if (and eshell-confine-point-to-input (setq begin (eshell-point-within-input-p eshell-previous-point)) (memq this-command eshell-cannot-leave-input-list)) (progn (use-local-map eshell-input-keymap) (goto-char begin) (if (and eshell-error-if-move-away (not (eq this-command 'kill-region))) (beep))) (use-local-map eshell-mode-map))))))) (defun eshell-setup-input-keymap () "Setup the input keymap to be used during input editing." (make-local-variable 'eshell-input-keymap) (setq eshell-input-keymap (make-sparse-keymap)) (set-keymap-parent eshell-input-keymap eshell-mode-map) (let ((bindings eshell-rebind-keys-alist)) (while bindings (define-key eshell-input-keymap (caar bindings) (cdar bindings)) (setq bindings (cdr bindings))))) (defun eshell-delete-backward-char (n &optional killflag) "Delete the last character, unless it's part of the output." (interactive "P") (let ((count (prefix-numeric-value n))) (if (eshell-point-within-input-p (- (point) count)) (delete-backward-char count n) (beep)))) (defun eshell-delchar-or-maybe-eof (arg) "Delete ARG characters forward or send an EOF to subprocess. Sends an EOF only if point is at the end of the buffer and there is no input." (interactive "p") (let ((proc (eshell-interactive-process))) (if (eobp) (cond ((/= (point) eshell-last-output-end) (beep)) (proc (process-send-eof)) (t (eshell-life-is-too-much))) (eshell-delete-backward-char (- arg))))) (provide 'em-rebind) ;; Local Variables: ;; generated-autoload-file: "esh-groups.el" ;; End: ;; arch-tag: 76d84f12-cc56-4d67-9b7d-c6b44ad20530 ;;; em-rebind.el ends here