Changeset 14907


Ignore:
Timestamp:
Jul 27, 2011, 4:13:49 PM (8 years ago)
Author:
rme
Message:

Merge selected changes from trunk.

Location:
release/1.7/source
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • release/1.7/source

  • release/1.7/source/cocoa-ide/hemlock/src/lispmode.lisp

    r14737 r14907  
    23122312    (insert-character point #\Space)
    23132313    (pre-command-parse-check point)
    2314     (with-mark ((mark1 point)
    2315                 (mark2 point))
    2316       (when (backward-up-list mark1)
    2317         (when (form-offset (move-mark mark2 (mark-after mark1)) 1)
    2318           (with-mark ((mark3 mark2))
    2319             (do* ()
    2320                  ((mark= mark3 point)
    2321                   (let* ((fun-name (region-to-string (region mark1 mark2)))
    2322                          (arglist-string
    2323                           (string-to-arglist fun-name (current-buffer) t)))
    2324                     (when arglist-string
    2325                       (message "~a" arglist-string))))
    2326               (if (ccl::whitespacep (next-character mark3))
    2327                 (mark-after mark3)
    2328                 (return nil)))))))))
     2314    (with-mark ((m point))
     2315      (when (backward-up-list m)
     2316        (when (and (scan-char m :lisp-syntax :open-paren)
     2317                   (mark-after m))
     2318          (with-mark ((n m))
     2319          (forward-form n)
     2320            (let* ((fun-name (region-to-string (region m n)))
     2321                   (arglist-string (string-to-arglist fun-name (current-buffer) t)))
     2322              (when arglist-string
     2323                      (message "~a" arglist-string)))))))))
    23292324
    23302325(hi:defcommand "Show Callers" (p)
  • release/1.7/source/level-1/l1-format.lisp

    r13067 r14907  
    427427(defun nthcdr-no-overflow (count list)
    428428  (if (or (> count (list-length list)) (< count 0))
    429     (format-error "non-existent target for ~*")
     429    (format-error "non-existent target for ~~*")
    430430    (nthcdr count list)))
    431431
  • release/1.7/source/level-1/sysutils.lisp

    r14824 r14907  
    709709(defparameter *suppress-compiler-warnings* nil)
    710710
     711
    711712(defun signal-compiler-warning (w init-p last-w-file harsh-p any-p &optional eval-p)
    712713  (let ((muffled *suppress-compiler-warnings*)
     
    729730        (if w-file (format s "for ~S :" w-file) (princ ":" s)))
    730731      (let* ((indenting-stream (make-indenting-string-output-stream #\; 4)))
    731         (format indenting-stream "~%~a" w)
    732         (format s "~a~&" (get-output-stream-string indenting-stream))))
     732        (format indenting-stream ";~4t~a" w)
     733        (format s "~&~a~&" (get-output-stream-string indenting-stream))))
    733734    (values harsh-p any-p w-file)))
    734735
Note: See TracChangeset for help on using the changeset viewer.