Update of /project/climacs/cvsroot/climacs In directory common-lisp.net:/tmp/cvs-serv25661
Modified Files: gui.lisp pane.lisp Log Message: Copy auto-fill parameters when splitting panes, moved auto-fill-column to pane Date: Sat Jan 22 07:20:45 2005 Author: mvilleneuve
Index: climacs/gui.lisp diff -u climacs/gui.lisp:1.94 climacs/gui.lisp:1.95 --- climacs/gui.lisp:1.94 Sat Jan 22 00:04:35 2005 +++ climacs/gui.lisp Sat Jan 22 07:20:44 2005 @@ -290,13 +290,13 @@ (let* ((pane (current-window)) (buffer (buffer pane))) (when (auto-fill-mode pane) - (let* ((fill-column (auto-fill-column buffer)) + (let* ((fill-column (auto-fill-column pane)) (point (point pane)) (offset (offset point)) (tab-width (tab-space-count (stream-default-view pane))) (syntax (syntax buffer))) (when (>= (buffer-display-column buffer offset tab-width) - (1- (auto-fill-column buffer))) + (1- fill-column)) (fill-line point (lambda (mark) (syntax-line-indentation mark tab-width syntax)) @@ -876,7 +876,9 @@ (multiple-value-bind (vbox new-pane) (make-pane-constellation) (let* ((current-window (current-window)) (constellation-root (parent3 current-window))) - (setf (buffer new-pane) (buffer current-window)) + (setf (buffer new-pane) (buffer current-window) + (auto-fill-mode new-pane) (auto-fill-mode current-window) + (auto-fill-column new-pane) (auto-fill-column current-window)) (push new-pane (windows *application-frame*)) (replace-constellation constellation-root vbox t) (full-redisplay current-window) @@ -888,7 +890,9 @@ (multiple-value-bind (vbox new-pane) (make-pane-constellation) (let* ((current-window (current-window)) (constellation-root (parent3 current-window))) - (setf (buffer new-pane) (buffer current-window)) + (setf (buffer new-pane) (buffer current-window) + (auto-fill-mode new-pane) (auto-fill-mode current-window) + (auto-fill-column new-pane) (auto-fill-column current-window)) (push new-pane (windows *application-frame*)) (replace-constellation constellation-root vbox nil) (full-redisplay current-window)
Index: climacs/pane.lisp diff -u climacs/pane.lisp:1.9 climacs/pane.lisp:1.10 --- climacs/pane.lisp:1.9 Sat Jan 22 00:04:35 2005 +++ climacs/pane.lisp Sat Jan 22 07:20:44 2005 @@ -58,8 +58,7 @@ ((needs-saving :initform nil :accessor needs-saving) (syntax :initarg :syntax :initform (make-instance 'basic-syntax) :accessor syntax) (indent-tabs-mode :initarg indent-tabs-mode :initform t - :accessor indent-tabs-mode) - (auto-fill-column :initform 70 :accessor auto-fill-column)) + :accessor indent-tabs-mode)) (:default-initargs :name "*scratch*"))
@@ -75,6 +74,7 @@ (space-width :initform nil) (tab-width :initform nil) (auto-fill-mode :initform t :accessor auto-fill-mode) + (auto-fill-column :initform 70 :accessor auto-fill-column) (full-redisplay-p :initform nil :accessor full-redisplay-p) (cache :initform (let ((cache (make-instance 'standard-flexichain))) (insert* cache 0 nil)