From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: claudio.bley@gmail.com (Claudio Bley) Newsgroups: gmane.emacs.bugs Subject: bug#10420: 24.0.92; eshell diff fails with wrong argument error Date: Sun, 01 Jan 2012 21:49:42 +0100 Message-ID: <87pqf3jggp.wl%claudio.bley@gmail.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: multipart/mixed; boundary="Multipart_Sun_Jan__1_21:49:42_2012-1" X-Trace: dough.gmane.org 1325451062 21203 80.91.229.12 (1 Jan 2012 20:51:02 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sun, 1 Jan 2012 20:51:02 +0000 (UTC) To: 10420@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Jan 01 21:50:58 2012 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([140.186.70.17]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1RhSMr-0001xW-JD for geb-bug-gnu-emacs@m.gmane.org; Sun, 01 Jan 2012 21:50:57 +0100 Original-Received: from localhost ([::1]:38287 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RhSMr-0006Yv-5R for geb-bug-gnu-emacs@m.gmane.org; Sun, 01 Jan 2012 15:50:57 -0500 Original-Received: from eggs.gnu.org ([140.186.70.92]:57856) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RhSMo-0006XQ-Ef for bug-gnu-emacs@gnu.org; Sun, 01 Jan 2012 15:50:55 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RhSMn-0000Ca-FE for bug-gnu-emacs@gnu.org; Sun, 01 Jan 2012 15:50:54 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:32787) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RhSMn-0000CU-Ah for bug-gnu-emacs@gnu.org; Sun, 01 Jan 2012 15:50:53 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1RhSPq-0004gX-01 for bug-gnu-emacs@gnu.org; Sun, 01 Jan 2012 15:54:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: claudio.bley@gmail.com (Claudio Bley) Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 01 Jan 2012 20:54:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 10420 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.132545120217957 (code B ref -1); Sun, 01 Jan 2012 20:54:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 1 Jan 2012 20:53:22 +0000 Original-Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1RhSPC-0004fZ-2x for submit@debbugs.gnu.org; Sun, 01 Jan 2012 15:53:22 -0500 Original-Received: from eggs.gnu.org ([140.186.70.92]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1RhSP8-0004fR-0P for submit@debbugs.gnu.org; Sun, 01 Jan 2012 15:53:20 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RhSM3-00008o-RK for submit@debbugs.gnu.org; Sun, 01 Jan 2012 15:50:08 -0500 Original-Received: from lists.gnu.org ([140.186.70.17]:41569) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RhSM3-00008j-Pj for submit@debbugs.gnu.org; Sun, 01 Jan 2012 15:50:07 -0500 Original-Received: from eggs.gnu.org ([140.186.70.92]:57796) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RhSM2-0006UE-Lj for bug-gnu-emacs@gnu.org; Sun, 01 Jan 2012 15:50:07 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RhSM1-00006D-4X for bug-gnu-emacs@gnu.org; Sun, 01 Jan 2012 15:50:06 -0500 Original-Received: from lo.gmane.org ([80.91.229.12]:33395) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RhSM0-0008WH-Gh for bug-gnu-emacs@gnu.org; Sun, 01 Jan 2012 15:50:05 -0500 Original-Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1RhSLx-0001D3-Et for bug-gnu-emacs@gnu.org; Sun, 01 Jan 2012 21:50:01 +0100 Original-Received: from dslb-094-222-233-031.pools.arcor-ip.net ([94.222.233.31]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 01 Jan 2012 21:50:01 +0100 Original-Received: from claudio.bley by dslb-094-222-233-031.pools.arcor-ip.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 01 Jan 2012 21:50:01 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 85 Original-X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: dslb-094-222-233-031.pools.arcor-ip.net User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?Q?Goj=C5=8D?=) APEL/10.8 Emacs/23.3 (i686-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Resent-Date: Sun, 01 Jan 2012 15:54:02 -0500 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:55347 Archived-At: --Multipart_Sun_Jan__1_21:49:42_2012-1 Content-Type: text/plain; charset=US-ASCII Hi. In eshell, when running the command "diff file.a file.b" I receive this error: Wrong type argument: stringp, # In GNU Emacs 24.0.92.1 (i386-mingw-nt5.1.2600) of 2011-12-03 Patch attached. - Claudio --Multipart_Sun_Jan__1_21:49:42_2012-1 Content-Type: text/x-diff; charset=US-ASCII Content-Disposition: inline; filename="eshell_diff_fix.txt" # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: claudio.bley@gmail.com-20111203184034-09g7itlp06tksy39 # target_branch: bzr://bzr.savannah.gnu.org/emacs/trunk/ # testament_sha1: c3e23109d6c57da00830630531016f379e33183d # timestamp: 2011-12-04 19:55:23 +0100 # source_branch: bzr://bzr.savannah.gnu.org/emacs/trunk/ # base_revision_id: monnier@iro.umontreal.ca-20111202144419-\ # njb1hlpc0wzlb1jv # # Begin patch === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-12-02 14:44:19 +0000 +++ lisp/ChangeLog 2011-12-03 18:40:34 +0000 @@ -1,3 +1,8 @@ +2011-12-03 Claudio Bley + + * eshell/em-unix.el (eshell/diff): Call current-buffer with a + buffer instead of a window. + 2011-12-02 Stefan Monnier * pcmpl-gnu.el (pcomplete/tar): large-file-warn-threshold can be nil === modified file 'lisp/eshell/em-unix.el' --- lisp/eshell/em-unix.el 2011-03-05 04:11:05 +0000 +++ lisp/eshell/em-unix.el 2011-12-03 18:40:34 +0000 @@ -986,8 +986,9 @@ (setcdr (last args 3) nil)) (with-current-buffer (condition-case err - (diff old new - (nil-blank-string (eshell-flatten-and-stringify args))) + (window-buffer + (diff old new + (nil-blank-string (eshell-flatten-and-stringify args)))) (error (throw 'eshell-replace-command (eshell-parse-command "*diff" orig-args)))) # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQxvoaQAAkDfgEgwUHP/91sE AAC////wUAS72Nq6g25QmpTsElCEU80NqMRM0waIaUHlA2pphKJoTJqemQknlNqejQIGIyGjTBJC mESngmp5hU/SnpihkAZqaAMNDQAAAaAAAAAEkggGiNMjRT2pGh6T9JqPSZNPUPUpKSkmP322x1z1 llkK7y4ZcGxrlbopgsDupNI1YzpdK5uEzoYLD/Vu6fkso3nM1smG9vRdoTprbx0Xs57K67I+Y7ye SPzM812QIxv6zflxQNWhzkFNY4+OXK6mbPFw33FTO6YxI4I6WQvYeqCKSZ4F3+Q82r03eHoCOnHN 3uGubCkRZbbRKtFDOW7ERrErEPcG81v2XmdEVtuZBGL5C8GEoYPo7gawK4wKyOGYGjcK0C1E6tnO xNBfQLVWxc0OWji8q5vKiWwcCqFAQcCnG3bIFSmvf3NsbyoLY7nObK4sLwqr9PfEpfO8Cq53Fm0R SWq0jvyYCojULoyE4E8WIb3V46rp0VLFpThi1GGVQKDgIMAvPS0dxWHyRJiwllY0gWWoHgUIfARx ebMnEAiJwTA17FOYw5V2pXEzezokRsGYc0xo134mO44zNhWwNEsXKX9ROQmD9hK1JbMMHlThfKRS aaXloCpA2ERXurggSZSdaaFB+2FxgkNlEIESpE1E+gHLhtzwUBxq5auJ6nKplCyprjMM1eIKYm0R ++1LSNEvMy5syhRKlyMrFyFwOP2NKPipdrMNnisIuRIOBpXPJVRSrajkvHFXbOozw68O/8D8xDdA mXDDM3vYFDZxZixpDI8/J4TBwB4qKMPBd/lprkpa0PEODt/R4+S2ZXdJUpyVRIWWOK+AiDPgVsIY jD2IsWYj8hHNv42tP+KApaAZqNVR1GtOrrX7A+9dvbHJ7x6Yx7FAh02JbweVecDHlLEmDiRB0+Ey OK27dmr33L2VIKVYafG4Uk4aqvF8g4pjKjI6EncyY3RpGIiMpgjOJ9eY4V/HnXmNQsJ2eOMESad7 Ge7R6W4rJpmtnpoRMmA9F/CSsIYWO03qJSmlFP0RzBRXGsOJZkXixgVdTOoCYjclijqYE52naqzM 42qmAGkGQyf/Ehjec/w3xF1cWPS6BqROaUlevuhnBHklo/UI3CiY/dHupWEDlvvjIFejaHNHlWZg fD+7kVJuHbEMobi+SOAHsKjMxyfIHEOiArQ5wePw8CwR0DxpF7E4jpYqkuH1cXAdQurAsTHV2EdF aV5ajKsBYEnVSbSR0JFgEQ48J/dgHW1EBJ5hyFQtQQDuGl1gwLUFom9R31DskiZGU14DFLYI9Xr0 eruSzkBTLcwwPCFzpbvngLro4UGMGQOjj22BuJpXcdqrFhbzqSV4PnZt0bSpWjLPKL5ac2WghLSh yYbosN5NFBvEDN4Kp/QoqmJqHPQwvpQ7wIATQoiKLWLgojViKGqILJHHHMK1mWS3HUXEJLIWC8bw uE2sXqGAp0r7VaA8RsyaZYhD/i7kinChIBjfQ0g= --Multipart_Sun_Jan__1_21:49:42_2012-1--