bug#10420: 24.0.92; eshell diff fails with wrong argument error

bug#10420: 24.0.92; eshell diff fails with wrong argument error

[Claudio Bley]

[-- Attachment #1: Type: text/plain, Size: 228 bytes --]

Hi.

In eshell, when running the command "diff file.a file.b" I receive this
error:

Wrong type argument: stringp, #<window 46 on *Diff*>

In GNU Emacs 24.0.92.1 (i386-mingw-nt5.1.2600) of 2011-12-03

Patch attached.

- Claudio

[-- Attachment #2: eshell_diff_fix.txt --]
[-- Type: text/x-diff, Size: 2992 bytes --]

# 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  <claudio.bley@gmail.com>
+
+	* eshell/em-unix.el (eshell/diff): Call current-buffer with a
+	buffer instead of a window.
+
 2011-12-02  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* 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=

bug#10420: 24.0.92; eshell diff fails with wrong argument error

[Glenn Morris]

Version: 24.0.93

Claudio Bley wrote:

> In eshell, when running the command "diff file.a file.b" I receive this
> error:
>
> Wrong type argument: stringp, #<window 46 on *Diff*>

Thanks; I installed a different fix.