HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge changes from emacs-23 branch.
[bpt/emacs.git]
/
lisp
/
eshell
/
em-prompt.el
diff --git
a/lisp/eshell/em-prompt.el
b/lisp/eshell/em-prompt.el
index
8476e64
..
6e8abd6
100644
(file)
--- a/
lisp/eshell/em-prompt.el
+++ b/
lisp/eshell/em-prompt.el
@@
-1,16
+1,16
@@
;;; em-prompt.el --- command prompts
;;; em-prompt.el --- command prompts
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;; 200
5, 2006
Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
2005, 2006, 2007,
+;; 200
8, 2009, 2010
Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@gnu.org>
;; This file is part of GNU Emacs.
;; Author: John Wiegley <johnw@gnu.org>
;; This file is part of GNU Emacs.
-;; GNU Emacs is free software
;
you can redistribute it and/or modify
+;; GNU Emacs is free software
:
you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation
; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation
, either version 3 of the License, or
+;;
(at your option)
any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-18,25
+18,24
@@
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
-(provide 'em-prompt)
+;;; Commentary:
+
+;; Most of the prompt navigation commands of `comint-mode' are
+;; supported, such as C-c C-n, C-c C-p, etc.
+
+;;; Code:
-(eval-when-compile (require 'esh
-maint
))
+(eval-when-compile (require 'esh
ell
))
-(defgroup eshell-prompt nil
+;;;###autoload
+(eshell-defgroup eshell-prompt nil
"This module provides command prompts, and navigation between them,
as is common with most shells."
:tag "Command prompts"
:group 'eshell-module)
"This module provides command prompts, and navigation between them,
as is common with most shells."
:tag "Command prompts"
:group 'eshell-module)
-;;; Commentary:
-
-;; Most of the prompt navigation commands of `comint-mode' are
-;; supported, such as C-c C-n, C-c C-p, etc.
-
;;; User Variables:
(defcustom eshell-prompt-load-hook '(eshell-prompt-initialize)
;;; User Variables:
(defcustom eshell-prompt-load-hook '(eshell-prompt-initialize)
@@
-47,9
+46,9
@@
as is common with most shells."
(defcustom eshell-prompt-function
(function
(lambda ()
(defcustom eshell-prompt-function
(function
(lambda ()
- (concat (
eshell/pwd
)
+ (concat (
abbreviate-file-name (eshell/pwd)
)
(if (= (user-uid) 0) " # " " $ "))))
(if (= (user-uid) 0) " # " " $ "))))
- "
*
A function that returns the Eshell prompt string.
+ "A function that returns the Eshell prompt string.
Make sure to update `eshell-prompt-regexp' so that it will match your
prompt."
:type 'function
Make sure to update `eshell-prompt-regexp' so that it will match your
prompt."
:type 'function
@@
-77,8
+76,7
@@
re-entered for it to take effect."
For highlighting other kinds of strings -- similar to shell mode's
behavior -- simply use an output filer which changes text properties."
:group 'eshell-prompt)
For highlighting other kinds of strings -- similar to shell mode's
behavior -- simply use an output filer which changes text properties."
:group 'eshell-prompt)
-;; backward-compatibility alias
-(put 'eshell-prompt-face 'face-alias 'eshell-prompt)
+(define-obsolete-face-alias 'eshell-prompt-face 'eshell-prompt "22.1")
(defcustom eshell-before-prompt-hook nil
"*A list of functions to call before outputting the prompt."
(defcustom eshell-before-prompt-hook nil
"*A list of functions to call before outputting the prompt."
@@
-173,7
+171,11
@@
If this takes us past the end of the current line, don't skip at all."
(<= (match-end 0) eol))
(goto-char (match-end 0)))))
(<= (match-end 0) eol))
(goto-char (match-end 0)))))
-;;; Code:
+(provide 'em-prompt)
+
+;; Local Variables:
+;; generated-autoload-file: "esh-groups.el"
+;; End:
-;;
;
arch-tag: 01c1574b-ce70-4e89-bc38-e6619f61e208
+;; arch-tag: 01c1574b-ce70-4e89-bc38-e6619f61e208
;;; em-prompt.el ends here
;;; em-prompt.el ends here