[climacs-cvs] CVS update: climacs/gui.lisp climacs/pane.lisp - climacs-cvs@common-lisp.net - mailman3.common-lisp.net

21 Jan 2005

Update of /project/climacs/cvsroot/climacs
In directory common-lisp.net:/tmp/cvs-serv29715
Modified Files:
    gui.lisp pane.lisp 
Log Message:
Moved auto-fill-mode from buffer to pane
Date: Fri Jan 21 11:39:50 2005
Author: mvilleneuve
Index: climacs/gui.lisp
diff -u climacs/gui.lisp:1.91 climacs/gui.lisp:1.92

--- climacs/gui.lisp:1.91	Thu Jan 20 22:54:54 2005
+++ climacs/gui.lisp	Fri Jan 21 11:39:50 2005
@@ -116,7 +116,7 @@
    		       (if (slot-value climacs-pane 'overwrite-mode)
    			   " Ovwrt"
    			   "")
-                               (if (auto-fill-mode buf)
+                               (if (auto-fill-mode climacs-pane)
                                    " Fill"
                                    "")
    		       (if (recordingp *application-frame*)
@@ -292,7 +292,7 @@
 (defun possibly-fill-line ()
   (let* ((pane (current-window))
          (buffer (buffer pane)))
-    (when (auto-fill-mode buffer)
+    (when (auto-fill-mode pane)
       (let* ((fill-column (auto-fill-column buffer))
              (point (point pane))
              (offset (offset point))
@@ -502,8 +502,8 @@
   (delete-indentation (point (current-window))))
(define-named-command com-auto-fill-mode ()
-  (let ((buffer (buffer (current-window))))
-    (setf (auto-fill-mode buffer) (not (auto-fill-mode buffer)))))
+  (let ((pane (current-window)))
+    (setf (auto-fill-mode pane) (not (auto-fill-mode pane)))))
(define-named-command com-fill-paragraph ()
   (let* ((pane (current-window))
Index: climacs/pane.lisp
diff -u climacs/pane.lisp:1.7 climacs/pane.lisp:1.8
--- climacs/pane.lisp:1.7	Wed Jan 19 12:04:39 2005
+++ climacs/pane.lisp	Fri Jan 21 11:39:50 2005
@@ -59,7 +59,6 @@
    (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-mode :initform t :accessor auto-fill-mode)
    (auto-fill-column :initform 70 :accessor auto-fill-column))
   (:default-initargs :name "*scratch*"))
@@ -75,6 +74,7 @@
    (cursor-y :initform 2)
    (space-width :initform nil)
    (tab-width :initform nil)
+   (auto-fill-mode :initform t :accessor auto-fill-mode)
    (full-redisplay-p :initform nil :accessor full-redisplay-p)
    (cache :initform (let ((cache (make-instance 'standard-flexichain)))
    	      (insert* cache 0 nil)

    