diff options
| author | Eli Zaretskii | 2012-10-07 15:37:05 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2012-10-07 15:37:05 +0200 |
| commit | 25d99a950debf417295e68a7a7d519b4ddf3e546 (patch) | |
| tree | a7d9fba3285833d9bc3e261cda8c197a620d7873 /lisp/eshell | |
| parent | 6f011d8194bd146065c5c2c5d6369a80d6773c68 (diff) | |
| parent | 493b5b1c4a7e8b27a0e57c596a83e8b4acad591c (diff) | |
| download | emacs-25d99a950debf417295e68a7a7d519b4ddf3e546.tar.gz emacs-25d99a950debf417295e68a7a7d519b4ddf3e546.zip | |
Merge from mainline.
Diffstat (limited to 'lisp/eshell')
| -rw-r--r-- | lisp/eshell/esh-mode.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/eshell/esh-mode.el b/lisp/eshell/esh-mode.el index 8a9107e5470..673632400f2 100644 --- a/lisp/eshell/esh-mode.el +++ b/lisp/eshell/esh-mode.el | |||
| @@ -193,14 +193,14 @@ This is used by `eshell-watch-for-password-prompt'." | |||
| 193 | :type '(choice (const nil) function) | 193 | :type '(choice (const nil) function) |
| 194 | :group 'eshell-mode) | 194 | :group 'eshell-mode) |
| 195 | 195 | ||
| 196 | (define-obsolete-variable-alias 'eshell-status-in-modeline | ||
| 197 | 'eshell-status-in-mode-line "24.3") | ||
| 198 | |||
| 196 | (defcustom eshell-status-in-mode-line t | 199 | (defcustom eshell-status-in-mode-line t |
| 197 | "If non-nil, let the user know a command is running in the mode line." | 200 | "If non-nil, let the user know a command is running in the mode line." |
| 198 | :type 'boolean | 201 | :type 'boolean |
| 199 | :group 'eshell-mode) | 202 | :group 'eshell-mode) |
| 200 | 203 | ||
| 201 | (define-obsolete-variable-alias 'eshell-status-in-modeline | ||
| 202 | 'eshell-status-in-mode-line "24.3") | ||
| 203 | |||
| 204 | (defvar eshell-first-time-p t | 204 | (defvar eshell-first-time-p t |
| 205 | "A variable which is non-nil the first time Eshell is loaded.") | 205 | "A variable which is non-nil the first time Eshell is loaded.") |
| 206 | 206 | ||