[Openmcl-cvs-notifications] r16250 - /trunk/source/cocoa-ide/cocoa-editor.lisp

gz at clozure.com gz at clozure.com
Fri Sep 26 18:31:08 UTC 2014


Author: gz
Date: Fri Sep 26 18:31:07 2014
New Revision: 16250

Log:
In #/textViewDidChangeSelection, do not update hemlock position while editi=
ng.

Modified:
    trunk/source/cocoa-ide/cocoa-editor.lisp

Modified: trunk/source/cocoa-ide/cocoa-editor.lisp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/cocoa-ide/cocoa-editor.lisp	(original)
+++ trunk/source/cocoa-ide/cocoa-editor.lisp	Fri Sep 26 18:31:07 2014
@@ -2553,6 +2553,7 @@
   (let* ((hv (hemlock-view self))
 	 (buffer (hi:hemlock-view-buffer hv))
 	 (tv (#/object notification)))
+   (unless (> (buffer-edit-level buffer) 0) ;; if editing, hemlock positio=
n is the master position.
     (with-view-selection-info (tv buffer)
       (let* ((range (#/selectedRange tv))
 	     (v0 (ns:ns-range-location range))
@@ -2566,7 +2567,7 @@
 	      (when (> v1 v0)
 		(let ((mark (hi:copy-mark point :right-inserting)))
 		  (hi:move-to-absolute-position mark v1)
-		  (hemlock::%buffer-push-buffer-mark buffer mark t))))))))))
+		  (hemlock::%buffer-push-buffer-mark buffer mark t)))))))))))
 =

 (objc:defmethod #/windowTitleForDocumentDisplayName: ((self hemlock-editor=
-window-controller) docname)
   (let* ((seq (slot-value self 'sequence)))



More information about the Openmcl-cvs-notifications mailing list