Mercurial > emacs
diff lisp/eshell/esh-io.el @ 91204:53108e6cea98
Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-294
author | Miles Bader <miles@gnu.org> |
---|---|
date | Thu, 06 Dec 2007 09:51:45 +0000 |
parents | f55f9811f5d7 3767c8399782 |
children | 606f2d163a64 |
line wrap: on
line diff
--- a/lisp/eshell/esh-io.el Thu Dec 06 07:36:30 2007 +0000 +++ b/lisp/eshell/esh-io.el Thu Dec 06 09:51:45 2007 +0000 @@ -22,17 +22,6 @@ ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ;; Boston, MA 02110-1301, USA. -(provide 'esh-io) - -(eval-when-compile (require 'esh-maint)) - -(defgroup eshell-io nil - "Eshell's I/O management code provides a scheme for treating many -different kinds of objects -- symbols, files, buffers, etc. -- as -though they were files." - :tag "I/O management" - :group 'eshell) - ;;; Commentary: ;; At the moment, only output redirection is supported in Eshell. To @@ -68,6 +57,17 @@ ;; (+ 1 2) > a > b > c ; prints number to all three files ;; (+ 1 2) > a | wc ; prints to 'a', and pipes to 'wc' +(provide 'esh-io) + +(eval-when-compile (require 'eshell)) + +(defgroup eshell-io nil + "Eshell's I/O management code provides a scheme for treating many +different kinds of objects -- symbols, files, buffers, etc. -- as +though they were files." + :tag "I/O management" + :group 'eshell) + ;;; User Variables: (defcustom eshell-io-load-hook '(eshell-io-initialize) @@ -417,6 +417,10 @@ (defvar eshell-print-queue nil) (defvar eshell-print-queue-count -1) +(defsubst eshell-print (object) + "Output OBJECT to the standard output handle." + (eshell-output-object object eshell-output-handle)) + (defun eshell-flush (&optional reset-p) "Flush out any lines that have been queued for printing. Must be called before printing begins with -1 as its argument, and @@ -445,10 +449,6 @@ (concat eshell-print-queue (apply 'concat strings)) eshell-print-queue-count (1+ eshell-print-queue-count)))) -(defsubst eshell-print (object) - "Output OBJECT to the standard output handle." - (eshell-output-object object eshell-output-handle)) - (defsubst eshell-error (object) "Output OBJECT to the standard error handle." (eshell-output-object object eshell-error-handle))