Ignore:
Timestamp:
Feb 5, 2008, 11:01:48 PM (12 years ago)
Author:
gz
Message:

Merge of the 'event-ide' branch. Hemlock's thread model has been changed
so that Hemlock commands now run in the Cocoa event thread -- see the
Hemlock file view.lisp for an overview.

IDE compilation has also been reorganized. Hemlock is now more fully
integrated into the IDE and cannot be compiled separately, sorry.

The hemlock-ext package has been repurposed to contain all interfaces
to window-system specific functionality.

There are also many many assorted other changes, cleanups and fixes.

The Hemlock documentation (Hemlock Command Implementor's Manual) in
http://trac.clozure.com/openmcl/wiki now correctly reflects the
implementation, although it doesn't (yet) describe the integration
with Cocoa or the threading model.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/cocoa-ide/hemlock/src/search1.lisp

    r6582 r8428  
    629629
    630630
    631 (defun find-pattern (mark search-pattern)
     631(defun find-pattern (mark search-pattern &optional stop-mark)
    632632  "Find a match of Search-Pattern starting at Mark.  Mark is moved to
    633633  point before the match and the number of characters matched is returned.
    634634  If there is no match for the pattern then Mark is not modified and NIL
    635   is returned."
     635  is returned.
     636  If stop-mark is specified, NIL is returned and mark is not moved if
     637  the point before the match is after stop-mark"
    636638  (close-line)
    637639  (multiple-value-bind (line start matched)
     
    639641                                search-pattern (mark-line mark)
    640642                                (mark-charpos mark))
    641     (when matched
     643    (when (and matched
     644               (or (null stop-mark)
     645                   (< (line-number line) (line-number (mark-line stop-mark)))
     646                   (and (= (line-number line) (line-number (mark-line stop-mark)))
     647                        (<= start (mark-charpos stop-mark)))))
    642648      (move-to-position mark start line)
    643649      matched)))
Note: See TracChangeset for help on using the changeset viewer.