diff options
| author | Chong Yidong | 2011-09-14 11:14:34 -0400 |
|---|---|---|
| committer | Chong Yidong | 2011-09-14 11:14:34 -0400 |
| commit | 17bb0a2d8363621ce5b5c3fe16dc35b85ac9d455 (patch) | |
| tree | 1933beb8bfb9185e11963374ff684e6584fc39ba | |
| parent | a0bf2bcd9305d97dcfa1a06d0d7174e3061da8e8 (diff) | |
| download | emacs-17bb0a2d8363621ce5b5c3fe16dc35b85ac9d455.tar.gz emacs-17bb0a2d8363621ce5b5c3fe16dc35b85ac9d455.zip | |
* replace.el (occur-mode-goto-occurrence): Don't force using other window.
Fixes: debbugs:9499
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/dired.el | 2 | ||||
| -rw-r--r-- | lisp/replace.el | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7b447c11b10..1ea29f1e65d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2011-09-14 Chong Yidong <cyd@stupidchicken.com> | 1 | 2011-09-14 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 2 | ||
| 3 | * replace.el (occur-mode-goto-occurrence): Don't force using other | ||
| 4 | window (Bug#9499). | ||
| 5 | |||
| 3 | * dired-aux.el (dired-do-chmod): Don't provide initial input. | 6 | * dired-aux.el (dired-do-chmod): Don't provide initial input. |
| 4 | 7 | ||
| 5 | 2011-09-14 Martin Rudalics <rudalics@gmx.at> | 8 | 2011-09-14 Martin Rudalics <rudalics@gmx.at> |
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." | |||
| 3663 | ;;;;;; dired-run-shell-command dired-do-shell-command dired-do-async-shell-command | 3663 | ;;;;;; dired-run-shell-command dired-do-shell-command dired-do-async-shell-command |
| 3664 | ;;;;;; dired-clean-directory dired-do-print dired-do-touch dired-do-chown | 3664 | ;;;;;; dired-clean-directory dired-do-print dired-do-touch dired-do-chown |
| 3665 | ;;;;;; dired-do-chgrp dired-do-chmod dired-compare-directories dired-backup-diff | 3665 | ;;;;;; dired-do-chgrp dired-do-chmod dired-compare-directories dired-backup-diff |
| 3666 | ;;;;;; dired-diff) "dired-aux" "dired-aux.el" "bbc9babe193843cad535d73492326c48") | 3666 | ;;;;;; dired-diff) "dired-aux" "dired-aux.el" "0ffe89ae728efb341dfacff6c85e2ba4") |
| 3667 | ;;; Generated autoloads from dired-aux.el | 3667 | ;;; Generated autoloads from dired-aux.el |
| 3668 | 3668 | ||
| 3669 | (autoload 'dired-diff "dired-aux" "\ | 3669 | (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]." | |||
| 940 | (save-excursion | 940 | (save-excursion |
| 941 | (goto-char (posn-point (event-end event))) | 941 | (goto-char (posn-point (event-end event))) |
| 942 | (occur-mode-find-occurrence)))))) | 942 | (occur-mode-find-occurrence)))))) |
| 943 | (pop-to-buffer (marker-buffer pos) t) | 943 | (pop-to-buffer (marker-buffer pos)) |
| 944 | (goto-char pos) | 944 | (goto-char pos) |
| 945 | (run-hooks 'occur-mode-find-occurrence-hook))) | 945 | (run-hooks 'occur-mode-find-occurrence-hook))) |
| 946 | 946 | ||