* 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 7b2ed1fe6a1786a1e77295cb0403ad4e088af4e7..a4f150317e358c60a5db3dae08052fa9dc9b32de 100644 (file)
--- 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 23e905520963b272992830b8e1efe56d10d2a504..dcc664cc7f2e753a78204824bb903a21bd5ab12a 100644 (file)
--- 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)