From: Glenn Morris <rgm@gnu.org>
Date: Wed, 18 Sep 2013 01:42:43 +0000 (-0400)
Subject: * lisp/textmodes/two-column.el: Make 2C-split work for --without-x.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1568
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ec9177ba76f846efb7008547632adbe9a5d913ec;p=emacs.git

* lisp/textmodes/two-column.el: Make 2C-split work for --without-x.
(scroll-bar-columns): Autoload.
(top-level): Require fringe when compiling.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7b2ed1fe6a1..a4f150317e3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2013-09-18  Glenn Morris  <rgm@gnu.org>
+
+	* textmodes/two-column.el: Make 2C-split work for --without-x.
+	(scroll-bar-columns): Autoload.
+	(top-level): Require fringe when compiling.
+
 2013-09-18  Leo Liu  <sdl.web@gmail.com>
 
 	* subr.el (add-hook): Robustify to handle closure as well.
diff --git a/lisp/textmodes/two-column.el b/lisp/textmodes/two-column.el
index 23e90552096..dcc664cc7f2 100644
--- a/lisp/textmodes/two-column.el
+++ b/lisp/textmodes/two-column.el
@@ -349,6 +349,9 @@ accepting the proposed default buffer.
     (if b1 (setq 2C-window-width (- (frame-width) b1)))
     (2C-two-columns b2)))
 
+(autoload 'scroll-bar-columns "scroll-bar")
+(eval-when-compile
+  (require 'fringe))			; fringe-columns defsubst
 
 ;;;###autoload
 (defun 2C-split (arg)