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/textmodes | |
| parent | 8d0eb4c275581847990b85dbb350caa3df9e653f (diff) | |
| parent | 2d197ffbe2029b479802528eeaec714df4c8a8f6 (diff) | |
| download | emacs-1fa2385302f5b2e5bb17c8aad3cb4e320512ca46.tar.gz emacs-1fa2385302f5b2e5bb17c8aad3cb4e320512ca46.zip | |
Merge from trunk.
Diffstat (limited to 'lisp/textmodes')
| -rw-r--r-- | lisp/textmodes/reftex-toc.el | 4 | ||||
| -rw-r--r-- | lisp/textmodes/two-column.el | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lisp/textmodes/reftex-toc.el b/lisp/textmodes/reftex-toc.el index 5d691f456f7..37983d17931 100644 --- a/lisp/textmodes/reftex-toc.el +++ b/lisp/textmodes/reftex-toc.el | |||
| @@ -247,10 +247,10 @@ When called with a raw C-u prefix, rescan the document first." | |||
| 247 | 247 | ||
| 248 | (unless unsplittable | 248 | (unless unsplittable |
| 249 | (if reftex-toc-split-windows-horizontally | 249 | (if reftex-toc-split-windows-horizontally |
| 250 | (split-window-horizontally | 250 | (split-window-right |
| 251 | (floor (* (window-width) | 251 | (floor (* (window-width) |
| 252 | reftex-toc-split-windows-fraction))) | 252 | reftex-toc-split-windows-fraction))) |
| 253 | (split-window-vertically | 253 | (split-window-below |
| 254 | (floor (* (window-height) | 254 | (floor (* (window-height) |
| 255 | reftex-toc-split-windows-fraction))))) | 255 | reftex-toc-split-windows-fraction))))) |
| 256 | 256 | ||
diff --git a/lisp/textmodes/two-column.el b/lisp/textmodes/two-column.el index 68b858162df..de9ac10d0e9 100644 --- a/lisp/textmodes/two-column.el +++ b/lisp/textmodes/two-column.el | |||
| @@ -333,7 +333,7 @@ first and the associated buffer to its right." | |||
| 333 | ;; first go to full width, so that we can certainly split into two windows | 333 | ;; first go to full width, so that we can certainly split into two windows |
| 334 | (unless (window-full-width-p) | 334 | (unless (window-full-width-p) |
| 335 | (enlarge-window 99999 t)) | 335 | (enlarge-window 99999 t)) |
| 336 | (split-window-horizontally | 336 | (split-window-right |
| 337 | (max window-min-width (min 2C-window-width | 337 | (max window-min-width (min 2C-window-width |
| 338 | (- (frame-width) window-min-width)))) | 338 | (- (frame-width) window-min-width)))) |
| 339 | (if (2C-other) | 339 | (if (2C-other) |