From: Chong Yidong Date: Wed, 14 Sep 2011 15:14:34 +0000 (-0400) Subject: * replace.el (occur-mode-goto-occurrence): Don't force using other window. X-Git-Tag: emacs-pretest-24.0.90~104^2~52 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=17bb0a2d8363621ce5b5c3fe16dc35b85ac9d455;p=emacs.git * replace.el (occur-mode-goto-occurrence): Don't force using other window. Fixes: debbugs:9499 --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7b447c11b10..1ea29f1e65d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2011-09-14 Chong Yidong + * replace.el (occur-mode-goto-occurrence): Don't force using other + window (Bug#9499). + * dired-aux.el (dired-do-chmod): Don't provide initial input. 2011-09-14 Martin Rudalics diff --git a/lisp/dired.el b/lisp/dired.el index 3428f5bef8b..f01e195f9ec 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -3663,7 +3663,7 @@ Ask means pop up a menu for the user to select one of copy, move or link." ;;;;;; dired-run-shell-command dired-do-shell-command dired-do-async-shell-command ;;;;;; dired-clean-directory dired-do-print dired-do-touch dired-do-chown ;;;;;; dired-do-chgrp dired-do-chmod dired-compare-directories dired-backup-diff -;;;;;; dired-diff) "dired-aux" "dired-aux.el" "bbc9babe193843cad535d73492326c48") +;;;;;; dired-diff) "dired-aux" "dired-aux.el" "0ffe89ae728efb341dfacff6c85e2ba4") ;;; Generated autoloads from dired-aux.el (autoload 'dired-diff "dired-aux" "\ diff --git a/lisp/replace.el b/lisp/replace.el index ee430fd9855..70175cf205c 100644 --- a/lisp/replace.el +++ b/lisp/replace.el @@ -940,7 +940,7 @@ To return to ordinary Occur mode, use \\[occur-mode]." (save-excursion (goto-char (posn-point (event-end event))) (occur-mode-find-occurrence)))))) - (pop-to-buffer (marker-buffer pos) t) + (pop-to-buffer (marker-buffer pos)) (goto-char pos) (run-hooks 'occur-mode-find-occurrence-hook)))