diff options
| author | Paul Eggert | 2011-10-29 19:23:07 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-10-29 19:23:07 -0700 |
| commit | 1fa2385302f5b2e5bb17c8aad3cb4e320512ca46 (patch) | |
| tree | 83c74219421f969e7b9c1061e781a6f9018bb47c /lisp/progmodes | |
| parent | 8d0eb4c275581847990b85dbb350caa3df9e653f (diff) | |
| parent | 2d197ffbe2029b479802528eeaec714df4c8a8f6 (diff) | |
| download | emacs-1fa2385302f5b2e5bb17c8aad3cb4e320512ca46.tar.gz emacs-1fa2385302f5b2e5bb17c8aad3cb4e320512ca46.zip | |
Merge from trunk.
Diffstat (limited to 'lisp/progmodes')
| -rw-r--r-- | lisp/progmodes/ada-xref.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/fortran.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/gdb-mi.el | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/lisp/progmodes/ada-xref.el b/lisp/progmodes/ada-xref.el index 7751f3e98fc..4a57a1eef67 100644 --- a/lisp/progmodes/ada-xref.el +++ b/lisp/progmodes/ada-xref.el | |||
| @@ -1438,7 +1438,7 @@ project file." | |||
| 1438 | ;; is going to have some relevant information. | 1438 | ;; is going to have some relevant information. |
| 1439 | (if (or (not (string-match "gvd" (comint-arguments cmd 0 0))) | 1439 | (if (or (not (string-match "gvd" (comint-arguments cmd 0 0))) |
| 1440 | (string-match "--tty" cmd)) | 1440 | (string-match "--tty" cmd)) |
| 1441 | (split-window-vertically)) | 1441 | (split-window-below)) |
| 1442 | (switch-to-buffer buffer) | 1442 | (switch-to-buffer buffer) |
| 1443 | ))) | 1443 | ))) |
| 1444 | 1444 | ||
diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el index d30b9673d09..fd3d42685f0 100644 --- a/lisp/progmodes/fortran.el +++ b/lisp/progmodes/fortran.el | |||
| @@ -1097,7 +1097,7 @@ See also `fortran-window-create-momentarily'." | |||
| 1097 | (scroll-bar-width (- (nth 2 window-edges) | 1097 | (scroll-bar-width (- (nth 2 window-edges) |
| 1098 | (car window-edges) | 1098 | (car window-edges) |
| 1099 | (window-width)))) | 1099 | (window-width)))) |
| 1100 | (split-window-horizontally (+ fortran-line-length scroll-bar-width))) | 1100 | (split-window-right (+ fortran-line-length scroll-bar-width))) |
| 1101 | (other-window 1) | 1101 | (other-window 1) |
| 1102 | (switch-to-buffer " fortran-window-extra" t) | 1102 | (switch-to-buffer " fortran-window-extra" t) |
| 1103 | (select-window (previous-window)))) | 1103 | (select-window (previous-window)))) |
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el index dde00d753ac..f9ddabf1552 100644 --- a/lisp/progmodes/gdb-mi.el +++ b/lisp/progmodes/gdb-mi.el | |||
| @@ -4028,7 +4028,7 @@ window is dedicated." | |||
| 4028 | (let ((win0 (selected-window)) | 4028 | (let ((win0 (selected-window)) |
| 4029 | (win1 (split-window nil ( / ( * (window-height) 3) 4))) | 4029 | (win1 (split-window nil ( / ( * (window-height) 3) 4))) |
| 4030 | (win2 (split-window nil ( / (window-height) 3))) | 4030 | (win2 (split-window nil ( / (window-height) 3))) |
| 4031 | (win3 (split-window-horizontally))) | 4031 | (win3 (split-window-right))) |
| 4032 | (gdb-set-window-buffer (gdb-locals-buffer-name) nil win3) | 4032 | (gdb-set-window-buffer (gdb-locals-buffer-name) nil win3) |
| 4033 | (select-window win2) | 4033 | (select-window win2) |
| 4034 | (set-window-buffer | 4034 | (set-window-buffer |
| @@ -4041,12 +4041,12 @@ window is dedicated." | |||
| 4041 | ;; can't find a source file. | 4041 | ;; can't find a source file. |
| 4042 | (list-buffers-noselect)))) | 4042 | (list-buffers-noselect)))) |
| 4043 | (setq gdb-source-window (selected-window)) | 4043 | (setq gdb-source-window (selected-window)) |
| 4044 | (let ((win4 (split-window-horizontally))) | 4044 | (let ((win4 (split-window-right))) |
| 4045 | (gdb-set-window-buffer | 4045 | (gdb-set-window-buffer |
| 4046 | (gdb-get-buffer-create 'gdb-inferior-io) nil win4)) | 4046 | (gdb-get-buffer-create 'gdb-inferior-io) nil win4)) |
| 4047 | (select-window win1) | 4047 | (select-window win1) |
| 4048 | (gdb-set-window-buffer (gdb-stack-buffer-name)) | 4048 | (gdb-set-window-buffer (gdb-stack-buffer-name)) |
| 4049 | (let ((win5 (split-window-horizontally))) | 4049 | (let ((win5 (split-window-right))) |
| 4050 | (gdb-set-window-buffer (if gdb-show-threads-by-default | 4050 | (gdb-set-window-buffer (if gdb-show-threads-by-default |
| 4051 | (gdb-threads-buffer-name) | 4051 | (gdb-threads-buffer-name) |
| 4052 | (gdb-breakpoints-buffer-name)) | 4052 | (gdb-breakpoints-buffer-name)) |