Mercurial > emacs
diff lisp/shell.el @ 111573:e89dd9c3633b
merge trunk
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Mon, 08 Nov 2010 14:19:54 +0900 |
| parents | 249a1455856a |
| children | adbfcf85c8eb |
line wrap: on
line diff
--- a/lisp/shell.el Mon Nov 08 14:19:24 2010 +0900 +++ b/lisp/shell.el Mon Nov 08 14:19:54 2010 +0900 @@ -1,7 +1,8 @@ ;;; shell.el --- specialized comint.el for running the shell -;; Copyright (C) 1988, 1993, 1994, 1995, 1996, 1997, 2000, 2001, -;; 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 1988, 1993, 1994, 1995, 1996, 1997, 2000, 2001, 2002, +;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +;; Free Software Foundation, Inc. ;; Author: Olin Shivers <shivers@cs.cmu.edu> ;; Simon Marshall <simon@gnu.org> @@ -700,7 +701,7 @@ (defun shell-process-popd (arg) (let ((num (or (shell-extract-num arg) 0))) (cond ((and num (= num 0) shell-dirstack) - (shell-cd (car shell-dirstack)) + (shell-cd (shell-prefixed-directory-name (car shell-dirstack))) (setq shell-dirstack (cdr shell-dirstack)) (shell-dirstack-message)) ((and num (> num 0) (<= num (length shell-dirstack))) @@ -928,7 +929,7 @@ "Move forward across ARG shell command(s). Does not cross lines. See `shell-command-regexp'." (interactive "p") - (let ((limit (save-excursion (end-of-line nil) (point)))) + (let ((limit (line-end-position))) (if (re-search-forward (concat shell-command-regexp "\\([;&|][\t ]*\\)+") limit 'move arg) (skip-syntax-backward " ")))) @@ -1111,5 +1112,4 @@ (provide 'shell) -;; arch-tag: bcb5f12a-c1f4-4aea-a809-2504bd5bd797 ;;; shell.el ends here