Update of /project/hyperdoc/cvsroot/src In directory common-lisp.net:/tmp/cvs-serv16212

Modified Files: slime.patch Log Message: Patch for current Slime. Date: Sat Apr 24 16:07:03 2004 Author: nsiivola

Index: src/slime.patch diff -u src/slime.patch:1.1.1.1 src/slime.patch:1.2 --- src/slime.patch:1.1.1.1 Mon Nov 17 10:28:47 2003 +++ src/slime.patch Sat Apr 24 16:07:03 2004 @@ -1,34 +1,26 @@ -? slime.patch +? fasl Index: slime.el =================================================================== RCS file: /project/slime/cvsroot/slime/slime.el,v -retrieving revision 1.91 -diff -u -r1.91 slime.el ---- slime.el 13 Nov 2003 22:42:08 -0000 1.91 -+++ slime.el 14 Nov 2003 18:51:42 -0000 -@@ -56,7 +56,8 @@ - (require 'cl) - (require 'pp) - (require 'hideshow) --(require 'hyperspec) -+(require 'browse-url) -+;(require 'hyperspec) - (require 'font-lock) - (when (featurep 'xemacs) - (require 'overlay)) -@@ -368,7 +369,7 @@ +retrieving revision 1.275 +diff -u -r1.275 slime.el +--- slime.el 23 Apr 2004 22:09:11 -0000 1.275 ++++ slime.el 24 Apr 2004 20:06:19 -0000 +@@ -485,7 +485,7 @@ ("\C-m" slime-macroexpand-1 :prefixed t :inferior t) ("\M-m" slime-macroexpand-all :prefixed t :inferior t) ("\M-0" slime-restore-window-configuration :prefixed t :inferior t) -- ("\C-h" hyperspec-lookup :prefixed t :inferior t :sldb t) +- ("\C-h" slime-hyperspec-lookup :prefixed t :inferior t :sldb t) + ("\C-h" slime-hyperdoc-key :prefixed t :inferior t :sldb t) ([(control meta ?.)] slime-next-location :inferior t) - ("\C- " slime-next-location :prefixed t :inferior t) - ("~" slime-sync-package-and-default-directory :prefixed t :inferior t) -@@ -4135,6 +4136,19 @@ + ;; Emacs20 on LinuxPPC signals a + ;; "Invalid character: 400000040, 2147479172, 0xffffffd8" +@@ -6619,6 +6619,20 @@ + (defun sldb-xemacs-post-command-hook () + (when (get-text-property (point) 'point-entered) (funcall (get-text-property (point) 'point-entered)))) - -  ++ ++ +;;; Hyperdoc +(defun slime-hyperdoc-key () + (interactive) @@ -41,52 +33,38 @@ + (slime-buffer-package) + (lambda (uri) + (browse-url uri)))) -+ - ;;; Finishing up

- (run-hooks 'slime-load-hook) +  + ;;; Finishing up Index: swank-sbcl.lisp =================================================================== RCS file: /project/slime/cvsroot/slime/swank-sbcl.lisp,v -retrieving revision 1.22 -diff -u -r1.22 swank-sbcl.lisp ---- swank-sbcl.lisp 13 Nov 2003 00:36:56 -0000 1.22 -+++ swank-sbcl.lisp 14 Nov 2003 18:51:42 -0000 -@@ -38,8 +38,10 @@ - ;;; Administrivia - - (eval-when (:compile-toplevel :load-toplevel :execute) -+ (require :asdf) +retrieving revision 1.83 +diff -u -r1.83 swank-sbcl.lisp +--- swank-sbcl.lisp 6 Apr 2004 10:42:53 -0000 1.83 ++++ swank-sbcl.lisp 24 Apr 2004 20:06:19 -0000 +@@ -40,6 +40,7 @@ (require 'sb-bsd-sockets) -- (require 'sb-introspect)) -+ (require 'sb-introspect) -+ (require 'hyperdoc)) + (require 'sb-introspect) + (require 'sb-posix) ++ (require 'hyperdoc) + )

(declaim (optimize (debug 3))) - (in-package :swank) -@@ -649,6 +651,10 @@ - - (defslimefun sldb-abort () - (invoke-restart (find 'abort *sldb-restarts* :key #'restart-name))) -+ -+;;; Hax -+(defslimefun hyperdoc (name) -+ (hyperdoc:lookup (find-symbol-designator name *buffer-package*))) - - ;;; Local Variables: - ;;; eval: (font-lock-add-keywords 'lisp-mode '(("(\(defslimefun\)\s +\(\(\w\|\s_\)+\)" (1 font-lock-keyword-face) (2 font-lock-function-name-face)))) Index: swank.lisp =================================================================== RCS file: /project/slime/cvsroot/slime/swank.lisp,v -retrieving revision 1.57 -diff -u -r1.57 swank.lisp ---- swank.lisp 13 Nov 2003 00:22:01 -0000 1.57 -+++ swank.lisp 14 Nov 2003 18:51:43 -0000 -@@ -518,7 +518,6 @@ - (defslimefun throw-to-toplevel () - (throw 'slime-toplevel nil)) +retrieving revision 1.171 +diff -u -r1.171 swank.lisp +--- swank.lisp 22 Apr 2004 21:37:50 -0000 1.171 ++++ swank.lisp 24 Apr 2004 20:06:20 -0000 +@@ -2063,6 +2063,9 @@ + (with-connection (connection) + (simple-break))))))

-- ++(defslimefun hyperdoc (name) ++ (hyperdoc:lookup (find-symbol-designator name *buffer-package*))) ++ ;;; Local Variables: ;;; eval: (font-lock-add-keywords 'lisp-mode '(("(\(defslimefun\)\s +\(\(\w\|\s_\)+\)" (1 font-lock-keyword-face) (2 font-lock-function-name-face)))) ;;; End: