From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Wang Diancheng Newsgroups: gmane.emacs.devel Subject: [PATCH] eshell show nil when cd a non-absolute direcory Date: Mon, 22 Jun 2009 13:59:45 +0800 Message-ID: <871vpcbyge.fsf@redflag-linux.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: ger.gmane.org 1245651861 30265 80.91.229.12 (22 Jun 2009 06:24:21 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 22 Jun 2009 06:24:21 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jun 22 08:24:19 2009 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1MIcx0-0001ES-Pb for ged-emacs-devel@m.gmane.org; Mon, 22 Jun 2009 08:24:19 +0200 Original-Received: from localhost ([127.0.0.1]:37779 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MIcwz-0003LY-NX for ged-emacs-devel@m.gmane.org; Mon, 22 Jun 2009 02:24:17 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MIcZJ-0003O0-SD for emacs-devel@gnu.org; Mon, 22 Jun 2009 01:59:49 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MIcZE-0003Jp-O2 for emacs-devel@gnu.org; Mon, 22 Jun 2009 01:59:48 -0400 Original-Received: from [199.232.76.173] (port=47256 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MIcZE-0003Jg-Fn for emacs-devel@gnu.org; Mon, 22 Jun 2009 01:59:44 -0400 Original-Received: from mail-yx0-f201.google.com ([209.85.210.201]:38987) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MIcZE-0003fP-3A for emacs-devel@gnu.org; Mon, 22 Jun 2009 01:59:44 -0400 Original-Received: by mail-yx0-f201.google.com with SMTP id 39so2606843yxe.14 for ; Sun, 21 Jun 2009 22:59:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:subject:date :message-id:user-agent:mime-version:content-type; bh=0qtSNNc9+pFqCGps5JnmJEv0NIMx2Qhg5i5ZpTz0yBA=; b=Vj1HTdQq/PTGey0B0hgkHSugwmCRb0jSTux6i/IncfO7aApQ7iRIOAW0a8c46dReYq 32WiJTi8tugbgzlP1Jx69Gl3afjHVqOnd6i4H0Axl5uaFwyxIu19eRpOK4ns9s3Bg0E+ Tum/ItHqcU7W6shi0wP0rGMB5w+lPezrNoMw0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:subject:date:message-id:user-agent:mime-version :content-type; b=K8phRT+hKVx10ZGNnPnG0fv96ApV32XX94tglpnP2ppFuc2qc/AzKXfU9gnhPoTOw3 Fa+Uw/irz+V5qBRb1iRv92Z2SQ8KQ1c6b3GDtfDWferGxfO9rrvtqFw4E4UowewcZMxI FIdlp0OmyI6ykxiZHDVUBxIYYl9ySlPgl7ZKQ= Original-Received: by 10.151.123.4 with SMTP id a4mr10601557ybn.38.1245650383382; Sun, 21 Jun 2009 22:59:43 -0700 (PDT) Original-Received: from localhost ([124.16.138.52]) by mx.google.com with ESMTPS id 6sm32027ywi.45.2009.06.21.22.59.39 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 21 Jun 2009 22:59:42 -0700 (PDT) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.94 (gnu/linux) X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. X-Mailman-Approved-At: Mon, 22 Jun 2009 02:24:12 -0400 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:111623 Archived-At: --=-=-= (setq eshell-cd-shows-directory t) when change to a non-absolute directory(eg. cd ..), eshell will show "nil", not the directory name, following patch fixed it. --=-=-= Content-Type: text/x-patch Content-Disposition: inline diff -u -r1.29 em-dirs.el --- em-dirs.el 5 Jan 2009 03:21:43 -0000 1.29 +++ em-dirs.el 22 Jun 2009 05:47:11 -0000 @@ -393,7 +393,7 @@ (eshell-add-to-dir-ring curdir)) (let ((result (cd dired-directory))) (and eshell-cd-shows-directory - (eshell-printn result))) + (eshell-printn (eshell/pwd)))) (run-hooks 'eshell-directory-change-hook) (if eshell-list-files-after-cd (throw 'eshell-replace-command --=-=-=--