aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/textmodes/two-column.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/textmodes/two-column.el
parent8d0eb4c275581847990b85dbb350caa3df9e653f (diff)
parent2d197ffbe2029b479802528eeaec714df4c8a8f6 (diff)
downloademacs-1fa2385302f5b2e5bb17c8aad3cb4e320512ca46.tar.gz
emacs-1fa2385302f5b2e5bb17c8aad3cb4e320512ca46.zip
Merge from trunk.
Diffstat (limited to 'lisp/textmodes/two-column.el')
-rw-r--r--lisp/textmodes/two-column.el2
1 files changed, 1 insertions, 1 deletions
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)