diff options
| author | Joakim Verona | 2011-06-16 00:22:07 +0200 |
|---|---|---|
| committer | Joakim Verona | 2011-06-16 00:22:07 +0200 |
| commit | a7513ade3bc0fe79430d5541d88c9dcda0932bec (patch) | |
| tree | 4383951ba698a11e9f8933a9d8c72e00aa872a10 /lisp/eshell/em-script.el | |
| parent | 4bd51ad5c3445b644dfb017d5b57b10a90aa325f (diff) | |
| parent | 4bba86e6210a74326e843a8fdc8409127105e1fe (diff) | |
| download | emacs-a7513ade3bc0fe79430d5541d88c9dcda0932bec.tar.gz emacs-a7513ade3bc0fe79430d5541d88c9dcda0932bec.zip | |
merge from upstream
Diffstat (limited to 'lisp/eshell/em-script.el')
| -rw-r--r-- | lisp/eshell/em-script.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/eshell/em-script.el b/lisp/eshell/em-script.el index ed4ad1c0712..d76e19cdd07 100644 --- a/lisp/eshell/em-script.el +++ b/lisp/eshell/em-script.el | |||
| @@ -34,8 +34,9 @@ commands, as a script file." | |||
| 34 | 34 | ||
| 35 | ;;; User Variables: | 35 | ;;; User Variables: |
| 36 | 36 | ||
| 37 | (defcustom eshell-script-load-hook '(eshell-script-initialize) | 37 | (defcustom eshell-script-load-hook nil |
| 38 | "A list of functions to call when loading `eshell-script'." | 38 | "A list of functions to call when loading `eshell-script'." |
| 39 | :version "24.1" ; removed eshell-script-initialize | ||
| 39 | :type 'hook | 40 | :type 'hook |
| 40 | :group 'eshell-script) | 41 | :group 'eshell-script) |
| 41 | 42 | ||