aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/eshell/em-script.el
diff options
context:
space:
mode:
authorGrégoire Jadi2013-06-12 17:06:09 +0200
committerGrégoire Jadi2013-06-12 17:06:09 +0200
commit32a590b04a10f6bbe92bc1519b9e5ba2d32cfabc (patch)
tree578be4eb2757a0716f252a269adc49fa9406556d /lisp/eshell/em-script.el
parent5c77269b59c8d8d88fa91ec2c949294db1bb2131 (diff)
parente6fa6da6899bf1b4877b96c450eae3934085d560 (diff)
downloademacs-32a590b04a10f6bbe92bc1519b9e5ba2d32cfabc.tar.gz
emacs-32a590b04a10f6bbe92bc1519b9e5ba2d32cfabc.zip
Merge branch 'jave-xwidget' into xwidget
Diffstat (limited to 'lisp/eshell/em-script.el')
-rw-r--r--lisp/eshell/em-script.el7
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/eshell/em-script.el b/lisp/eshell/em-script.el
index 711b2e21468..b073928738f 100644
--- a/lisp/eshell/em-script.el
+++ b/lisp/eshell/em-script.el
@@ -61,9 +61,10 @@ This includes when running `eshell-command'."
61 "Initialize the script parsing code." 61 "Initialize the script parsing code."
62 (make-local-variable 'eshell-interpreter-alist) 62 (make-local-variable 'eshell-interpreter-alist)
63 (setq eshell-interpreter-alist 63 (setq eshell-interpreter-alist
64 (cons '((lambda (file) 64 (cons (cons #'(lambda (file args)
65 (string= (file-name-nondirectory file) 65 (string= (file-name-nondirectory file)
66 "eshell")) . eshell/source) 66 "eshell"))
67 'eshell/source)
67 eshell-interpreter-alist)) 68 eshell-interpreter-alist))
68 (make-local-variable 'eshell-complex-commands) 69 (make-local-variable 'eshell-complex-commands)
69 (setq eshell-complex-commands 70 (setq eshell-complex-commands