diff options
| author | Karoly Lorentey | 2005-03-27 17:29:43 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2005-03-27 17:29:43 +0000 |
| commit | a0a7e8c6de361d15703e78a1e934d0347475dcb8 (patch) | |
| tree | bea99880ecb2d7b242c5fdddb69583b3d686e22b /lisp/eshell | |
| parent | cd5caccf0c791bcaa19190f5d62ace1ebe9987c8 (diff) | |
| parent | 99a5658144bce7733e48d9c1877b2795afc1aa9d (diff) | |
| download | emacs-a0a7e8c6de361d15703e78a1e934d0347475dcb8.tar.gz emacs-a0a7e8c6de361d15703e78a1e934d0347475dcb8.zip | |
Merged from miles@gnu.org--gnu-2005 (patch 204-213)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-204
Clean up gdb-ui breakpoint faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-205
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-206
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-207
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-208
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-209
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-210
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-211
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-212
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-213
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-319
Diffstat (limited to 'lisp/eshell')
| -rw-r--r-- | lisp/eshell/esh-io.el | 4 | ||||
| -rw-r--r-- | lisp/eshell/esh-var.el | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lisp/eshell/esh-io.el b/lisp/eshell/esh-io.el index d832fa9cd03..6944770dbc9 100644 --- a/lisp/eshell/esh-io.el +++ b/lisp/eshell/esh-io.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; esh-io.el --- I/O management | 1 | ;;; esh-io.el --- I/O management |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1999, 2000 Free Software Foundation | 3 | ;; Copyright (C) 1999, 2000, 2005 Free Software Foundation |
| 4 | 4 | ||
| 5 | ;; Author: John Wiegley <johnw@gnu.org> | 5 | ;; Author: John Wiegley <johnw@gnu.org> |
| 6 | 6 | ||
| @@ -377,7 +377,7 @@ it defaults to `insert'." | |||
| 377 | target) | 377 | target) |
| 378 | 378 | ||
| 379 | (t | 379 | (t |
| 380 | (error "Illegal redirection target: %s" | 380 | (error "Invalid redirection target: %s" |
| 381 | (eshell-stringify target))))) | 381 | (eshell-stringify target))))) |
| 382 | 382 | ||
| 383 | (eval-when-compile | 383 | (eval-when-compile |
diff --git a/lisp/eshell/esh-var.el b/lisp/eshell/esh-var.el index fabcf367088..9ff9c1898a2 100644 --- a/lisp/eshell/esh-var.el +++ b/lisp/eshell/esh-var.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; esh-var.el --- handling of variables | 1 | ;;; esh-var.el --- handling of variables |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1999, 2000 Free Software Foundation | 3 | ;; Copyright (C) 1999, 2000, 2005 Free Software Foundation |
| 4 | 4 | ||
| 5 | ;; Author: John Wiegley <johnw@gnu.org> | 5 | ;; Author: John Wiegley <johnw@gnu.org> |
| 6 | 6 | ||
| @@ -568,7 +568,7 @@ For example, to retrieve the second element of a user's record in | |||
| 568 | (split-string value separator))))) | 568 | (split-string value separator))))) |
| 569 | (cond | 569 | (cond |
| 570 | ((< (length refs) 0) | 570 | ((< (length refs) 0) |
| 571 | (error "Illegal array variable index: %s" | 571 | (error "Invalid array variable index: %s" |
| 572 | (eshell-stringify refs))) | 572 | (eshell-stringify refs))) |
| 573 | ((= (length refs) 1) | 573 | ((= (length refs) 1) |
| 574 | (setq value (eshell-index-value value (car refs)))) | 574 | (setq value (eshell-index-value value (car refs)))) |