From thenriksen at common-lisp.net Mon Aug 13 21:58:57 2007 From: thenriksen at common-lisp.net (thenriksen) Date: Mon, 13 Aug 2007 17:58:57 -0400 (EDT) Subject: [climacs-cvs] CVS climacs Message-ID: <20070813215857.4666E68244@common-lisp.net> Update of /project/climacs/cvsroot/climacs In directory clnet:/tmp/cvs-serv19723 Modified Files: climacs-lisp-syntax.lisp Log Message: Updated to work with changes in Drei's Lisp syntax module. --- /project/climacs/cvsroot/climacs/climacs-lisp-syntax.lisp 2006/12/10 19:44:56 1.3 +++ /project/climacs/cvsroot/climacs/climacs-lisp-syntax.lisp 2007/08/13 21:58:57 1.4 @@ -274,25 +274,26 @@ (insert-object point #\Newline))))) (defun compile-definition-interactively (mark syntax) - (let* ((token (definition-at-mark mark syntax)) + (let* ((token (definition-at-mark syntax mark)) (string (form-string syntax token)) (m (clone-mark mark)) (buffer-name (name (buffer syntax))) (*read-base* (base syntax))) (with-syntax-package (syntax mark) - (forward-definition m syntax) - (backward-definition m syntax) - (multiple-value-bind (result notes) - (compile-form-for-drei (get-usable-image syntax) - (form-to-object syntax token - :read t - :package (package-at-mark syntax mark)) - (buffer syntax) - m) - (show-note-counts notes (second result)) - (when (not (null notes)) - (show-notes notes buffer-name - (one-line-ify (subseq string 0 (min (length string) 20))))))))) + (forward-definition m syntax 1 nil) + (if (backward-definition m syntax 1 nil) + (multiple-value-bind (result notes) + (compile-form-for-drei (get-usable-image syntax) + (form-to-object syntax token + :read t + :package (package-at-mark syntax mark)) + (buffer syntax) + m) + (show-note-counts notes (second result)) + (when (not (null notes)) + (show-notes notes buffer-name + (one-line-ify (subseq string 0 (min (length string) 20)))))) + (display-message "No definition at point"))))) (defun compile-file-interactively (buffer &optional load-p) (cond ((null (filepath buffer)) From thenriksen at common-lisp.net Fri Aug 24 13:13:00 2007 From: thenriksen at common-lisp.net (thenriksen) Date: Fri, 24 Aug 2007 09:13:00 -0400 (EDT) Subject: [climacs-cvs] CVS climacs Message-ID: <20070824131300.DFD8E3700F@common-lisp.net> Update of /project/climacs/cvsroot/climacs In directory clnet:/tmp/cvs-serv4584 Modified Files: core.lisp Log Message: Handle syntax for filenames ending with a dot. --- /project/climacs/cvsroot/climacs/core.lisp 2006/11/12 16:06:06 1.11 +++ /project/climacs/cvsroot/climacs/core.lisp 2007/08/24 13:13:00 1.12 @@ -136,14 +136,17 @@ "." (pathname-type pathname)))) (defun syntax-class-name-for-filepath (filepath) - (or (drei-syntax::syntax-description-class-name - (find (or (pathname-type filepath) - (pathname-name filepath)) - drei-syntax::*syntaxes* - :test (lambda (x y) - (member x y :test #'string-equal)) - :key #'drei-syntax::syntax-description-pathname-types)) - *default-syntax*)) + (let ((syntax-description + (find (or (pathname-type filepath) + (pathname-name filepath)) + drei-syntax::*syntaxes* + :test (lambda (x y) + (member x y :test #'string-equal)) + :key #'drei-syntax::syntax-description-pathname-types))) + (if syntax-description + (drei-syntax::syntax-description-class-name + syntax-description) + *default-syntax*))) (defun evaluate-attributes (buffer options) "Evaluate the attributes `options' and modify `buffer' as