aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/isearch.el
diff options
context:
space:
mode:
authorPaul Eggert2011-10-29 19:23:07 -0700
committerPaul Eggert2011-10-29 19:23:07 -0700
commit1fa2385302f5b2e5bb17c8aad3cb4e320512ca46 (patch)
tree83c74219421f969e7b9c1061e781a6f9018bb47c /lisp/isearch.el
parent8d0eb4c275581847990b85dbb350caa3df9e653f (diff)
parent2d197ffbe2029b479802528eeaec714df4c8a8f6 (diff)
downloademacs-1fa2385302f5b2e5bb17c8aad3cb4e320512ca46.tar.gz
emacs-1fa2385302f5b2e5bb17c8aad3cb4e320512ca46.zip
Merge from trunk.
Diffstat (limited to 'lisp/isearch.el')
-rw-r--r--lisp/isearch.el6
1 files changed, 5 insertions, 1 deletions
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 6bb23916da3..3ffe6e8a656 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1804,9 +1804,13 @@ Scroll-bar or mode-line events are processed appropriately."
1804;; Commands which change the window layout 1804;; Commands which change the window layout
1805(put 'delete-other-windows 'isearch-scroll t) 1805(put 'delete-other-windows 'isearch-scroll t)
1806(put 'balance-windows 'isearch-scroll t) 1806(put 'balance-windows 'isearch-scroll t)
1807(put 'split-window-right 'isearch-scroll t)
1808(put 'split-window-below 'isearch-scroll t)
1809(put 'enlarge-window 'isearch-scroll t)
1810
1811;; Aliases for split-window-*
1807(put 'split-window-vertically 'isearch-scroll t) 1812(put 'split-window-vertically 'isearch-scroll t)
1808(put 'split-window-horizontally 'isearch-scroll t) 1813(put 'split-window-horizontally 'isearch-scroll t)
1809(put 'enlarge-window 'isearch-scroll t)
1810 1814
1811;; Universal argument commands 1815;; Universal argument commands
1812(put 'universal-argument 'isearch-scroll t) 1816(put 'universal-argument 'isearch-scroll t)