[Openmcl-cvs-notifications] r13161 - in /release/1.4/source/cocoa-ide/hemlock/src: macros.lisp main.lisp

[rme at clozure.com]

Author: rme
Date: Mon Nov  2 12:32:30 2009
New Revision: 13161

Log:
merge r13134 through r13135 from trunk

Modified:
    release/1.4/source/cocoa-ide/hemlock/src/macros.lisp
    release/1.4/source/cocoa-ide/hemlock/src/main.lisp

Modified: release/1.4/source/cocoa-ide/hemlock/src/macros.lisp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- release/1.4/source/cocoa-ide/hemlock/src/macros.lisp (original)
+++ release/1.4/source/cocoa-ide/hemlock/src/macros.lisp Mon Nov  2 12:32:3=
0 2009
@@ -342,8 +342,10 @@
   "This function is called to signal minor errors within Hemlock;
    these are errors that a normal user could encounter in the course of ed=
iting
    such as a search failing or an attempt to delete past the end of the bu=
ffer."
-  (let ((message (and args (apply #'format nil args))))
-    (abort-current-command message)))
+  (if (current-view)
+    (let ((message (and args (apply #'format nil args))))
+      (abort-current-command message))
+    (apply #'error args)))
 =0C
 ;;;; Do-Strings
 =


Modified: release/1.4/source/cocoa-ide/hemlock/src/main.lisp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- release/1.4/source/cocoa-ide/hemlock/src/main.lisp (original)
+++ release/1.4/source/cocoa-ide/hemlock/src/main.lisp Mon Nov  2 12:32:30 =
2009
@@ -31,22 +31,23 @@
 =

 (defun %init-hemlock ()
   "Initialize hemlock's internal data structures."
-  ;;
-  ;; This function is defined in Buffer.Lisp.  It creates fundamental mode
-  ;; and the buffer main.  Until this is done it is not possible to define
-  ;; or use Hemlock variables.
-  (setup-initial-buffer)
-  ;;
-  ;; Define some of the system variables.
-  (define-some-variables)
-  ;;
-  ;; Site initializations such as window system variables.
-  (site-init)
-  ;;
-  ;; Set up syntax table data structures.
-  (%init-syntax-table)
-  ;;
-  (setq *hemlock-initialized* t))
+  (let ((*current-buffer* nil)) ;; don't set it globally
+    ;;
+    ;; This function is defined in Buffer.Lisp.  It creates fundamental mo=
de
+    ;; and the buffer main.  Until this is done it is not possible to defi=
ne
+    ;; or use Hemlock variables.
+    (setup-initial-buffer)
+    ;;
+    ;; Define some of the system variables.
+    (define-some-variables)
+    ;;
+    ;; Site initializations such as window system variables.
+    (site-init)
+    ;;
+    ;; Set up syntax table data structures.
+    (%init-syntax-table)
+    ;;
+    (setq *hemlock-initialized* t)))
 =

 =0C
 ;;;; Define some globals.