HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* eshell/esh-var.el (eshell-variable-aliases-list): Fix doc typo.
[bpt/emacs.git]
/
lisp
/
eshell
/
em-script.el
diff --git
a/lisp/eshell/em-script.el
b/lisp/eshell/em-script.el
index
dac8d66
..
1a19698
100644
(file)
--- a/
lisp/eshell/em-script.el
+++ b/
lisp/eshell/em-script.el
@@
-1,7
+1,6
@@
-;;; em-script.el --- Eshell script files
+;;; em-script.el --- Eshell script files
-*- lexical-binding:t -*-
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;; 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2013 Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@gnu.org>
;; Author: John Wiegley <johnw@gnu.org>
@@
-25,18
+24,21
@@
;;; Code:
(require 'eshell)
;;; Code:
(require 'eshell)
+(require 'esh-opt)
;;;###autoload
;;;###autoload
-(eshell-defgroup eshell-script nil
+(progn
+(defgroup eshell-script nil
"This module allows for the execution of files containing Eshell
commands, as a script file."
:tag "Running script files."
"This module allows for the execution of files containing Eshell
commands, as a script file."
:tag "Running script files."
- :group 'eshell-module)
+ :group 'eshell-module)
)
;;; User Variables:
;;; User Variables:
-(defcustom eshell-script-load-hook
'(eshell-script-initialize)
+(defcustom eshell-script-load-hook
nil
"A list of functions to call when loading `eshell-script'."
"A list of functions to call when loading `eshell-script'."
+ :version "24.1" ; removed eshell-script-initialize
:type 'hook
:group 'eshell-script)
:type 'hook
:group 'eshell-script)
@@
-59,9
+61,10
@@
This includes when running `eshell-command'."
"Initialize the script parsing code."
(make-local-variable 'eshell-interpreter-alist)
(setq eshell-interpreter-alist
"Initialize the script parsing code."
(make-local-variable 'eshell-interpreter-alist)
(setq eshell-interpreter-alist
- (cons '((lambda (file)
- (string= (file-name-nondirectory file)
- "eshell")) . eshell/source)
+ (cons (cons #'(lambda (file args)
+ (string= (file-name-nondirectory file)
+ "eshell"))
+ 'eshell/source)
eshell-interpreter-alist))
(make-local-variable 'eshell-complex-commands)
(setq eshell-complex-commands
eshell-interpreter-alist))
(make-local-variable 'eshell-complex-commands)
(setq eshell-complex-commands