aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/eshell
diff options
context:
space:
mode:
authorKenichi Handa2013-05-23 21:04:26 +0900
committerKenichi Handa2013-05-23 21:04:26 +0900
commit179a3f11d15cbc6e433f05e03cc7e40fd5ce8362 (patch)
tree1ce423b654c3470460625730f3f42585bf5f770f /lisp/eshell
parentbc9a50032c477d4276583e66312806540167007d (diff)
parent7764286ea69667380175fe156c4e82bf789a1e09 (diff)
downloademacs-179a3f11d15cbc6e433f05e03cc7e40fd5ce8362.tar.gz
emacs-179a3f11d15cbc6e433f05e03cc7e40fd5ce8362.zip
merge trunk
Diffstat (limited to 'lisp/eshell')
-rw-r--r--lisp/eshell/em-alias.el2
-rw-r--r--lisp/eshell/em-banner.el6
-rw-r--r--lisp/eshell/em-basic.el4
-rw-r--r--lisp/eshell/em-cmpl.el4
-rw-r--r--lisp/eshell/em-glob.el2
-rw-r--r--lisp/eshell/em-ls.el10
-rw-r--r--lisp/eshell/em-pred.el2
-rw-r--r--lisp/eshell/em-prompt.el1
-rw-r--r--lisp/eshell/em-rebind.el1
-rw-r--r--lisp/eshell/em-smart.el1
-rw-r--r--lisp/eshell/em-term.el2
-rw-r--r--lisp/eshell/em-tramp.el6
-rw-r--r--lisp/eshell/em-xtra.el3
-rw-r--r--lisp/eshell/esh-arg.el2
-rw-r--r--lisp/eshell/esh-ext.el8
-rw-r--r--lisp/eshell/esh-io.el8
-rw-r--r--lisp/eshell/esh-mode.el2
-rw-r--r--lisp/eshell/esh-opt.el2
-rw-r--r--lisp/eshell/esh-proc.el4
-rw-r--r--lisp/eshell/esh-util.el10
-rw-r--r--lisp/eshell/esh-var.el8
-rw-r--r--lisp/eshell/eshell.el8
22 files changed, 62 insertions, 34 deletions
diff --git a/lisp/eshell/em-alias.el b/lisp/eshell/em-alias.el
index aa89177c2de..a46b48c01b3 100644
--- a/lisp/eshell/em-alias.el
+++ b/lisp/eshell/em-alias.el
@@ -90,8 +90,6 @@
90 90
91;;; Code: 91;;; Code:
92 92
93(eval-when-compile
94 (require 'esh-util))
95(require 'eshell) 93(require 'eshell)
96 94
97;;;###autoload 95;;;###autoload
diff --git a/lisp/eshell/em-banner.el b/lisp/eshell/em-banner.el
index 44928b14e11..8c3eebf3510 100644
--- a/lisp/eshell/em-banner.el
+++ b/lisp/eshell/em-banner.el
@@ -39,11 +39,11 @@
39;;; Code: 39;;; Code:
40 40
41(eval-when-compile 41(eval-when-compile
42 (require 'cl-lib) 42 (require 'cl-lib))
43 (require 'esh-mode)
44 (require 'eshell))
45 43
46(require 'esh-util) 44(require 'esh-util)
45(require 'esh-mode)
46(require 'eshell)
47 47
48;;;###autoload 48;;;###autoload
49(progn 49(progn
diff --git a/lisp/eshell/em-basic.el b/lisp/eshell/em-basic.el
index d795b8226ca..c440bd0a928 100644
--- a/lisp/eshell/em-basic.el
+++ b/lisp/eshell/em-basic.el
@@ -59,9 +59,7 @@
59 59
60;;; Code: 60;;; Code:
61 61
62(eval-when-compile 62(require 'esh-util)
63 (require 'esh-util))
64
65(require 'eshell) 63(require 'eshell)
66(require 'esh-opt) 64(require 'esh-opt)
67 65
diff --git a/lisp/eshell/em-cmpl.el b/lisp/eshell/em-cmpl.el
index 4f4b8dd3276..426db3232ed 100644
--- a/lisp/eshell/em-cmpl.el
+++ b/lisp/eshell/em-cmpl.el
@@ -70,10 +70,12 @@
70;;; Code: 70;;; Code:
71(require 'pcomplete) 71(require 'pcomplete)
72 72
73(require 'esh-mode)
74(require 'esh-util)
75
73(eval-when-compile 76(eval-when-compile
74 (require 'cl-lib) 77 (require 'cl-lib)
75 (require 'eshell)) 78 (require 'eshell))
76(require 'esh-util)
77 79
78;;;###autoload 80;;;###autoload
79(progn 81(progn
diff --git a/lisp/eshell/em-glob.el b/lisp/eshell/em-glob.el
index 866412d252b..a58c7730ded 100644
--- a/lisp/eshell/em-glob.el
+++ b/lisp/eshell/em-glob.el
@@ -49,8 +49,8 @@
49 49
50;;; Code: 50;;; Code:
51 51
52(eval-when-compile (require 'eshell))
53(require 'esh-util) 52(require 'esh-util)
53(eval-when-compile (require 'eshell))
54 54
55;;;###autoload 55;;;###autoload
56(progn 56(progn
diff --git a/lisp/eshell/em-ls.el b/lisp/eshell/em-ls.el
index 73ed617b871..41db4cd03d1 100644
--- a/lisp/eshell/em-ls.el
+++ b/lisp/eshell/em-ls.el
@@ -26,10 +26,10 @@
26 26
27;;; Code: 27;;; Code:
28 28
29(eval-when-compile (require 'eshell))
30(require 'cl-lib) 29(require 'cl-lib)
31(require 'esh-util) 30(require 'esh-util)
32(require 'esh-opt) 31(require 'esh-opt)
32(eval-when-compile (require 'eshell))
33 33
34;;;###autoload 34;;;###autoload
35(progn 35(progn
@@ -334,6 +334,8 @@ instead."
334(defvar ange-cache) 334(defvar ange-cache)
335(defvar dired-flag) 335(defvar dired-flag)
336 336
337(declare-function eshell-glob-regexp "em-glob" (pattern))
338
337(defun eshell-do-ls (&rest args) 339(defun eshell-do-ls (&rest args)
338 "Implementation of \"ls\" in Lisp, passing ARGS." 340 "Implementation of \"ls\" in Lisp, passing ARGS."
339 (funcall flush-func -1) 341 (funcall flush-func -1)
@@ -552,7 +554,7 @@ relative to that directory."
552 (expand-file-name dir))) 554 (expand-file-name dir)))
553 (cdr dirinfo))) ":\n")) 555 (cdr dirinfo))) ":\n"))
554 (let ((entries (eshell-directory-files-and-attributes 556 (let ((entries (eshell-directory-files-and-attributes
555 dir nil (and (not show-all) 557 dir nil (and (not (or show-all show-almost-all))
556 eshell-ls-exclude-hidden 558 eshell-ls-exclude-hidden
557 "\\`[^.]") t 559 "\\`[^.]") t
558 ;; Asking for UID and GID as 560 ;; Asking for UID and GID as
@@ -565,9 +567,9 @@ relative to that directory."
565 (setq entries 567 (setq entries
566 (cl-remove-if 568 (cl-remove-if
567 (lambda (entry) 569 (lambda (entry)
568 (member (caar entry) '("." ".."))) 570 (member (car entry) '("." "..")))
569 entries))) 571 entries)))
570 (when (and (not show-all) 572 (when (and (not (or show-all show-almost-all))
571 eshell-ls-exclude-regexp) 573 eshell-ls-exclude-regexp)
572 (while (and entries (string-match eshell-ls-exclude-regexp 574 (while (and entries (string-match eshell-ls-exclude-regexp
573 (caar entries))) 575 (caar entries)))
diff --git a/lisp/eshell/em-pred.el b/lisp/eshell/em-pred.el
index 13bdb2e4a03..3a7f46ebe83 100644
--- a/lisp/eshell/em-pred.el
+++ b/lisp/eshell/em-pred.el
@@ -46,6 +46,8 @@
46 46
47;;; Code: 47;;; Code:
48 48
49(require 'esh-util)
50(require 'esh-arg)
49(eval-when-compile (require 'eshell)) 51(eval-when-compile (require 'eshell))
50 52
51;;;###autoload 53;;;###autoload
diff --git a/lisp/eshell/em-prompt.el b/lisp/eshell/em-prompt.el
index c5429c59bd6..18731121c4e 100644
--- a/lisp/eshell/em-prompt.el
+++ b/lisp/eshell/em-prompt.el
@@ -26,6 +26,7 @@
26 26
27;;; Code: 27;;; Code:
28 28
29(require 'esh-mode)
29(eval-when-compile (require 'eshell)) 30(eval-when-compile (require 'eshell))
30 31
31;;;###autoload 32;;;###autoload
diff --git a/lisp/eshell/em-rebind.el b/lisp/eshell/em-rebind.el
index 42a5c36cab3..341191fc62f 100644
--- a/lisp/eshell/em-rebind.el
+++ b/lisp/eshell/em-rebind.el
@@ -23,6 +23,7 @@
23 23
24;;; Code: 24;;; Code:
25 25
26(require 'esh-mode)
26(eval-when-compile (require 'eshell)) 27(eval-when-compile (require 'eshell))
27 28
28;;;###autoload 29;;;###autoload
diff --git a/lisp/eshell/em-smart.el b/lisp/eshell/em-smart.el
index de244a2fb88..aa9038aafb9 100644
--- a/lisp/eshell/em-smart.el
+++ b/lisp/eshell/em-smart.el
@@ -68,6 +68,7 @@
68 68
69;;; Code: 69;;; Code:
70 70
71(require 'esh-mode)
71(eval-when-compile (require 'eshell)) 72(eval-when-compile (require 'eshell))
72 73
73;;;###autoload 74;;;###autoload
diff --git a/lisp/eshell/em-term.el b/lisp/eshell/em-term.el
index e659bce0568..e5360f2deb4 100644
--- a/lisp/eshell/em-term.el
+++ b/lisp/eshell/em-term.el
@@ -31,6 +31,8 @@
31 31
32;;; Code: 32;;; Code:
33 33
34(require 'esh-util)
35(require 'esh-ext)
34(eval-when-compile (require 'eshell)) 36(eval-when-compile (require 'eshell))
35(require 'term) 37(require 'term)
36 38
diff --git a/lisp/eshell/em-tramp.el b/lisp/eshell/em-tramp.el
index c60d0e6395f..fb816b76a7d 100644
--- a/lisp/eshell/em-tramp.el
+++ b/lisp/eshell/em-tramp.el
@@ -25,13 +25,13 @@
25 25
26;;; Code: 26;;; Code:
27 27
28(require 'esh-util)
29
28(eval-when-compile 30(eval-when-compile
29 (require 'esh-mode) 31 (require 'esh-mode)
30 (require 'eshell) 32 (require 'eshell)
31 (require 'tramp)) 33 (require 'tramp))
32 34
33(require 'esh-util)
34
35;;;###autoload 35;;;###autoload
36(progn 36(progn
37 (defgroup eshell-tramp nil 37 (defgroup eshell-tramp nil
@@ -53,6 +53,8 @@
53 (append '("su" "sudo") 53 (append '("su" "sudo")
54 eshell-complex-commands))) 54 eshell-complex-commands)))
55 55
56(autoload 'eshell-parse-command "esh-cmd")
57
56(defun eshell/su (&rest args) 58(defun eshell/su (&rest args)
57 "Alias \"su\" to call TRAMP. 59 "Alias \"su\" to call TRAMP.
58 60
diff --git a/lisp/eshell/em-xtra.el b/lisp/eshell/em-xtra.el
index 7c559772dd3..c4cab522cf2 100644
--- a/lisp/eshell/em-xtra.el
+++ b/lisp/eshell/em-xtra.el
@@ -23,6 +23,7 @@
23 23
24;;; Code: 24;;; Code:
25 25
26(require 'esh-util)
26(eval-when-compile 27(eval-when-compile
27 (require 'eshell) 28 (require 'eshell)
28 (require 'pcomplete)) 29 (require 'pcomplete))
@@ -40,6 +41,8 @@ naturally accessible within Emacs."
40 41
41;;; Functions: 42;;; Functions:
42 43
44(autoload 'eshell-parse-command "esh-cmd")
45
43(defun eshell/expr (&rest args) 46(defun eshell/expr (&rest args)
44 "Implementation of expr, using the calc package." 47 "Implementation of expr, using the calc package."
45 (if (not (fboundp 'calc-eval)) 48 (if (not (fboundp 'calc-eval))
diff --git a/lisp/eshell/esh-arg.el b/lisp/eshell/esh-arg.el
index 73f7fc557e5..d7dfd27d8d3 100644
--- a/lisp/eshell/esh-arg.el
+++ b/lisp/eshell/esh-arg.el
@@ -27,7 +27,7 @@
27 27
28(provide 'esh-arg) 28(provide 'esh-arg)
29 29
30(eval-when-compile (require 'eshell)) 30(require 'esh-mode)
31 31
32(defgroup eshell-arg nil 32(defgroup eshell-arg nil
33 "Argument parsing involves transforming the arguments passed on the 33 "Argument parsing involves transforming the arguments passed on the
diff --git a/lisp/eshell/esh-ext.el b/lisp/eshell/esh-ext.el
index 3fe48b26e27..c4e4c000bda 100644
--- a/lisp/eshell/esh-ext.el
+++ b/lisp/eshell/esh-ext.el
@@ -33,10 +33,12 @@
33 33
34(provide 'esh-ext) 34(provide 'esh-ext)
35 35
36(require 'esh-util)
37
36(eval-when-compile 38(eval-when-compile
37 (require 'cl-lib) 39 (require 'cl-lib)
40 (require 'esh-io)
38 (require 'esh-cmd)) 41 (require 'esh-cmd))
39(require 'esh-util)
40(require 'esh-opt) 42(require 'esh-opt)
41 43
42(defgroup eshell-ext nil 44(defgroup eshell-ext nil
@@ -103,6 +105,8 @@ wholly ignored."
103 :type '(choice file (const nil)) 105 :type '(choice file (const nil))
104 :group 'eshell-ext) 106 :group 'eshell-ext)
105 107
108(autoload 'eshell-parse-command "esh-cmd")
109
106(defsubst eshell-invoke-batch-file (&rest args) 110(defsubst eshell-invoke-batch-file (&rest args)
107 "Invoke a .BAT or .CMD file on DOS/Windows systems." 111 "Invoke a .BAT or .CMD file on DOS/Windows systems."
108 ;; since CMD.EXE can't handle forward slashes in the initial 112 ;; since CMD.EXE can't handle forward slashes in the initial
@@ -179,6 +183,8 @@ This bypasses all Lisp functions and aliases."
179 (error "%s: external command not found" 183 (error "%s: external command not found"
180 (substring command 1)))))) 184 (substring command 1))))))
181 185
186(autoload 'eshell-close-handles "esh-io")
187
182(defun eshell-remote-command (command args) 188(defun eshell-remote-command (command args)
183 "Insert output from a remote COMMAND, using ARGS. 189 "Insert output from a remote COMMAND, using ARGS.
184A remote command is something that executes on a different machine. 190A remote command is something that executes on a different machine.
diff --git a/lisp/eshell/esh-io.el b/lisp/eshell/esh-io.el
index 66172c8f662..4edb47e4758 100644
--- a/lisp/eshell/esh-io.el
+++ b/lisp/eshell/esh-io.el
@@ -58,9 +58,11 @@
58 58
59(provide 'esh-io) 59(provide 'esh-io)
60 60
61(require 'esh-arg)
62(require 'esh-util)
63
61(eval-when-compile 64(eval-when-compile
62 (require 'cl-lib) 65 (require 'cl-lib))
63 (require 'eshell))
64 66
65(defgroup eshell-io nil 67(defgroup eshell-io nil
66 "Eshell's I/O management code provides a scheme for treating many 68 "Eshell's I/O management code provides a scheme for treating many
@@ -465,6 +467,8 @@ after all printing is over with no argument."
465 (eshell-print object) 467 (eshell-print object)
466 (eshell-print "\n")) 468 (eshell-print "\n"))
467 469
470(autoload 'eshell-output-filter "esh-mode")
471
468(defun eshell-output-object-to-target (object target) 472(defun eshell-output-object-to-target (object target)
469 "Insert OBJECT into TARGET. 473 "Insert OBJECT into TARGET.
470Returns what was actually sent, or nil if nothing was sent." 474Returns what was actually sent, or nil if nothing was sent."
diff --git a/lisp/eshell/esh-mode.el b/lisp/eshell/esh-mode.el
index c22d7c16e98..ee857cf20f3 100644
--- a/lisp/eshell/esh-mode.el
+++ b/lisp/eshell/esh-mode.el
@@ -60,7 +60,7 @@
60 60
61(provide 'esh-mode) 61(provide 'esh-mode)
62 62
63(eval-when-compile (require 'esh-util)) 63(require 'esh-util)
64(require 'esh-module) 64(require 'esh-module)
65(require 'esh-cmd) 65(require 'esh-cmd)
66(require 'esh-io) 66(require 'esh-io)
diff --git a/lisp/eshell/esh-opt.el b/lisp/eshell/esh-opt.el
index 6a37f97bf20..33625433022 100644
--- a/lisp/eshell/esh-opt.el
+++ b/lisp/eshell/esh-opt.el
@@ -25,7 +25,7 @@
25 25
26(provide 'esh-opt) 26(provide 'esh-opt)
27 27
28(eval-when-compile (require 'esh-ext)) 28(require 'esh-ext)
29 29
30;; Unused. 30;; Unused.
31;;; (defgroup eshell-opt nil 31;;; (defgroup eshell-opt nil
diff --git a/lisp/eshell/esh-proc.el b/lisp/eshell/esh-proc.el
index aa630dc87aa..171d70c0772 100644
--- a/lisp/eshell/esh-proc.el
+++ b/lisp/eshell/esh-proc.el
@@ -25,9 +25,7 @@
25 25
26(provide 'esh-proc) 26(provide 'esh-proc)
27 27
28(eval-when-compile 28(require 'esh-cmd)
29 (require 'eshell)
30 (require 'esh-util))
31 29
32(defgroup eshell-proc nil 30(defgroup eshell-proc nil
33 "When Eshell invokes external commands, it always does so 31 "When Eshell invokes external commands, it always does so
diff --git a/lisp/eshell/esh-util.el b/lisp/eshell/esh-util.el
index f9b86219e9b..dd344eb50a2 100644
--- a/lisp/eshell/esh-util.el
+++ b/lisp/eshell/esh-util.el
@@ -605,10 +605,16 @@ If NOSORT is non-nil, the list is not sorted--its order is unpredictable.
605 (autoload 'parse-time-string "parse-time")) 605 (autoload 'parse-time-string "parse-time"))
606 606
607(eval-when-compile 607(eval-when-compile
608 (require 'ange-ftp nil t) 608 (require 'ange-ftp nil t)) ; ange-ftp-parse-filename
609 (require 'tramp nil t)) 609
610(defvar tramp-file-name-structure)
611(declare-function ange-ftp-ls "ange-ftp"
612 (file lsargs parse &optional no-error wildcard))
613(declare-function ange-ftp-file-modtime "ange-ftp" (file))
610 614
611(defun eshell-parse-ange-ls (dir) 615(defun eshell-parse-ange-ls (dir)
616 (require 'ange-ftp)
617 (require 'tramp)
612 (let ((ange-ftp-name-format 618 (let ((ange-ftp-name-format
613 (list (nth 0 tramp-file-name-structure) 619 (list (nth 0 tramp-file-name-structure)
614 (nth 3 tramp-file-name-structure) 620 (nth 3 tramp-file-name-structure)
diff --git a/lisp/eshell/esh-var.el b/lisp/eshell/esh-var.el
index 06858c5b986..188b8165248 100644
--- a/lisp/eshell/esh-var.el
+++ b/lisp/eshell/esh-var.el
@@ -107,11 +107,11 @@
107 107
108(provide 'esh-var) 108(provide 'esh-var)
109 109
110(eval-when-compile 110(require 'esh-util)
111 (require 'pcomplete) 111(require 'esh-cmd)
112 (require 'esh-util)
113 (require 'esh-mode))
114(require 'esh-opt) 112(require 'esh-opt)
113
114(require 'pcomplete)
115(require 'env) 115(require 'env)
116(require 'ring) 116(require 'ring)
117 117
diff --git a/lisp/eshell/eshell.el b/lisp/eshell/eshell.el
index a76adb1fd94..9bdf8b3eb68 100644
--- a/lisp/eshell/eshell.el
+++ b/lisp/eshell/eshell.el
@@ -222,8 +222,7 @@
222;; things up. 222;; things up.
223 223
224(eval-when-compile 224(eval-when-compile
225 (require 'cl-lib) 225 (require 'cl-lib))
226 (require 'esh-util))
227(require 'esh-util) 226(require 'esh-util)
228(require 'esh-mode) 227(require 'esh-mode)
229 228
@@ -318,6 +317,8 @@ buffer selected (or created)."
318Modules should use this variable so that they don't clutter 317Modules should use this variable so that they don't clutter
319non-interactive sessions, such as when using `eshell-command'.") 318non-interactive sessions, such as when using `eshell-command'.")
320 319
320(declare-function eshell-add-input-to-history "em-hist" (input))
321
321;;;###autoload 322;;;###autoload
322(defun eshell-command (&optional command arg) 323(defun eshell-command (&optional command arg)
323 "Execute the Eshell command string COMMAND. 324 "Execute the Eshell command string COMMAND.
@@ -333,7 +334,8 @@ With prefix ARG, insert output into the current buffer at point."
333 (eshell-return-exits-minibuffer)) 334 (eshell-return-exits-minibuffer))
334 (unless command 335 (unless command
335 (setq command (read-from-minibuffer "Emacs shell command: ")) 336 (setq command (read-from-minibuffer "Emacs shell command: "))
336 (eshell-add-input-to-history command)))) 337 (if (eshell-using-module 'eshell-hist)
338 (eshell-add-input-to-history command)))))
337 (unless command 339 (unless command
338 (error "No command specified!")) 340 (error "No command specified!"))
339 ;; redirection into the current buffer is achieved by adding an 341 ;; redirection into the current buffer is achieved by adding an
generated by cgit v1.2.1 (git 2.18.0) at 2026-01-28 02:45:48 +0000