[debbugs-tracker] bug#10420: closed (24.0.92; eshell diff fails with wrong argument error)

[GNU bug Tracking System]

Your message dated Thu, 05 Jan 2012 18:36:52 -0500
with message-id <address@hidden>
and subject line Re: bug#10420: 24.0.92; eshell diff fails with wrong argument 
error
has caused the debbugs.gnu.org bug report #10420,
regarding 24.0.92; eshell diff fails with wrong argument error
to be marked as done.

(If you believe you have received this mail in error, please contact
address@hidden)


-- 
10420: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=10420
GNU Bug Tracking System
Contact address@hidden with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> 24.0.92; eshell diff fails with wrong argument error
>
>
>
>
> Date: 
>
> Sun, 01 Jan 2012 21:49:42 +0100
>
>
>
>
> User-agent: 
>
> Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka)	FLIM/1.14.9 (Gojō) APEL/10.8 Emacs/23.3	(i686-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO)
>
>
>
>
> 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
>
> # Bazaar merge directive format 2 (Bazaar 0.90)
> # revision_id: address@hidden
> # 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: address@hidden
> #   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  <address@hidden>
> +
> +       * eshell/em-unix.el (eshell/diff): Call current-buffer with a
> +       buffer instead of a window.
> +
>  2011-12-02  Stefan Monnier  <address@hidden>
>  
>         * 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=
>
>
> --- End Message ---
> --- Begin Message ---
>
>
>
> Subject: 
>
> Re: bug#10420: 24.0.92; eshell diff fails with wrong argument error
>
>
>
>
> Date: 
>
> Thu, 05 Jan 2012 18:36:52 -0500
>
>
>
>
> User-agent: 
>
> Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/)
>
>
>
>
> 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.
>
>
> --- End Message ---