From 17c083ac218b2a560b84a11df22366c0b9f7b636 Mon Sep 17 00:00:00 2001
From: Glenn Morris
Date: Wed, 14 Nov 2012 23:59:46 -0800
Subject: * lisp/eshell/em-cmpl.el (eshell-pcomplete): New command.
 (eshell-cmpl-initialize): Bind eshell-pcomplete to TAB, C-i.

Fixes: debbugs:12838
---
 lisp/eshell/em-cmpl.el | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'lisp/eshell')

diff --git a/lisp/eshell/em-cmpl.el b/lisp/eshell/em-cmpl.el
index a67861e83a9..aa8aae2d245 100644
--- a/lisp/eshell/em-cmpl.el
+++ b/lisp/eshell/em-cmpl.el
@@ -295,8 +295,8 @@ to writing a completion function."
     'pcomplete-expand-and-complete)
   (define-key eshell-command-map [space] 'pcomplete-expand)
   (define-key eshell-command-map [? ] 'pcomplete-expand)
-  (define-key eshell-mode-map [tab] 'pcomplete)
-  (define-key eshell-mode-map [(control ?i)] 'pcomplete)
+  (define-key eshell-mode-map [tab] 'eshell-pcomplete)
+  (define-key eshell-mode-map [(control ?i)] 'eshell-pcomplete)
   ;; jww (1999-10-19): Will this work on anything but X?
   (if (featurep 'xemacs)
       (define-key eshell-mode-map [iso-left-tab] 'pcomplete-reverse)
@@ -449,6 +449,13 @@ to writing a completion function."
 			(all-completions filename obarray 'functionp))
 		   completions)))))))
 
+(defun eshell-pcomplete ()
+  "Eshell wrapper for `pcomplete'."
+  (interactive)
+  (if eshell-cmpl-ignore-case
+      (pcomplete-expand-and-complete)  ; hack workaround for bug#12838
+    (pcomplete)))
+
 (provide 'em-cmpl)
 
 ;; Local Variables:
-- 
cgit v1.2.1


From 60c4ee668296b705cb359f3915c78fddd4bfcfdf Mon Sep 17 00:00:00 2001
From: Jürgen Hötzel
Date: Fri, 16 Nov 2012 13:18:07 -0500
Subject: * lisp/eshell/em-unix.el (eshell/mkdir): Handle "--parents".

Fixes: debbugs:12897
---
 lisp/eshell/em-unix.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lisp/eshell')

diff --git a/lisp/eshell/em-unix.el b/lisp/eshell/em-unix.el
index d3ddab8af1b..32744c702a6 100644
--- a/lisp/eshell/em-unix.el
+++ b/lisp/eshell/em-unix.el
@@ -306,12 +306,13 @@ Remove (unlink) the FILE(s).")
   (eshell-eval-using-options
    "mkdir" args
    '((?h "help" nil nil "show this usage screen")
+     (?p "parents" nil em-parents "make parent directories as needed")
      :external "mkdir"
      :show-usage
      :usage "[OPTION] DIRECTORY...
 Create the DIRECTORY(ies), if they do not already exist.")
    (while args
-     (eshell-funcalln 'make-directory (car args))
+     (eshell-funcalln 'make-directory (car args) em-parents)
      (setq args (cdr args)))
    nil))
 
-- 
cgit v1.2.1