Mercurial > emacs
view lisp/eshell/em-term.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 | bcc7c00e9ef4 376148b31b5e |
line wrap: on
line source
;;; em-term.el --- running visual commands ;; 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: ;; At the moment, eshell is stream-based in its interactive input and ;; output. This means that full-screen commands, such as "vi" or ;; "lynx", will not display correctly. These are therefore thought of ;; as "visual" programs. In order to run these progrem under Emacs, ;; Eshell uses the term.el package, and invokes them in a separate ;; buffer, giving the illusion that Eshell itself is allowing these ;; visual processes to execute. ;;; Code: (eval-when-compile (require 'eshell)) (require 'term) ;;;###autoload (eshell-defgroup eshell-term nil "This module causes visual commands (e.g., 'vi') to be executed by the `term' package, which comes with Emacs. This package handles most of the ANSI control codes, allowing curses-based applications to run within an Emacs window. The variable `eshell-visual-commands' defines which commands are considered visual in nature." :tag "Running visual commands" :group 'eshell-module) ;;; User Variables: (defcustom eshell-term-load-hook '(eshell-term-initialize) "*A list of functions to call when loading `eshell-term'." :type 'hook :group 'eshell-term) (defcustom eshell-visual-commands '("vi" ; what is going on?? "screen" "top" ; ok, a valid program... "less" "more" ; M-x view-file "lynx" "ncftp" ; w3.el, ange-ftp "pine" "tin" "trn" "elm") ; GNUS!! "*A list of commands that present their output in a visual fashion." :type '(repeat string) :group 'eshell-term) (defcustom eshell-term-name "eterm" "*Name to use for the TERM variable when running visual commands. See `term-term-name' in term.el for more information on how this is used." :type 'string :group 'eshell-term) (defcustom eshell-escape-control-x t "*If non-nil, allow <C-x> to be handled by Emacs key in visual buffers. See the variable `eshell-visual-commands'. If this variable is set to nil, <C-x> will send that control character to the invoked process." :type 'boolean :group 'eshell-term) ;;; Internal Variables: (defvar eshell-parent-buffer) ;;; Functions: (defun eshell-term-initialize () "Initialize the `term' interface code." (make-local-variable 'eshell-interpreter-alist) (setq eshell-interpreter-alist (cons (cons (function (lambda (command) (member (file-name-nondirectory command) eshell-visual-commands))) 'eshell-exec-visual) eshell-interpreter-alist))) (defun eshell-exec-visual (&rest args) "Run the specified PROGRAM in a terminal emulation buffer. ARGS are passed to the program. At the moment, no piping of input is allowed." (let* (eshell-interpreter-alist (interp (eshell-find-interpreter (car args))) (program (car interp)) (args (eshell-flatten-list (eshell-stringify-list (append (cdr interp) (cdr args))))) (term-buf (generate-new-buffer (concat "*" (file-name-nondirectory program) "*"))) (eshell-buf (current-buffer))) (save-current-buffer (switch-to-buffer term-buf) (term-mode) (set (make-local-variable 'term-term-name) eshell-term-name) (make-local-variable 'eshell-parent-buffer) (setq eshell-parent-buffer eshell-buf) (term-exec term-buf program program nil args) (let ((proc (get-buffer-process term-buf))) (if (and proc (eq 'run (process-status proc))) (set-process-sentinel proc 'eshell-term-sentinel) (error "Failed to invoke visual command"))) (term-char-mode) (if eshell-escape-control-x (term-set-escape-char ?\C-x)))) nil) (defun eshell-term-sentinel (proc string) "Destroy the buffer visiting PROC." (let ((proc-buf (process-buffer proc))) (when (and proc-buf (buffer-live-p proc-buf) (not (eq 'run (process-status proc))) (= (process-exit-status proc) 0)) (if (eq (current-buffer) proc-buf) (let ((buf (and (boundp 'eshell-parent-buffer) eshell-parent-buffer (buffer-live-p eshell-parent-buffer) eshell-parent-buffer))) (if buf (switch-to-buffer buf)))) (kill-buffer proc-buf)))) ;; jww (1999-09-17): The code below will allow Eshell to send input ;; characters directly to the currently running interactive process. ;; However, since this would introduce other problems that would need ;; solutions, I'm going to let it wait until after 2.1. ; (defvar eshell-term-raw-map nil ; "Keyboard map for sending characters directly to the inferior process.") ; (defvar eshell-term-escape-char nil ; "Escape character for char-sub-mode of term mode. ; Do not change it directly; use term-set-escape-char instead.") ; (defvar eshell-term-raw-escape-map nil) ; (defun eshell-term-send-raw-string (chars) ; (goto-char eshell-last-output-end) ; (process-send-string (eshell-interactive-process) chars)) ; (defun eshell-term-send-raw () ; "Send the last character typed through the terminal-emulator ; without any interpretation." ; (interactive) ; ;; Convert `return' to C-m, etc. ; (if (and (symbolp last-input-event) ; (get last-input-event 'ascii-character)) ; (setq last-input-event (get last-input-event 'ascii-character))) ; (eshell-term-send-raw-string (make-string 1 last-input-event))) ; (defun eshell-term-send-raw-meta () ; (interactive) ; (if (symbolp last-input-event) ; ;; Convert `return' to C-m, etc. ; (let ((tmp (get last-input-event 'event-symbol-elements))) ; (if tmp ; (setq last-input-event (car tmp))) ; (if (symbolp last-input-event) ; (progn ; (setq tmp (get last-input-event 'ascii-character)) ; (if tmp (setq last-input-event tmp)))))) ; (eshell-term-send-raw-string (if (and (numberp last-input-event) ; (> last-input-event 127) ; (< last-input-event 256)) ; (make-string 1 last-input-event) ; (format "\e%c" last-input-event)))) ; (defun eshell-term-mouse-paste (click arg) ; "Insert the last stretch of killed text at the position clicked on." ; (interactive "e\nP") ; (if (boundp 'xemacs-logo) ; (eshell-term-send-raw-string ; (or (condition-case () (x-get-selection) (error ())) ; (x-get-cutbuffer) ; (error "No selection or cut buffer available"))) ; ;; Give temporary modes such as isearch a chance to turn off. ; (run-hooks 'mouse-leave-buffer-hook) ; (setq this-command 'yank) ; (eshell-term-send-raw-string ; (current-kill (cond ((listp arg) 0) ; ((eq arg '-) -1) ; (t (1- arg))))))) ; ;; Which would be better: "\e[A" or "\eOA"? readline accepts either. ; ;; For my configuration it's definitely better \eOA but YMMV. -mm ; ;; For example: vi works with \eOA while elm wants \e[A ... ; (defun eshell-term-send-up () (interactive) (eshell-term-send-raw-string "\eOA")) ; (defun eshell-term-send-down () (interactive) (eshell-term-send-raw-string "\eOB")) ; (defun eshell-term-send-right () (interactive) (eshell-term-send-raw-string "\eOC")) ; (defun eshell-term-send-left () (interactive) (eshell-term-send-raw-string "\eOD")) ; (defun eshell-term-send-home () (interactive) (eshell-term-send-raw-string "\e[1~")) ; (defun eshell-term-send-end () (interactive) (eshell-term-send-raw-string "\e[4~")) ; (defun eshell-term-send-prior () (interactive) (eshell-term-send-raw-string "\e[5~")) ; (defun eshell-term-send-next () (interactive) (eshell-term-send-raw-string "\e[6~")) ; (defun eshell-term-send-del () (interactive) (eshell-term-send-raw-string "\C-?")) ; (defun eshell-term-send-backspace () (interactive) (eshell-term-send-raw-string "\C-H")) ; (defun eshell-term-set-escape-char (c) ; "Change term-escape-char and keymaps that depend on it." ; (if eshell-term-escape-char ; (define-key eshell-term-raw-map eshell-term-escape-char 'eshell-term-send-raw)) ; (setq c (make-string 1 c)) ; (define-key eshell-term-raw-map c eshell-term-raw-escape-map) ; ;; Define standard bindings in eshell-term-raw-escape-map ; (define-key eshell-term-raw-escape-map "\C-x" ; (lookup-key (current-global-map) "\C-x")) ; (define-key eshell-term-raw-escape-map "\C-v" ; (lookup-key (current-global-map) "\C-v")) ; (define-key eshell-term-raw-escape-map "\C-u" ; (lookup-key (current-global-map) "\C-u")) ; (define-key eshell-term-raw-escape-map c 'eshell-term-send-raw)) ; (defun eshell-term-char-mode () ; "Switch to char (\"raw\") sub-mode of term mode. ; Each character you type is sent directly to the inferior without ; intervention from Emacs, except for the escape character (usually C-c)." ; (interactive) ; (if (not eshell-term-raw-map) ; (let* ((map (make-keymap)) ; (esc-map (make-keymap)) ; (i 0)) ; (while (< i 128) ; (define-key map (make-string 1 i) 'eshell-term-send-raw) ; (define-key esc-map (make-string 1 i) 'eshell-term-send-raw-meta) ; (setq i (1+ i))) ; (define-key map "\e" esc-map) ; (setq eshell-term-raw-map map) ; (setq eshell-term-raw-escape-map ; (copy-keymap (lookup-key (current-global-map) "\C-x"))) ; (if (boundp 'xemacs-logo) ; (define-key eshell-term-raw-map [button2] 'eshell-term-mouse-paste) ; (define-key eshell-term-raw-map [mouse-2] 'eshell-term-mouse-paste)) ; (define-key eshell-term-raw-map [up] 'eshell-term-send-up) ; (define-key eshell-term-raw-map [down] 'eshell-term-send-down) ; (define-key eshell-term-raw-map [right] 'eshell-term-send-right) ; (define-key eshell-term-raw-map [left] 'eshell-term-send-left) ; (define-key eshell-term-raw-map [delete] 'eshell-term-send-del) ; (define-key eshell-term-raw-map [backspace] 'eshell-term-send-backspace) ; (define-key eshell-term-raw-map [home] 'eshell-term-send-home) ; (define-key eshell-term-raw-map [end] 'eshell-term-send-end) ; (define-key eshell-term-raw-map [prior] 'eshell-term-send-prior) ; (define-key eshell-term-raw-map [next] 'eshell-term-send-next) ; (eshell-term-set-escape-char ?\C-c)))) ; (defun eshell-term-line-mode () ; "Switch to line (\"cooked\") sub-mode of eshell-term mode." ; (use-local-map term-old-mode-map)) (provide 'em-term) ;; Local Variables: ;; generated-autoload-file: "esh-groups.el" ;; End: ;; arch-tag: ab7c8fe4-3101-4257-925b-1354c6b2fe9d ;;; em-term.el ends here