Mercurial > emacs

comparison lisp/eshell/em-unix.el @ 37441:565e55bc8630

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(eshell/diff): Fixed problems that were occurring with Emacs 21's diff.el/compile.el interaction layer.
author John Wiegley <johnw@newartisans.com>
date Tue, 24 Apr 2001 06:31:46 +0000
parents 31904bdf4350
children dbce347b20da
comparison
equal deleted inserted replaced
37440:c93600f74ebd 37441:565e55bc8630
945 (diff old new (eshell-flatten-and-stringify args)) 945 (diff old new (eshell-flatten-and-stringify args))
946 (error 946 (error
947 (throw 'eshell-replace-command 947 (throw 'eshell-replace-command
948 (eshell-parse-command "*diff" orig-args)))) 948 (eshell-parse-command "*diff" orig-args))))
949 (when (fboundp 'diff-mode) 949 (when (fboundp 'diff-mode)
950 (diff-mode) 950 (make-local-variable 'compilation-finish-functions)
951 (set (make-local-variable 'eshell-diff-window-config) config) 951 (add-hook
952 (local-set-key [?q] 'eshell-diff-quit) 952 'compilation-finish-functions
953 (if (fboundp 'turn-on-font-lock-if-enabled) 953 `(lambda (buff msg)
954 (turn-on-font-lock-if-enabled)))) 954 (with-current-buffer buff
955 (other-window 1) 955 (diff-mode)
956 (goto-char (point-min)) 956 (set (make-local-variable 'eshell-diff-window-config)
957 nil)))) 957 ,config)
958 (local-set-key [?q] 'eshell-diff-quit)
959 (if (fboundp 'turn-on-font-lock-if-enabled)
960 (turn-on-font-lock-if-enabled))
961 (goto-char (point-min))))))
962 (pop-to-buffer (current-buffer))))))
963 nil)
958 964
959 (defun eshell/locate (&rest args) 965 (defun eshell/locate (&rest args)
960 "Alias \"locate\" to call Emacs `locate' function." 966 "Alias \"locate\" to call Emacs `locate' function."
961 (if (or eshell-plain-locate-behavior 967 (if (or eshell-plain-locate-behavior
962 (not (and (eshell-interactive-output-p) 968 (not (and (eshell-interactive-output-p)