Changeset 13161 for release/1.4/source


Ignore:
Timestamp:
Nov 2, 2009, 5:32:30 PM (10 years ago)
Author:
rme
Message:

merge r13134 through r13135 from trunk

Location:
release/1.4/source/cocoa-ide/hemlock/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • release/1.4/source/cocoa-ide/hemlock/src/macros.lisp

    r12856 r13161  
    348348   these are errors that a normal user could encounter in the course of editing
    349349   such as a search failing or an attempt to delete past the end of the buffer."
    350   (let ((message (and args (apply #'format nil args))))
    351     (abort-current-command message)))
     350  (if (current-view)
     351    (let ((message (and args (apply #'format nil args))))
     352      (abort-current-command message))
     353    (apply #'error args)))
    352354
    353355
  • release/1.4/source/cocoa-ide/hemlock/src/main.lisp

    r12430 r13161  
    3333(defun %init-hemlock ()
    3434  "Initialize hemlock's internal data structures."
    35   ;;
    36   ;; This function is defined in Buffer.Lisp.  It creates fundamental mode
    37   ;; and the buffer main.  Until this is done it is not possible to define
    38   ;; or use Hemlock variables.
    39   (setup-initial-buffer)
    40   ;;
    41   ;; Define some of the system variables.
    42   (define-some-variables)
    43   ;;
    44   ;; Site initializations such as window system variables.
    45   (site-init)
    46   ;;
    47   ;; Set up syntax table data structures.
    48   (%init-syntax-table)
    49   ;;
    50   (setq *hemlock-initialized* t))
     35  (let ((*current-buffer* nil)) ;; don't set it globally
     36    ;;
     37    ;; This function is defined in Buffer.Lisp.  It creates fundamental mode
     38    ;; and the buffer main.  Until this is done it is not possible to define
     39    ;; or use Hemlock variables.
     40    (setup-initial-buffer)
     41    ;;
     42    ;; Define some of the system variables.
     43    (define-some-variables)
     44    ;;
     45    ;; Site initializations such as window system variables.
     46    (site-init)
     47    ;;
     48    ;; Set up syntax table data structures.
     49    (%init-syntax-table)
     50    ;;
     51    (setq *hemlock-initialized* t)))
    5152
    5253
Note: See TracChangeset for help on using the changeset viewer.