Ignore:
Timestamp:
Feb 17, 2009, 4:19:15 AM (11 years ago)
Author:
rme
Message:

Merge trunk changes through r11740.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • release/1.3/source/cocoa-ide/cocoa-editor.lisp

    r11619 r11747  
    29392939;;; we may need to continue to override this method in order to
    29402940;;; fix that.)
    2941 (objc:defmethod (#/paste: :void) ((self hemlock-text-view) sender)
     2941(objc:defmethod (#/paste: :void) ((self hemlock-textstorage-text-view) sender)
    29422942  (declare (ignorable sender))
    29432943  #+debug (#_NSLog #@"Paste: sender = %@" :id sender)
     
    29542954          (#/setSelectedRange: self (ns:make-ns-range (#/length textstorage) 0)))
    29552955        (let* ((selectedrange (#/selectedRange self)))
    2956           (#/replaceCharactersInRange:withString: textstorage selectedrange string))))))
     2956          ;; We really should bracket the call to
     2957          ;; #/repaceCharactersInRange:withString: here with calls
     2958          ;; to #/beginEditing and #/endEditing, but our implementation
     2959          ;; of #/replaceCharactersInRange:withString: calls code that
     2960          ;; asserts that editing isn't in progress.  Once that's
     2961          ;; fixed, this should be fixed as well.
     2962          #+not-broken (#/beginEditing textstorage)
     2963          (#/replaceCharactersInRange:withString: textstorage selectedrange string)
     2964          #+not-broken (#/endEditing self))))))
    29572965
    29582966
Note: See TracChangeset for help on using the changeset viewer.