Merge from emacs-23

[gnu-emacs] / lisp / eshell / em-term.el

diff --git a/lisp/eshell/em-term.el b/lisp/eshell/em-term.el
index 57b7b092d42f6a35aad2cd0dce07054ee24168d4..8662dd9fffb6ca39a9661850ff165a59602322e9 100644 (file)
--- a/lisp/eshell/em-term.el
+++ b/lisp/eshell/em-term.el
@@ -1,16 +1,16 @@
 ;;; em-term.el --- running visual commands
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; 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
+;; 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, or (at your option)
-;; any later version.
+;; 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
@@ -18,9 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -37,7 +35,8 @@
 (eval-when-compile (require 'eshell))
 (require 'term)
 
-(defgroup eshell-term nil
+;;;###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
@@ -160,27 +159,27 @@ allowed."
 ; without any interpretation."
 ;   (interactive)
 ;   ;; Convert `return' to C-m, etc.
-;   (if (and (symbolp last-input-char)
-;         (get last-input-char 'ascii-character))
-;       (setq last-input-char (get last-input-char 'ascii-character)))
-;   (eshell-term-send-raw-string (make-string 1 last-input-char)))
+;   (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-char)
+;   (if (symbolp last-input-event)
 ;       ;; Convert `return' to C-m, etc.
-;       (let ((tmp (get last-input-char 'event-symbol-elements)))
+;       (let ((tmp (get last-input-event 'event-symbol-elements)))
 ;      (if tmp
-;          (setq last-input-char (car tmp)))
-;      (if (symbolp last-input-char)
+;          (setq last-input-event (car tmp)))
+;      (if (symbolp last-input-event)
 ;          (progn
-;            (setq tmp (get last-input-char 'ascii-character))
-;            (if tmp (setq last-input-char tmp))))))
-;   (eshell-term-send-raw-string (if (and (numberp last-input-char)
-;                                      (> last-input-char 127)
-;                                      (< last-input-char 256))
-;                                 (make-string 1 last-input-char)
-;                               (format "\e%c" last-input-char))))
+;            (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."
@@ -265,5 +264,9 @@ allowed."
 
 (provide 'em-term)
 
+;; Local Variables:
+;; generated-autoload-file: "esh-groups.el"
+;; End:
+
 ;; arch-tag: ab7c8fe4-3101-4257-925b-1354c6b2fe9d
 ;;; em-term.el ends here