Changeset 13117 for release/1.4/source


Ignore:
Timestamp:
Oct 29, 2009, 2:46:37 AM (10 years ago)
Author:
rme
Message:

Merge r13116 from trunk (search files dialog fix)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • release/1.4/source/cocoa-ide/search-files.lisp

    r12133 r13117  
    233233    (setf (search-results wc) (new-results wc))
    234234    ;; release NSString instances.  sigh.
    235     (dotimes (f (length old-results))
    236       (dotimes (l (length (search-result-file-lines f)))
    237         (and (search-result-line-nsstr l)
    238              (#/release (search-result-line-nsstr l))))
    239       (and (search-result-file-nsstr f)
    240            (#/release (search-result-file-nsstr f))))
     235    (dotimes (idx (length old-results))
     236      (let* ((file (aref old-results idx))
     237             (lines (when file (search-result-file-lines file))))
     238        (dotimes (idx (length lines))
     239          (let* ((line (aref lines idx))
     240                 (string (when line (search-result-line-nsstr line))))
     241            (and string (#/release string))))
     242        (and (search-result-file-nsstr file)
     243             (#/release (search-result-file-nsstr file)))))
    241244    (set-results-string wc msg)
    242     (when (or (auto-expandable-p (search-results wc))
    243               (expand-results-p wc))
    244       (expand-all-results wc))
     245;;     (when (or (auto-expandable-p (search-results wc))
     246;;              (expand-results-p wc))
     247;;       (expand-all-results wc))
    245248    (#/reloadData (outline-view wc))
    246249    (#/setEnabled: (search-button wc) t)))
    247    
     250
    248251;;; This is run in a secondary thread.
    249252(defun run-grep (grep-arglist wc)
Note: See TracChangeset for help on using the changeset viewer.