X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/865fe16fd25fb066c3da1f71a2bb115aa807af8d..91ab66201cedbcd2e4e8533a7152f6736ad08731:/lisp/textmodes/two-column.el diff --git a/lisp/textmodes/two-column.el b/lisp/textmodes/two-column.el index b21e72639f..3c15c9bef7 100644 --- a/lisp/textmodes/two-column.el +++ b/lisp/textmodes/two-column.el @@ -1,6 +1,6 @@ ;;; two-column.el --- minor mode for editing of two-column text -;; Copyright (C) 1992-1995, 2001-2012 Free Software Foundation, Inc. +;; Copyright (C) 1992-1995, 2001-2016 Free Software Foundation, Inc. ;; Author: Daniel Pfeiffer ;; Adapted-By: ESR, Daniel Pfeiffer @@ -259,9 +259,9 @@ if that value is non-nil. These buffers can be edited separately, for example with `fill-paragraph'. If you want to disable parallel scrolling temporarily, use \\[2C-toggle-autoscroll] . -If you include long lines, i.e which will span both columns (eg. -source code), they should be in what will be the first column, with -the associated buffer having empty lines next to them. +If you include long lines that span both columns (e.g., source +code), they should be in what will be the first column, with the +associated buffer having empty lines next to them. Potential uses are writing bilingual texts, or editing the comments of a source code. See the file lisp/two-column.el for detailed examples. @@ -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) @@ -370,9 +373,8 @@ First column's text sSs Second column's text \(See \\[describe-mode] .)" (interactive "*p") (and (2C-other) - (if (y-or-n-p (concat "Overwrite associated buffer `" - (buffer-name (2C-other)) - "'? ")) + (if (y-or-n-p (format-message "Overwrite associated buffer `%s'? " + (buffer-name (2C-other)))) (with-current-buffer (2C-other) (erase-buffer)) (signal 'quit nil)))