2013-09-12 20:15:53 +00:00
|
|
|
;;; em-prompt.el --- command prompts -*- lexical-binding:t -*-
|
2000-06-23 05:24:10 +00:00
|
|
|
|
2013-01-01 09:11:05 +00:00
|
|
|
;; Copyright (C) 1999-2013 Free Software Foundation, Inc.
|
2000-06-23 05:24:10 +00:00
|
|
|
|
2000-10-16 12:27:09 +00:00
|
|
|
;; Author: John Wiegley <johnw@gnu.org>
|
|
|
|
|
2000-06-23 05:24:10 +00:00
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
2008-05-06 03:36:21 +00:00
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
2000-06-23 05:24:10 +00:00
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 03:36:21 +00:00
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
;; (at your option) any later version.
|
2000-06-23 05:24:10 +00:00
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2008-05-06 03:36:21 +00:00
|
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
2000-06-23 05:24:10 +00:00
|
|
|
|
2007-12-05 07:03:18 +00:00
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
|
;; Most of the prompt navigation commands of `comint-mode' are
|
|
|
|
;; supported, such as C-c C-n, C-c C-p, etc.
|
|
|
|
|
|
|
|
;;; Code:
|
2000-06-23 05:24:10 +00:00
|
|
|
|
Silence many eshell compilation warnings
* lisp/eshell/em-tramp.el: Adjust requires.
(eshell-parse-command): Autoload.
* lisp/eshell/em-xtra.el: Adjust requires.
(eshell-parse-command): Autoload.
* lisp/eshell/esh-ext.el: Adjust requires.
(eshell-parse-command, eshell-close-handles): Autoload.
* lisp/eshell/esh-io.el: Adjust requires.
(eshell-output-filter): Autoload.
* lisp/eshell/esh-util.el: No need to load tramp when compiling.
(tramp-file-name-structure, ange-ftp-ls, ange-ftp-file-modtime): Declare.
(eshell-parse-ange-ls): Require ange-ftp and tramp.
* lisp/eshell/em-alias.el, lisp/eshell/em-banner.el, lisp/eshell/em-basic.el:
* lisp/eshell/em-cmpl.el, lisp/eshell/em-glob.el, lisp/eshell/em-pred.el:
* lisp/eshell/em-prompt.el, lisp/eshell/em-rebind.el, lisp/eshell/em-smart.el:
* lisp/eshell/em-term.el, lisp/eshell/esh-arg.el, lisp/eshell/esh-mode.el:
* lisp/eshell/esh-opt.el, lisp/eshell/esh-proc.el:
* lisp/eshell/esh-var.el: Adjust requires.
* lisp/eshell/eshell.el: Do not require esh-util twice.
(eshell-add-input-to-history): Declare.
(eshell-command): Check history module is active before using it.
2013-05-23 04:57:27 +00:00
|
|
|
(require 'esh-mode)
|
2007-12-05 07:03:18 +00:00
|
|
|
(eval-when-compile (require 'eshell))
|
2000-06-23 05:24:10 +00:00
|
|
|
|
2008-05-21 03:51:08 +00:00
|
|
|
;;;###autoload
|
Replace eshell-defgroup with plain defgroup
Borrowing a trick from vc-sccs.el, wrap the defgroup in a progn
so that the whole thing ends up in the generated autoload file,
esh-groups.el.
* em-alias.el, em-banner.el, em-basic.el, em-cmpl.el, em-dirs.el:
* em-glob.el, em-hist.el, em-ls.el, em-pred.el, em-prompt.el:
* em-rebind.el, em-script.el, em-smart.el, em-term.el, em-unix.el:
* em-xtra.el: Replace eshell-defgroup with (progn (defgroup.
* eshell.el (eshell-defgroup): Remove alias.
2012-06-27 07:08:06 +00:00
|
|
|
(progn
|
|
|
|
(defgroup eshell-prompt nil
|
2000-06-23 05:24:10 +00:00
|
|
|
"This module provides command prompts, and navigation between them,
|
|
|
|
as is common with most shells."
|
|
|
|
:tag "Command prompts"
|
Replace eshell-defgroup with plain defgroup
Borrowing a trick from vc-sccs.el, wrap the defgroup in a progn
so that the whole thing ends up in the generated autoload file,
esh-groups.el.
* em-alias.el, em-banner.el, em-basic.el, em-cmpl.el, em-dirs.el:
* em-glob.el, em-hist.el, em-ls.el, em-pred.el, em-prompt.el:
* em-rebind.el, em-script.el, em-smart.el, em-term.el, em-unix.el:
* em-xtra.el: Replace eshell-defgroup with (progn (defgroup.
* eshell.el (eshell-defgroup): Remove alias.
2012-06-27 07:08:06 +00:00
|
|
|
:group 'eshell-module))
|
2000-06-23 05:24:10 +00:00
|
|
|
|
|
|
|
;;; User Variables:
|
|
|
|
|
2011-03-05 04:11:05 +00:00
|
|
|
(defcustom eshell-prompt-load-hook nil
|
Cosmetic doc fixes for eshell.
* eshell/em-alias.el, eshell/em-banner.el, eshell/em-basic.el:
* eshell/em-cmpl.el, eshell/em-dirs.el, eshell/em-glob.el:
* eshell/em-hist.el, eshell/em-ls.el, eshell/em-pred.el:
* eshell/em-prompt.el, eshell/em-rebind.el, eshell/em-script.el:
* eshell/em-smart.el, eshell/em-term.el, eshell/em-unix.el:
* eshell/esh-cmd.el, eshell/esh-ext.el, eshell/esh-io.el:
* eshell/esh-mode.el, eshell/esh-proc.el, eshell/esh-test.el:
* eshell/esh-util.el, eshell/esh-var.el:
Remove leading `*' from docs of faces and defcustoms.
2010-09-25 21:51:55 +00:00
|
|
|
"A list of functions to call when loading `eshell-prompt'."
|
2011-03-05 04:11:05 +00:00
|
|
|
:version "24.1" ; removed eshell-prompt-initialize
|
2000-06-23 05:24:10 +00:00
|
|
|
:type 'hook
|
|
|
|
:group 'eshell-prompt)
|
|
|
|
|
|
|
|
(defcustom eshell-prompt-function
|
|
|
|
(function
|
|
|
|
(lambda ()
|
2009-11-28 17:06:30 +00:00
|
|
|
(concat (abbreviate-file-name (eshell/pwd))
|
2000-06-23 05:24:10 +00:00
|
|
|
(if (= (user-uid) 0) " # " " $ "))))
|
2009-11-28 17:06:30 +00:00
|
|
|
"A function that returns the Eshell prompt string.
|
2000-06-23 05:24:10 +00:00
|
|
|
Make sure to update `eshell-prompt-regexp' so that it will match your
|
|
|
|
prompt."
|
|
|
|
:type 'function
|
|
|
|
:group 'eshell-prompt)
|
|
|
|
|
|
|
|
(defcustom eshell-prompt-regexp "^[^#$\n]* [#$] "
|
Cosmetic doc fixes for eshell.
* eshell/em-alias.el, eshell/em-banner.el, eshell/em-basic.el:
* eshell/em-cmpl.el, eshell/em-dirs.el, eshell/em-glob.el:
* eshell/em-hist.el, eshell/em-ls.el, eshell/em-pred.el:
* eshell/em-prompt.el, eshell/em-rebind.el, eshell/em-script.el:
* eshell/em-smart.el, eshell/em-term.el, eshell/em-unix.el:
* eshell/esh-cmd.el, eshell/esh-ext.el, eshell/esh-io.el:
* eshell/esh-mode.el, eshell/esh-proc.el, eshell/esh-test.el:
* eshell/esh-util.el, eshell/esh-var.el:
Remove leading `*' from docs of faces and defcustoms.
2010-09-25 21:51:55 +00:00
|
|
|
"A regexp which fully matches your eshell prompt.
|
2000-06-23 05:24:10 +00:00
|
|
|
This setting is important, since it affects how eshell will interpret
|
|
|
|
the lines that are passed to it.
|
|
|
|
If this variable is changed, all Eshell buffers must be exited and
|
|
|
|
re-entered for it to take effect."
|
|
|
|
:type 'regexp
|
|
|
|
:group 'eshell-prompt)
|
|
|
|
|
|
|
|
(defcustom eshell-highlight-prompt t
|
Cosmetic doc fixes for eshell.
* eshell/em-alias.el, eshell/em-banner.el, eshell/em-basic.el:
* eshell/em-cmpl.el, eshell/em-dirs.el, eshell/em-glob.el:
* eshell/em-hist.el, eshell/em-ls.el, eshell/em-pred.el:
* eshell/em-prompt.el, eshell/em-rebind.el, eshell/em-script.el:
* eshell/em-smart.el, eshell/em-term.el, eshell/em-unix.el:
* eshell/esh-cmd.el, eshell/esh-ext.el, eshell/esh-io.el:
* eshell/esh-mode.el, eshell/esh-proc.el, eshell/esh-test.el:
* eshell/esh-util.el, eshell/esh-var.el:
Remove leading `*' from docs of faces and defcustoms.
2010-09-25 21:51:55 +00:00
|
|
|
"If non-nil, Eshell should highlight the prompt."
|
2000-06-23 05:24:10 +00:00
|
|
|
:type 'boolean
|
|
|
|
:group 'eshell-prompt)
|
|
|
|
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-431
Remove "-face" suffix from eshell faces
2005-06-17 Miles Bader <miles@gnu.org>
* lisp/eshell/esh-test.el (eshell-test-ok, eshell-test-failed):
Remove "-face" suffix from face names.
(eshell-test-ok-face, eshell-test-failed-face):
New backward-compatibility aliases for renamed faces.
(eshell-run-test): Use renamed eshell-test faces.
* lisp/eshell/em-prompt.el (eshell-prompt):
Remove "-face" suffix from face name.
(eshell-prompt-face): New backward-compatibility alias for renamed face.
(eshell-emit-prompt): Use renamed eshell-prompt face.
* lisp/eshell/em-ls.el (eshell-ls-directory, eshell-ls-symlink)
(eshell-ls-executable, eshell-ls-readonly, eshell-ls-unreadable)
(eshell-ls-special, eshell-ls-missing, eshell-ls-archive)
(eshell-ls-backup, eshell-ls-product, eshell-ls-clutter):
Remove "-face" suffix from face names.
(eshell-ls-directory-face, eshell-ls-symlink-face)
(eshell-ls-executable-face, eshell-ls-readonly-face)
(eshell-ls-unreadable-face, eshell-ls-special-face)
(eshell-ls-missing-face, eshell-ls-archive-face)
(eshell-ls-backup-face, eshell-ls-product-face)
(eshell-ls-clutter-face):
New backward-compatibility aliases for renamed faces.
(eshell-ls-decorated-name): Use renamed eshell-ls faces.
2005-06-17 05:27:55 +00:00
|
|
|
(defface eshell-prompt
|
Face cleanups. Remove some uses of old-style face spec and :bold/:italic.
* faces.el (set-face-attribute): Doc fix.
(modify-face): Don't use :bold and :italic.
(error, warning, success): Tweak definitions.
* cus-edit.el (custom-modified, custom-invalid, custom-rogue)
(custom-modified, custom-set, custom-changed, custom-themed)
(custom-saved, custom-button, custom-button-mouse)
(custom-button-pressed, custom-state, custom-comment-tag)
(custom-variable-tag, custom-group-tag-1, custom-group-tag)
(custom-group-subtitle): Use new-style face specs.
(custom-invalid-face, custom-rogue-face, custom-modified-face)
(custom-set-face, custom-changed-face, custom-saved-face)
(custom-button-face, custom-button-pressed-face)
(custom-documentation-face, custom-state-face)
(custom-comment-face, custom-comment-tag-face)
(custom-variable-tag-face, custom-variable-button-face)
(custom-face-tag-face, custom-group-tag-face-1)
(custom-group-tag-face): Remove obsolete face alias.
* epa.el (epa-validity-high, epa-validity-medium)
(epa-validity-low, epa-mark, epa-field-name, epa-string)
(epa-field-name, epa-field-body):
* font-lock.el (font-lock-comment-face, font-lock-string-face)
(font-lock-keyword-face, font-lock-builtin-face)
(font-lock-function-name-face, font-lock-variable-name-face)
(font-lock-type-face, font-lock-constant-face):
* ido.el (ido-first-match, ido-only-match, ido-subdir)
(ido-virtual, ido-indicator, ido-incomplete-regexp):
* speedbar.el (speedbar-button-face, speedbar-file-face)
(speedbar-directory-face, speedbar-tag-face)
(speedbar-selected-face, speedbar-highlight-face)
(speedbar-separator-face):
* whitespace.el (whitespace-newline, whitespace-space)
(whitespace-hspace, whitespace-tab, whitespace-trailing)
(whitespace-line, whitespace-space-before-tab)
(whitespace-space-after-tab, whitespace-indentation)
(whitespace-empty):
* emulation/cua-base.el (cua-global-mark):
* eshell/em-prompt.el (eshell-prompt):
* net/newst-plainview.el (newsticker-new-item-face)
(newsticker-old-item-face, newsticker-immortal-item-face)
(newsticker-obsolete-item-face, newsticker-date-face)
(newsticker-statistics-face, newsticker-default-face):
* net/newst-reader.el (newsticker-feed-face)
(newsticker-extra-face, newsticker-enclosure-face):
* net/newst-treeview.el (newsticker-treeview-face)
(newsticker-treeview-new-face, newsticker-treeview-old-face)
(newsticker-treeview-immortal-face)
(newsticker-treeview-obsolete-face)
(newsticker-treeview-selection-face):
* net/rcirc.el (rcirc-my-nick, rcirc-other-nick)
(rcirc-bright-nick, rcirc-server, rcirc-timestamp)
(rcirc-nick-in-message, rcirc-nick-in-message-full-line)
(rcirc-prompt, rcirc-track-keyword, rcirc-url, rcirc-keyword):
* nxml/nxml-outln.el (nxml-heading, nxml-outline-indicator)
(nxml-outline-active-indicator, nxml-outline-ellipsis):
* play/mpuz.el (mpuz-unsolved, mpuz-solved, mpuz-trivial)
(mpuz-text):
* progmodes/vera-mode.el (vera-font-lock-number)
(vera-font-lock-function, vera-font-lock-interface):
* textmodes/table.el (table-cell): Use new-style face specs, and
don't use the old :bold and :italic attributes.
* erc-button.el (erc-button):
* erc-goodies.el (erc-bold-face, erc-inverse-face)
(erc-underline-face, fg:erc-color-*):
* erc-match.el (erc-current-nick-face, erc-dangerous-host-face)
(erc-pal-face, erc-fool-face, erc-keyword-face):
* erc-stamp.el (erc-timestamp-face): Likewise.
* erc.el (erc-direct-msg-face, erc-header-line, erc-input-face)
(erc-command-indicator-face, erc-notice-face, erc-action-face)
(erc-error-face, erc-my-nick-face, erc-nick-default-face)
(erc-nick-msg-face): Use new-style face specs, and avoid :bold.
* progmodes/ebrowse.el (ebrowse-tree-mark, ebrowse-root-class)
(ebrowse-member-attribute, ebrowse-default, ebrowse-file-name)
(ebrowse-member-class, ebrowse-progress): Likewise.
(ebrowse-tree-mark-face, ebrowse-root-class-face)
(ebrowse-file-name-face, ebrowse-default-face)
(ebrowse-member-attribute-face, ebrowse-member-class-face)
(ebrowse-progress-face): Remove obsolete faces.
* progmodes/flymake.el (flymake-errline, flymake-warnline):
Inherit from error and warning faces respectively.
* textmodes/flyspell.el (flyspell-incorrect, flyspell-duplicate):
Likewise.
(flyspell-incorrect-face, flyspell-duplicate-face): Remove
obsolete aliases.
* display.texi (Face Attributes): Font family does not accept
wildcards. De-document obsolete :bold and :italic attributes.
(Defining Faces): Use new-style face spec format.
2012-06-08 16:39:49 +00:00
|
|
|
'((default :weight bold)
|
|
|
|
(((class color) (background light)) :foreground "Red")
|
|
|
|
(((class color) (background dark)) :foreground "Pink"))
|
Cosmetic doc fixes for eshell.
* eshell/em-alias.el, eshell/em-banner.el, eshell/em-basic.el:
* eshell/em-cmpl.el, eshell/em-dirs.el, eshell/em-glob.el:
* eshell/em-hist.el, eshell/em-ls.el, eshell/em-pred.el:
* eshell/em-prompt.el, eshell/em-rebind.el, eshell/em-script.el:
* eshell/em-smart.el, eshell/em-term.el, eshell/em-unix.el:
* eshell/esh-cmd.el, eshell/esh-ext.el, eshell/esh-io.el:
* eshell/esh-mode.el, eshell/esh-proc.el, eshell/esh-test.el:
* eshell/esh-util.el, eshell/esh-var.el:
Remove leading `*' from docs of faces and defcustoms.
2010-09-25 21:51:55 +00:00
|
|
|
"The face used to highlight prompt strings.
|
2000-06-23 05:24:10 +00:00
|
|
|
For highlighting other kinds of strings -- similar to shell mode's
|
|
|
|
behavior -- simply use an output filer which changes text properties."
|
|
|
|
:group 'eshell-prompt)
|
2009-09-01 16:17:53 +00:00
|
|
|
(define-obsolete-face-alias 'eshell-prompt-face 'eshell-prompt "22.1")
|
2000-06-23 05:24:10 +00:00
|
|
|
|
|
|
|
(defcustom eshell-before-prompt-hook nil
|
Cosmetic doc fixes for eshell.
* eshell/em-alias.el, eshell/em-banner.el, eshell/em-basic.el:
* eshell/em-cmpl.el, eshell/em-dirs.el, eshell/em-glob.el:
* eshell/em-hist.el, eshell/em-ls.el, eshell/em-pred.el:
* eshell/em-prompt.el, eshell/em-rebind.el, eshell/em-script.el:
* eshell/em-smart.el, eshell/em-term.el, eshell/em-unix.el:
* eshell/esh-cmd.el, eshell/esh-ext.el, eshell/esh-io.el:
* eshell/esh-mode.el, eshell/esh-proc.el, eshell/esh-test.el:
* eshell/esh-util.el, eshell/esh-var.el:
Remove leading `*' from docs of faces and defcustoms.
2010-09-25 21:51:55 +00:00
|
|
|
"A list of functions to call before outputting the prompt."
|
2000-06-23 05:24:10 +00:00
|
|
|
:type 'hook
|
|
|
|
:options '(eshell-begin-on-new-line)
|
|
|
|
:group 'eshell-prompt)
|
|
|
|
|
|
|
|
(defcustom eshell-after-prompt-hook nil
|
Cosmetic doc fixes for eshell.
* eshell/em-alias.el, eshell/em-banner.el, eshell/em-basic.el:
* eshell/em-cmpl.el, eshell/em-dirs.el, eshell/em-glob.el:
* eshell/em-hist.el, eshell/em-ls.el, eshell/em-pred.el:
* eshell/em-prompt.el, eshell/em-rebind.el, eshell/em-script.el:
* eshell/em-smart.el, eshell/em-term.el, eshell/em-unix.el:
* eshell/esh-cmd.el, eshell/esh-ext.el, eshell/esh-io.el:
* eshell/esh-mode.el, eshell/esh-proc.el, eshell/esh-test.el:
* eshell/esh-util.el, eshell/esh-var.el:
Remove leading `*' from docs of faces and defcustoms.
2010-09-25 21:51:55 +00:00
|
|
|
"A list of functions to call after outputting the prompt.
|
2000-06-23 05:24:10 +00:00
|
|
|
Note that if `eshell-scroll-show-maximum-output' is non-nil, then
|
|
|
|
setting `eshell-show-maximum-output' here won't do much. It depends
|
|
|
|
on whether the user wants the resizing to happen while output is
|
|
|
|
arriving, or after."
|
|
|
|
:type 'hook
|
|
|
|
:options '(eshell-show-maximum-output)
|
|
|
|
:group 'eshell-prompt)
|
|
|
|
|
|
|
|
;;; Functions:
|
|
|
|
|
|
|
|
(defun eshell-prompt-initialize ()
|
|
|
|
"Initialize the prompting code."
|
|
|
|
(unless eshell-non-interactive-p
|
|
|
|
(add-hook 'eshell-post-command-hook 'eshell-emit-prompt nil t)
|
|
|
|
|
|
|
|
(make-local-variable 'eshell-prompt-regexp)
|
|
|
|
(if eshell-prompt-regexp
|
|
|
|
(set (make-local-variable 'paragraph-start) eshell-prompt-regexp))
|
|
|
|
|
|
|
|
(set (make-local-variable 'eshell-skip-prompt-function)
|
|
|
|
'eshell-skip-prompt)
|
|
|
|
|
|
|
|
(define-key eshell-command-map [(control ?n)] 'eshell-next-prompt)
|
|
|
|
(define-key eshell-command-map [(control ?p)] 'eshell-previous-prompt)))
|
|
|
|
|
|
|
|
(defun eshell-emit-prompt ()
|
|
|
|
"Emit a prompt if eshell is being used interactively."
|
|
|
|
(run-hooks 'eshell-before-prompt-hook)
|
|
|
|
(if (not eshell-prompt-function)
|
|
|
|
(set-marker eshell-last-output-end (point))
|
|
|
|
(let ((prompt (funcall eshell-prompt-function)))
|
|
|
|
(and eshell-highlight-prompt
|
|
|
|
(add-text-properties 0 (length prompt)
|
|
|
|
'(read-only t
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-431
Remove "-face" suffix from eshell faces
2005-06-17 Miles Bader <miles@gnu.org>
* lisp/eshell/esh-test.el (eshell-test-ok, eshell-test-failed):
Remove "-face" suffix from face names.
(eshell-test-ok-face, eshell-test-failed-face):
New backward-compatibility aliases for renamed faces.
(eshell-run-test): Use renamed eshell-test faces.
* lisp/eshell/em-prompt.el (eshell-prompt):
Remove "-face" suffix from face name.
(eshell-prompt-face): New backward-compatibility alias for renamed face.
(eshell-emit-prompt): Use renamed eshell-prompt face.
* lisp/eshell/em-ls.el (eshell-ls-directory, eshell-ls-symlink)
(eshell-ls-executable, eshell-ls-readonly, eshell-ls-unreadable)
(eshell-ls-special, eshell-ls-missing, eshell-ls-archive)
(eshell-ls-backup, eshell-ls-product, eshell-ls-clutter):
Remove "-face" suffix from face names.
(eshell-ls-directory-face, eshell-ls-symlink-face)
(eshell-ls-executable-face, eshell-ls-readonly-face)
(eshell-ls-unreadable-face, eshell-ls-special-face)
(eshell-ls-missing-face, eshell-ls-archive-face)
(eshell-ls-backup-face, eshell-ls-product-face)
(eshell-ls-clutter-face):
New backward-compatibility aliases for renamed faces.
(eshell-ls-decorated-name): Use renamed eshell-ls faces.
2005-06-17 05:27:55 +00:00
|
|
|
face eshell-prompt
|
2013-03-26 00:42:08 +00:00
|
|
|
front-sticky (face read-only)
|
2000-06-23 05:24:10 +00:00
|
|
|
rear-nonsticky (face read-only))
|
|
|
|
prompt))
|
|
|
|
(eshell-interactive-print prompt)))
|
|
|
|
(run-hooks 'eshell-after-prompt-hook))
|
|
|
|
|
|
|
|
(defun eshell-backward-matching-input (regexp arg)
|
|
|
|
"Search backward through buffer for match for REGEXP.
|
|
|
|
Matches are searched for on lines that match `eshell-prompt-regexp'.
|
|
|
|
With prefix argument N, search for Nth previous match.
|
|
|
|
If N is negative, find the next or Nth next match."
|
|
|
|
(interactive (eshell-regexp-arg "Backward input matching (regexp): "))
|
|
|
|
(let* ((re (concat eshell-prompt-regexp ".*" regexp))
|
|
|
|
(pos (save-excursion (end-of-line (if (> arg 0) 0 1))
|
|
|
|
(if (re-search-backward re nil t arg)
|
|
|
|
(point)))))
|
|
|
|
(if (null pos)
|
|
|
|
(progn (message "Not found")
|
|
|
|
(ding))
|
|
|
|
(goto-char pos)
|
|
|
|
(eshell-bol))))
|
|
|
|
|
|
|
|
(defun eshell-forward-matching-input (regexp arg)
|
|
|
|
"Search forward through buffer for match for REGEXP.
|
|
|
|
Matches are searched for on lines that match `eshell-prompt-regexp'.
|
|
|
|
With prefix argument N, search for Nth following match.
|
|
|
|
If N is negative, find the previous or Nth previous match."
|
|
|
|
(interactive (eshell-regexp-arg "Forward input matching (regexp): "))
|
|
|
|
(eshell-backward-matching-input regexp (- arg)))
|
|
|
|
|
|
|
|
(defun eshell-next-prompt (n)
|
|
|
|
"Move to end of Nth next prompt in the buffer.
|
|
|
|
See `eshell-prompt-regexp'."
|
|
|
|
(interactive "p")
|
|
|
|
(forward-paragraph n)
|
|
|
|
(eshell-skip-prompt))
|
|
|
|
|
|
|
|
(defun eshell-previous-prompt (n)
|
|
|
|
"Move to end of Nth previous prompt in the buffer.
|
|
|
|
See `eshell-prompt-regexp'."
|
|
|
|
(interactive "p")
|
|
|
|
(eshell-next-prompt (- (1+ n))))
|
|
|
|
|
|
|
|
(defun eshell-skip-prompt ()
|
|
|
|
"Skip past the text matching regexp `eshell-prompt-regexp'.
|
|
|
|
If this takes us past the end of the current line, don't skip at all."
|
|
|
|
(let ((eol (line-end-position)))
|
|
|
|
(if (and (looking-at eshell-prompt-regexp)
|
|
|
|
(<= (match-end 0) eol))
|
|
|
|
(goto-char (match-end 0)))))
|
|
|
|
|
2007-12-05 07:03:18 +00:00
|
|
|
(provide 'em-prompt)
|
2000-06-23 05:24:10 +00:00
|
|
|
|
2008-05-21 03:51:08 +00:00
|
|
|
;; Local Variables:
|
|
|
|
;; generated-autoload-file: "esh-groups.el"
|
|
|
|
;; End:
|
|
|
|
|
2000-06-23 05:24:10 +00:00
|
|
|
;;; em-prompt.el ends here
|