diff options
| author | Chong Yidong | 2011-10-30 09:56:03 +0800 |
|---|---|---|
| committer | Chong Yidong | 2011-10-30 09:56:03 +0800 |
| commit | 2d197ffbe2029b479802528eeaec714df4c8a8f6 (patch) | |
| tree | 970da6796e7ba009cd561928f735c2eea41e8f29 /lisp/emulation | |
| parent | 196e41e4aec1a44ec5b6e9bed485185ba872ae67 (diff) | |
| download | emacs-2d197ffbe2029b479802528eeaec714df4c8a8f6.tar.gz emacs-2d197ffbe2029b479802528eeaec714df4c8a8f6.zip | |
Rename split-window-{above-each-other|split-window-side-by-side}
to split-window-below and split-window-right.
* lisp/window.el (split-window-below, split-window-right): Rename from
split-window-above-each-other and split-window-side-by-side
respectively. All callers changed.
(split-window-sensibly, split-window-sensibly): Use them.
(split-window-keep-point): Doc fix.
* lisp/isearch.el: Add isearch-scroll property to split-window-below
and split-window-right.
* lisp/follow.el (follow-mode):
* lisp/vc/pcvs-util.el (cvs-pop-to-buffer-same-frame):
* lisp/progmodes/ada-xref.el (ada-gdb-application):
* lisp/emulation/vip.el (vip-buffer-in-two-windows):
* lisp/image-dired.el (image-dired-dired-with-window-configuration):
* lisp/dired-x.el (dired-do-find-marked-files):
* lisp/dired.el (dired-pop-to-buffer):
* lisp/bs.el (bs--show-with-configuration):
* lisp/vc/emerge.el (emerge-setup-windows):
* lisp/textmodes/two-column.el (2C-two-columns):
* lisp/textmodes/reftex-toc.el (reftex-toc):
* lisp/progmodes/gdb-mi.el (gdb-setup-windows):
* lisp/progmodes/fortran.el (fortran-window-create):
* lisp/net/newst-treeview.el (newsticker--treeview-window-init):
* lisp/emulation/ws-mode.el (wordstar-C-o-map, wordstar-mode):
* lisp/emulation/tpu-edt.el (tpu-gold-map):
* lisp/emulation/crisp.el (crisp-mode-map):
* lisp/calendar/calendar.el (calendar-basic-setup): Callers changed.
Diffstat (limited to 'lisp/emulation')
| -rw-r--r-- | lisp/emulation/crisp.el | 4 | ||||
| -rw-r--r-- | lisp/emulation/edt.el | 2 | ||||
| -rw-r--r-- | lisp/emulation/tpu-edt.el | 4 | ||||
| -rw-r--r-- | lisp/emulation/vip.el | 2 | ||||
| -rw-r--r-- | lisp/emulation/ws-mode.el | 8 |
5 files changed, 10 insertions, 10 deletions
diff --git a/lisp/emulation/crisp.el b/lisp/emulation/crisp.el index 567a57949b3..010e32857c5 100644 --- a/lisp/emulation/crisp.el +++ b/lisp/emulation/crisp.el | |||
| @@ -71,8 +71,8 @@ | |||
| 71 | (define-key map [(f2) (left)] 'shrink-window-horizontally) | 71 | (define-key map [(f2) (left)] 'shrink-window-horizontally) |
| 72 | (define-key map [(f2) (right)] 'enlarge-window-horizontally) | 72 | (define-key map [(f2) (right)] 'enlarge-window-horizontally) |
| 73 | (define-key map [(f2) (up)] 'shrink-window) | 73 | (define-key map [(f2) (up)] 'shrink-window) |
| 74 | (define-key map [(f3) (down)] 'split-window-vertically) | 74 | (define-key map [(f3) (down)] 'split-window-below) |
| 75 | (define-key map [(f3) (right)] 'split-window-horizontally) | 75 | (define-key map [(f3) (right)] 'split-window-right) |
| 76 | 76 | ||
| 77 | (define-key map [(f4)] 'delete-window) | 77 | (define-key map [(f4)] 'delete-window) |
| 78 | (define-key map [(control f4)] 'delete-other-windows) | 78 | (define-key map [(control f4)] 'delete-other-windows) |
diff --git a/lisp/emulation/edt.el b/lisp/emulation/edt.el index 68550cc30e2..7ed0255d987 100644 --- a/lisp/emulation/edt.el +++ b/lisp/emulation/edt.el | |||
| @@ -2362,7 +2362,7 @@ Argument GOLD-BINDING is the Emacs function to be bound to GOLD <KEY>." | |||
| 2362 | (edt-bind-gold-key-default "\C-h" 'help-for-help); Just in case. | 2362 | (edt-bind-gold-key-default "\C-h" 'help-for-help); Just in case. |
| 2363 | (edt-bind-gold-key-default [f1] 'help-for-help) | 2363 | (edt-bind-gold-key-default [f1] 'help-for-help) |
| 2364 | (edt-bind-gold-key-default [help] 'help-for-help) | 2364 | (edt-bind-gold-key-default [help] 'help-for-help) |
| 2365 | (edt-bind-gold-key-default "\C-\\" 'split-window-vertically) | 2365 | (edt-bind-gold-key-default "\C-\\" 'split-window-below) |
| 2366 | 2366 | ||
| 2367 | ;; GOLD bindings for regular keys. | 2367 | ;; GOLD bindings for regular keys. |
| 2368 | (edt-bind-gold-key-default "a" 'edt-key-not-assigned) | 2368 | (edt-bind-gold-key-default "a" 'edt-key-not-assigned) |
diff --git a/lisp/emulation/tpu-edt.el b/lisp/emulation/tpu-edt.el index b4bf47a6504..e2ad5d81d27 100644 --- a/lisp/emulation/tpu-edt.el +++ b/lisp/emulation/tpu-edt.el | |||
| @@ -459,7 +459,7 @@ Otherwise, use `spell-region'." | |||
| 459 | ;; (define-key map "\\" nil) ; \ | 459 | ;; (define-key map "\\" nil) ; \ |
| 460 | (define-key map "]" 'blink-matching-open) ; ] | 460 | (define-key map "]" 'blink-matching-open) ; ] |
| 461 | (define-key map "^" 'tpu-add-at-bol) ; ^ | 461 | (define-key map "^" 'tpu-add-at-bol) ; ^ |
| 462 | (define-key map "_" 'split-window-vertically) ; - | 462 | (define-key map "_" 'split-window-below) ; - |
| 463 | (define-key map "`" 'what-line) ; ` | 463 | (define-key map "`" 'what-line) ; ` |
| 464 | (define-key map "a" 'tpu-toggle-newline-and-indent) ; a | 464 | (define-key map "a" 'tpu-toggle-newline-and-indent) ; a |
| 465 | (define-key map "b" 'tpu-next-buffer) ; b | 465 | (define-key map "b" 'tpu-next-buffer) ; b |
| @@ -487,7 +487,7 @@ Otherwise, use `spell-region'." | |||
| 487 | (define-key map "y" 'copy-region-as-kill) ; y | 487 | (define-key map "y" 'copy-region-as-kill) ; y |
| 488 | (define-key map "z" 'suspend-emacs) ; z | 488 | (define-key map "z" 'suspend-emacs) ; z |
| 489 | ;; (define-key map "{" nil) ; { | 489 | ;; (define-key map "{" nil) ; { |
| 490 | (define-key map "|" 'split-window-horizontally) ; | | 490 | (define-key map "|" 'split-window-right) ; | |
| 491 | ;; (define-key map "}" nil) ; } | 491 | ;; (define-key map "}" nil) ; } |
| 492 | (define-key map "~" 'exchange-point-and-mark) ; ~ | 492 | (define-key map "~" 'exchange-point-and-mark) ; ~ |
| 493 | (define-key map "\177" 'delete-window) ; <X] | 493 | (define-key map "\177" 'delete-window) ; <X] |
diff --git a/lisp/emulation/vip.el b/lisp/emulation/vip.el index 6f4f0ce80ec..a0c6062fb29 100644 --- a/lisp/emulation/vip.el +++ b/lisp/emulation/vip.el | |||
| @@ -1605,7 +1605,7 @@ used. This behavior is controlled by the sign of prefix numeric value." | |||
| 1605 | "Show current buffer in two windows." | 1605 | "Show current buffer in two windows." |
| 1606 | (interactive) | 1606 | (interactive) |
| 1607 | (delete-other-windows) | 1607 | (delete-other-windows) |
| 1608 | (split-window-vertically nil)) | 1608 | (split-window-below)) |
| 1609 | 1609 | ||
| 1610 | 1610 | ||
| 1611 | ;; searching | 1611 | ;; searching |
diff --git a/lisp/emulation/ws-mode.el b/lisp/emulation/ws-mode.el index 3a205c7c4f0..886b4d6d4c4 100644 --- a/lisp/emulation/ws-mode.el +++ b/lisp/emulation/ws-mode.el | |||
| @@ -95,9 +95,9 @@ | |||
| 95 | (define-key map "\C-r" 'set-fill-column) | 95 | (define-key map "\C-r" 'set-fill-column) |
| 96 | (define-key map "\C-u" 'keyboard-quit) | 96 | (define-key map "\C-u" 'keyboard-quit) |
| 97 | (define-key map "wd" 'delete-other-windows) | 97 | (define-key map "wd" 'delete-other-windows) |
| 98 | (define-key map "wh" 'split-window-horizontally) | 98 | (define-key map "wh" 'split-window-right) |
| 99 | (define-key map "wo" 'other-window) | 99 | (define-key map "wo" 'other-window) |
| 100 | (define-key map "wv" 'split-window-vertically) | 100 | (define-key map "wv" 'split-window-below) |
| 101 | map) | 101 | map) |
| 102 | "") | 102 | "") |
| 103 | 103 | ||
| @@ -257,9 +257,9 @@ The key bindings are: | |||
| 257 | C-o r set-fill-column | 257 | C-o r set-fill-column |
| 258 | C-o C-u keyboard-quit | 258 | C-o C-u keyboard-quit |
| 259 | C-o wd delete-other-windows | 259 | C-o wd delete-other-windows |
| 260 | C-o wh split-window-horizontally | 260 | C-o wh split-window-right |
| 261 | C-o wo other-window | 261 | C-o wo other-window |
| 262 | C-o wv split-window-vertically | 262 | C-o wv split-window-below |
| 263 | 263 | ||
| 264 | C-q 0 ws-find-marker-0 | 264 | C-q 0 ws-find-marker-0 |
| 265 | C-q 1 ws-find-marker-1 | 265 | C-q 1 ws-find-marker-1 |