summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/textmodes/two-column.el3
2 files changed, 9 insertions, 0 deletions
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)