[Emacs-diffs] /srv/bzr/emacs/trunk r106791: eshell fix for change in return value of `diff' command (bug#10420)

[Glenn Morris]

------------------------------------------------------------
revno: 106791
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2012-01-05 18:36:41 -0500
message:
  eshell fix for change in return value of `diff' command (bug#10420)
  
  * lisp/eshell/em-unix.el (diff-no-select): Autoload it.
  (eshell/diff): Use diff-no-select.
modified:
  lisp/ChangeLog
  lisp/eshell/em-unix.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-01-05 14:51:05 +0000
+++ b/lisp/ChangeLog    2012-01-05 23:36:41 +0000
@@ -1,3 +1,8 @@
+2012-01-05  Glenn Morris  <address@hidden>
+
+       * eshell/em-unix.el (diff-no-select): Autoload it.
+       (eshell/diff): Use diff-no-select.  (Bug#10420)
+
 2012-01-05  Chong Yidong  <address@hidden>
 
        * shell.el (shell-dynamic-complete-functions): Revert last change.

=== modified file 'lisp/eshell/em-unix.el'
--- a/lisp/eshell/em-unix.el    2012-01-05 09:46:05 +0000
+++ b/lisp/eshell/em-unix.el    2012-01-05 23:36:41 +0000
@@ -965,6 +965,8 @@
     ((string-match "[^[:blank:]]" string) string)
     (nil)))
 
+(autoload 'diff-no-select "diff")
+
 (defun eshell/diff (&rest args)
   "Alias \"diff\" to call Emacs `diff' function."
   (let ((orig-args (eshell-stringify-list (eshell-flatten-list args))))
@@ -986,8 +988,9 @@
          (setcdr (last args 3) nil))
        (with-current-buffer
            (condition-case err
-               (diff old new
-                     (nil-blank-string (eshell-flatten-and-stringify args)))
+               (diff-no-select
+                old new
+                (nil-blank-string (eshell-flatten-and-stringify args)))
              (error
               (throw 'eshell-replace-command
                      (eshell-parse-command "*diff" orig-args))))