Changeset 11747


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

Merge trunk changes through r11740.

Location:
release/1.3/source
Files:
9 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
  • release/1.3/source/cocoa-ide/hemlock/src/lispmode.lisp

    r8464 r11747  
    19591959                 (arglist-string (string-to-arglist fun-name (current-buffer))))
    19601960            (when arglist-string
    1961               (message arglist-string))))))))
     1961              (message "~a" arglist-string))))))))
    19621962
    19631963(defcommand "Arglist On Space" (p)
     
    19791979                          (string-to-arglist fun-name (current-buffer) t)))
    19801980                    (when arglist-string
    1981                       (message arglist-string))))
     1981                      (message "~a" arglist-string))))
    19821982              (if (ccl::whitespacep (next-character mark3))
    19831983                (mark-after mark3)
  • release/1.3/source/compiler/nx.lisp

    r11373 r11747  
    172172          (*record-pc-mapping* (and source-notes record-pc-mapping))
    173173          (*compile-code-coverage* (and source-notes compile-code-coverage))
    174           (*nx-acode-note-map* (and (or record-pc-mapping compile-code-coverage)
     174          (*nx-acode-note-map* (and (or *record-pc-mapping* *compile-code-coverage*)
    175175                                    (make-hash-table :test #'eq :shared nil)))
    176           (*nx-current-code-note* (and compile-code-coverage
     176          (*nx-current-code-note* (and *compile-code-coverage*
    177177                                       (make-code-note :form def :source-note function-note)))
    178178          (env (new-lexical-environment env)))
  • release/1.3/source/compiler/nx0.lisp

    r11391 r11747  
    4444(defvar *nx-inner-functions* nil)
    4545(defvar *nx-cur-func-name* nil)
    46 (defvar *nx-current-note*)
     46(defvar *nx-current-note* nil)
    4747(defparameter *nx-source-note-map* nil) ;; there might be external refs, from macros.
    4848(defvar *nx-form-type* t)
     
    18121812
    18131813(defun nx1-whine (about &rest forms)
     1814  (if #-BOOTSTRAPPED (fboundp 'compiler-warning-source-note) #+BOOTSTRAPPED T
     1815    (push (make-condition (or (cdr (assq about *compiler-whining-conditions*)) 'compiler-warning)
     1816                          :function-name (list *nx-cur-func-name*)
     1817                          :source-note *nx-current-note*
     1818                          :warning-type about
     1819                          :args (or forms (list nil)))
     1820          *nx-warnings*)
     1821    ;; remove this case once bootstrapped.
    18141822    (push (make-condition (or (cdr (assq about *compiler-whining-conditions*)) 'compiler-warning)
    18151823                          :function-name (list *nx-cur-func-name*)
    18161824                          :warning-type about
    18171825                          :args (or forms (list nil)))
    1818           *nx-warnings*)
     1826          *nx-warnings*))
    18191827  nil)
    18201828
  • release/1.3/source/level-0/l0-pred.lisp

    r11639 r11747  
    10131013(defun structure-typep (thing type)
    10141014  (if (= (the fixnum (typecode thing)) target::subtag-struct)
    1015 
    1016 
    10171015    (let* ((types (%svref thing 0)))
    10181016      (if (typep type 'symbol)
  • release/1.3/source/level-1/l1-error-system.lisp

    r11673 r11747  
    6666   (stream-position :initform nil :accessor compiler-warning-stream-position)
    6767   (function-name :initarg :function-name :initform nil :accessor compiler-warning-function-name)
     68   (source-note :initarg :source-note :initform nil :accessor compiler-warning-source-note)
    6869   (warning-type :initarg :warning-type :reader compiler-warning-warning-type)
    6970   (args :initarg :args :reader compiler-warning-args)
  • release/1.3/source/level-1/l1-files.lisp

    r11629 r11747  
    491491
    492492(defun %path-from-stream (stream)
    493   (or (stream-filename stream) (error "Can't determine pathname of ~S ." stream)))      ; ???
     493  (or (pathname (stream-filename stream)) (error "Can't determine pathname of ~S ." stream)))      ; ???
    494494
    495495;Like (pathname stream) except returns NIL rather than error when there's no
     
    11491149        (kind nil))
    11501150    (when full-name
    1151       (when (eq (pathname-host file-name) :unspecific) ;; if physical pathname to begin with, force absolute
    1152         (setq file-name full-name))
    11531151      (let ((file-type (pathname-type full-name)))
    11541152        (if (and file-type (neq file-type :unspecific))
  • release/1.3/source/lib/describe.lisp

    r11162 r11747  
    14951495
    14961496(defmethod line-n ((thread thread-inspector) n)
    1497   (declare (ignore n))
     1497  (declare (ignorable n))
     1498  (call-next-method)
    14981499)
    14991500
  • release/1.3/source/lib/macros.lisp

    r11687 r11747  
    748748     (eval-when (:compile-toplevel)
    749749       (note-variable-info ',var :global ,env))
     750      (%symbol-bits ',var (logior (ash 1 $sym_vbit_global) (the fixnum (%symbol-bits ',var))))
    750751     (%defvar-init ,var ,value ,doc)))
    751752
Note: See TracChangeset for help on using the changeset viewer.