aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2011-06-30 03:09:13 +0200
committerLars Magne Ingebrigtsen2011-06-30 03:09:13 +0200
commitbb6177177ba48fc7f7e6cb54b8d2561694ab7859 (patch)
treed1f8dd84247cc2d18ce16e05b33068e30bbd9082
parent3451795ca11e5794ba37a54f5c02aca8c9099890 (diff)
downloademacs-bb6177177ba48fc7f7e6cb54b8d2561694ab7859.tar.gz
emacs-bb6177177ba48fc7f7e6cb54b8d2561694ab7859.zip
(rgrep): Bind `process-connection-type' to nil, because using a pty is apparently too slow (bug #895).
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/progmodes/grep.el6
2 files changed, 9 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 62fbf813ce2..29ae3715531 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12011-06-30 Lars Magne Ingebrigtsen <larsi@gnus.org>
2
3 * progmodes/grep.el (rgrep): Bind `process-connection-type' to
4 nil, because using a pty is apparently too slow (bug #895).
5
12011-06-29 Lars Magne Ingebrigtsen <larsi@gnus.org> 62011-06-29 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 7
3 * mail/sendmail.el (sendmail-query-once): New function. 8 * mail/sendmail.el (sendmail-query-once): New function.
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index db8e82193b3..d00189f15c3 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -966,7 +966,8 @@ This command shares argument histories with \\[lgrep] and \\[grep-find]."
966 (setq dir default-directory)) 966 (setq dir default-directory))
967 (if (null files) 967 (if (null files)
968 (if (not (string= regexp grep-find-command)) 968 (if (not (string= regexp grep-find-command))
969 (compilation-start regexp 'grep-mode)) 969 (let ((process-connection-type nil))
970 (compilation-start regexp 'grep-mode)))
970 (setq dir (file-name-as-directory (expand-file-name dir))) 971 (setq dir (file-name-as-directory (expand-file-name dir)))
971 (require 'find-dired) ; for `find-name-arg' 972 (require 'find-dired) ; for `find-name-arg'
972 (let ((command (grep-expand-template 973 (let ((command (grep-expand-template
@@ -1023,7 +1024,8 @@ This command shares argument histories with \\[lgrep] and \\[grep-find]."
1023 (read-from-minibuffer "Confirm: " 1024 (read-from-minibuffer "Confirm: "
1024 command nil nil 'grep-find-history)) 1025 command nil nil 'grep-find-history))
1025 (add-to-history 'grep-find-history command)) 1026 (add-to-history 'grep-find-history command))
1026 (let ((default-directory dir)) 1027 (let ((default-directory dir)
1028 (process-connection-type nil))
1027 (compilation-start command 'grep-mode)) 1029 (compilation-start command 'grep-mode))
1028 ;; Set default-directory if we started rgrep in the *grep* buffer. 1030 ;; Set default-directory if we started rgrep in the *grep* buffer.
1029 (if (eq next-error-last-buffer (current-buffer)) 1031 (if (eq next-error-last-buffer (current-buffer))