[slime-cvs] CVS slime

CVS User heller heller at common-lisp.net
Sat Apr 7 08:19:32 UTC 2012


Update of /project/slime/cvsroot/slime
In directory tiger.common-lisp.net:/tmp/cvs-serv19541

Modified Files:
	ChangeLog slime.el swank.lisp 
Log Message:
Fix long lines.

* swank.lisp:
* slime.el:
* ChangeLog:

--- /project/slime/cvsroot/slime/ChangeLog	2012/04/06 20:04:34	1.2309
+++ /project/slime/cvsroot/slime/ChangeLog	2012/04/07 08:19:32	1.2310
@@ -1,3 +1,11 @@
+2012-04-07  Helmut Eller  <heller at common-lisp.net>
+
+	Fix long lines.
+
+	* swank.lisp:
+	* slime.el:
+	* ChangeLog:
+
 2012-04-06  Stas Boukarev  <stassats at gmail.com>
 
 	* swank.lisp (interrupt-worker-thread): Interrupt the REPL thread if
@@ -6,9 +14,10 @@
 
 2012-03-30  Nikodemus Siivola  <nikodemus at random-state.net>
 
-	* swank-sbcl.lisp (lisp-source-location): When processing a STEP-FORM-CONDITION,
-	don't show the initial form from expansion of STEP. (Currently SBCL doesn't
-	give the form at all, but when it does seeing it is distinctly useless.)
+	* swank-sbcl.lisp (lisp-source-location): When processing a
+	STEP-FORM-CONDITION, don't show the initial form from expansion of
+	STEP. (Currently SBCL doesn't give the form at all, but when it
+	does seeing it is distinctly useless.)
 
 2012-03-26  Helmut Eller  <heller at common-lisp.net>
 
@@ -1072,13 +1081,13 @@
 	* swank-cmucl.lisp (codepoint-length): Implement codepoint-length
 	to return the number of codepoints in cmucl's utf-16 strings.
 
-	* swank-backend.lisp (:swank-backend): Export codepoint-length. 
+	* swank-backend.lisp (:swank-backend): Export codepoint-length.
 	(codepoint-length): definterface codepoint-length.  Default is to
 	use LENGTH.
 
 	* swank-rpc.lisp (write-message): Call
 	swank-backend:codepoint-length to get the correct length for
-	emacs. 
+	emacs.
 
 2010-10-08  Christophe Rhodes  <csr21 at cantab.net>
 
@@ -2457,11 +2466,13 @@
 
 2010-01-20  Terje Norderhaug <terje at in-progress.com>
 
-	* swank.lisp (with-swank-protocol-error-handler): Refactor using safe-backtrace.
-	* swank-rpc.lisp (make-swank-protocol-error): Delete call to swank:safe-backtrace
-	to eliminate dependency on swank.lisp module.
-	* swank-rpc.lisp (swank-protocol-error): Remove swank-protocol-error.backtrace
-	as the capture of a safe-backtrace is covered by with-swank-protocol-error-handler.
+	* swank.lisp (with-swank-protocol-error-handler): Refactor using
+	safe-backtrace.
+	* swank-rpc.lisp (make-swank-protocol-error): Delete call to
+	swank:safe-backtrace to eliminate dependency on swank.lisp module.
+	* swank-rpc.lisp (swank-protocol-error): Remove
+	swank-protocol-error.backtrace as the capture of a safe-backtrace
+	is covered by with-swank-protocol-error-handler.
 
 2010-01-20  Stas Boukarev  <stassats at gmail.com>
 
@@ -4626,8 +4637,8 @@
 2009-01-15  Martin Simmons  <martin at lispworks.com>
 
 	* swank-lispworks.lisp: wrapper functions for swank-mop
- 	slot-boundp-using-class, slot-value-using-class and
- 	slot-makunbound-using-class to account for MOP differences.
+	slot-boundp-using-class, slot-value-using-class and
+	slot-makunbound-using-class to account for MOP differences.
 
 2009-01-16  Helmut Eller  <heller at common-lisp.net>
 
@@ -6034,7 +6045,8 @@
 
 2008-08-25  Tobias C. Rittweiler  <tcr at freebits.de>
 
-	* slime.el (slime-compute-modeline-package): Used `when-let' before its definition.
+	* slime.el (slime-compute-modeline-package): Used `when-let'
+	before its definition.
 	(slime-compute-modeline-string): Display "PKG:" before "CON:".
 
 2008-08-22  Helmut Eller  <heller at common-lisp.net>
@@ -7000,7 +7012,7 @@
 
 
 2008-04-17  Travis Cross <travis at travislists.com>
-	
+
 	* swank.asd: Don't make a compile-op a no-op so that a
 	swank-loader.fasl file gets generated and (require 'swank) can be
 	called multiple times.
@@ -7009,7 +7021,7 @@
 
 	C-c C-c with prefix args now uses the maximal debug level.
 	Only implemented for SBCL.
-	
+
 	* slime.el (slime-compile-with-maximum-debug): New variable.
 	(slime-compile-defun, slime-compile-region): Use it.
 
@@ -7032,7 +7044,7 @@
 
 2008-03-26  Tobias C. Rittweiler  <tcr at freebits.de>
 
-	On SBCL, 
+	On SBCL,
 
 	  (block outta
 	    (let ((*debugger-hook* #'(lambda (c hook)
@@ -7042,7 +7054,7 @@
 
 	would just silently skip over the *DEBUGGER-HOOK*, and pop right
 	into SLDB to handle the error. Fix that.
-	
+
 	* swank-sbcl (make-invoke-debugger-hook): New function; returns a
 	hook for SB-EXT:*INVOKE-DEBUGGER-HOOK* that checks for the
 	presence of *DEBUGGER-HOOK*, and calls that if available.
@@ -7056,7 +7068,7 @@
 	turns into SLDB even when *DEBUGGER-HOOK* is locally bound.
 	(def-slime-test locally-bound-debugger-hook): New test case; tests
 	that a locally-bound *DEBUGGER-HOOK* is adhered, and not skipped.
-	
+
 2008-03-26  Helmut Eller  <heller at common-lisp.net>
 
 	By default, don't ask if SLIME should be started.
@@ -7077,7 +7089,7 @@
 
 2008-03-24  Tobias C. Rittweiler  <tcr at freebits.de>
 
-	* HACKING: Updated due to broken links. 
+	* HACKING: Updated due to broken links.
 	Reported by Mirko Vukovic.
 
 2008-03-24  Tobias C. Rittweiler  <tcr at freebits.de>
@@ -7085,15 +7097,15 @@
 	* slime.el (slime-set-connection-info): Display SLIME and SWANK
 	versions explicitly in Protocol Mismatch message.  Adapted from
 	idea and patch by Jeronimo Pellegrini.
-	
+
 2008-03-24  Tobias C. Rittweiler  <tcr at freebits.de>
 
-	* swank-source-path-parser.lisp 
+	* swank-source-path-parser.lisp
 
 	The source parser READs in files, and if such a file contains some
 	nasty #. hackery that results in an error being signalled, M-. would
 	fail on anything that's defined in those files. Fix that by using
-	a special #. reader function that invokes the original #. reader 
+	a special #. reader function that invokes the original #. reader
 	with an IGNORE-ERRORS wrapped around.
 
 	(make-sharpdot-reader): New function.
@@ -7121,7 +7133,7 @@
 	directly, since CL:FILE-POSITION may not return character but
 	binary offsets on such streams; instead slurp file content into a
 	buffer string, and operate on that.
-	
+
 2008-03-16  Tobias C. Rittweiler  <tcr at freebits.de>
 
 	* swank.lisp (load-file-set-package): Removed; the function was
@@ -7253,7 +7265,7 @@
 	and not
 
 	  |(defun read-from-emacs ...)
-	
+
 	* swank-sbcl.lisp (source-file-position): Don't 1+ the returned
 	position; i.e. return a position usable as a CL /file position/
 	which start from 0, and not a position usable in Emacs where
@@ -7352,7 +7364,7 @@
 	(slime-analyze-xrefs): Use it; display definitions defined
 	interactively via C-c C-c as comming from #<buffer foo.lisp>
 	instead of foo.lisp.
-		
+
 2008-02-20  Helmut Eller  <heller at common-lisp.net>
 
 	Better factorization for M-. and xref commands.
@@ -7589,7 +7601,7 @@
 
 	New hooks that allow the slime-presentations contrib to hook
 	into the debugger and inspector.
-	
+
 	* slime.el (sldb-insert-frame-variable-value-function): New
 	variable.
 	(sldb-insert-frame-variable-value): New function, default value
@@ -7602,7 +7614,7 @@
 2008-01-20  Matthias Koeppe  <mkoeppe at mail.math.uni-magdeburg.de>
 
 	* doc/slime.texi (Presentations): Improve documentation of
-	presentations. 
+	presentations.
 
 2008-01-19  Geo Carncross  <geocar at gmail.com>
 
@@ -7621,20 +7633,20 @@
 	close the debugging machinery on swank side when the SLDB buffer
 	is killed. (Notice that killing the SLDB buffer manually will not
 	restore window configuration in contrast to typing `q'.)
-	
+
 2008-01-10  Tobias C. Rittweiler  <tcr at freebits.de>
 
 	* slime.el (slime-delete-and-extract-region): New
 	function. Portable version of `delete-and-extract-region' which
 	returned NIL instead of "", as experienced by Matthias Koeppe.
-	
+
 2008-01-09  Matthias Koeppe  <mkoeppe at mail.math.uni-magdeburg.de>
 
 	* slime.el (slime-repl-mode-map): Bind C-c C-t to
 	slime-toggle-trace-fdefinition (as in Lisp buffers) instead of
 	slime-repl-clear-buffer.  This binding is useful for untracing
 	functions directly from the trace output.  Move
-	slime-repl-clear-buffer to the keybinding C-c M-o. 
+	slime-repl-clear-buffer to the keybinding C-c M-o.
 
 2008-01-04  Juho Snellman  <jsnell at iki.fi>
 
@@ -7645,7 +7657,7 @@
 	(code-location-debug-source-name): Ensure that we always return a
 	physical namestring, Emacs won't like a pathname or a logical
 	namestring.
-	
+
 2008-01-02  Luís Oliveira  <loliveira at common-lisp.net>
 
 	Use sane default values for slime-repl-set-package.
@@ -7654,24 +7666,24 @@
 	would have been inserted as a default (although the whole intent
 	was to /change/ the current package in the first place), now
 	nothing is inserted anymore.
-	
+
 	* slime.el (slime-pretty-current-package): rename it to
 	slime-pretty-find-buffer-package and make it use
 	slime-find-buffer-package instead of slime-current-package.
 	(slime-repl-set-package, slime-set-package): use new function.
-	
+
 2008-01-02  Tobias C. Rittweiler  <tcr at freebits.de>
 
 	* slime.el (slime-print-apropos): Simplified: Don't insert action
 	properties anymore for the symbol; they were ignored anyway,
-	because `apropos-follow' (bound to RET in the resulting 
+	because `apropos-follow' (bound to RET in the resulting
 	*SLIME Apropos* buffer) looks for buttons only.
 
 2008-01-02  Tobias C. Rittweiler  <tcr at freebits.de>
 
 	* slime.el (slime-apropos): Update docstring: Apropos doesn't
 	match on regular expressions anymore since 2007-11-24.
-	
+
 2007-12-22  Douglas Crosher <dcrosher at common-lisp.net>
 
 	* swank-scl.lisp (set-stream-timeout, make-socket-io-stream): update
@@ -7691,7 +7703,7 @@
 
 	* slime.el (slime-insert-xref-location): New function. Tries to
 	either insert the file name a function is defined in, or inserts
-	information about the buffer a function was interactively 
+	information about the buffer a function was interactively
 	`C-c C-c'd from. Idea from Knut Olav Bøhmer.
 	(slime-insert-xrefs): Use it.
 
@@ -7833,9 +7845,9 @@
 	active; if [return] is bound to something, pressing enter is
 	translated to this key binding henceforth, as was explained to me
 	by Pierre Gaston, thanks! This can cause quite confusing behaviour
-	as Andreas Davour faced in his post <cs9k5ofqbt7.fsf at Psilocybe.Update.UU.SE> 
-	to comp.lang.lisp.
-	
+	as Andreas Davour faced in his post
+	<cs9k5ofqbt7.fsf at Psilocybe.Update.UU.SE> to comp.lang.lisp.
+
 2007-11-06  Helmut Eller  <heller at common-lisp.net>
 
 	* slime.el (slime-events-buffer, slime-inspector-buffer): Disable
@@ -7874,7 +7886,7 @@
 	string representation.
 
 	* slime.el (slime-open-inspector): Adapted for new header layout.
-	
+
 2007-10-22  Tobias C. Rittweiler  <tcr at freebits.de>
 
 	* swank.lisp (read-softly-from-string, unintern-in-home-package):
@@ -7892,7 +7904,7 @@
 2007-10-22  Mark Evenson  <mark.evenson at gmx.at>
 
 	* swank-abcl.lisp (getpid): Implemented.
-	
+
 2007-10-22  R. Matthew Emerson  <rme at thoughtstuff.com>
 
 	* swank-openmcl.lisp (closure-closed-over-values): Use
@@ -7998,9 +8010,9 @@
 
 	* slime.el (slime-maybe-warn-for-different-source-root): Catch
 	returned NIL from `slime-file-name-merge-source-root' if the two
-	filenames don't share a common source root. 
+	filenames don't share a common source root.
 	Reported by Frank Goenninger.
-	
+
 2007-09-15  Tobias C. Rittweiler  <tcr at freebits.de>
 
 	* slime.el (slime-split-string): New semi-portability function.
@@ -8071,7 +8083,7 @@
 2007-09-10  Tobias C. Rittweiler  <tcr at freebits.de>
 
 	* slime.el (slime-cl-symbol-name, slime-cl-symbol-package):
-	Ressurected, as they're still used in this file. 
+	Ressurected, as they're still used in this file.
 	Reported by Edward Cant.
 
 2007-09-10  Tobias C. Rittweiler  <tcr at freebits.de>
@@ -8097,14 +8109,14 @@
 	There's no guarantee that all possible cases are covered, but if
 	you encounter such a warning, it's a strong indication that you
 	should check twice before modifying.
-	
+
 	* slime.el (slime-file-name-merge-source-root): New function.
 	(slime-highlight-differences-in-dirname): New function.
 	(slime-maybe-warn-for-different-source-root): New function.
 	(slime-warn-when-possibly-tricked-by-M-.): New variable (T by default.)
 	(slime-goto-location-buffer): Where appropriate, call
 	`slime-maybe-warn-for-different-source-root'
-	
+
 2007-09-08  Stelian Ionescu  <sionescu at common-lisp.net>
 
 	* slime.el (save-restriction-if-possible): Place macro definition
@@ -8239,7 +8251,7 @@
 	  the PPC-Darwin version. Changed to conditionalize on the
 	  presence of darwin instead of ppc so that slime works with both
 	  Darwin versions of CMUCL.
-	
+
 2007-08-31  Tobias C. Rittweiler <tcr at freebits.de>
 
 	* slime.el (slime-sexp-at-point): Explicitely set current syntax
@@ -8271,9 +8283,9 @@
 	lost).  Testcase: Type (dotimes (i 5) (format t "Number ~A~%"
 	i) (sleep 1)) and then type ahead while the command is executing
 	and output arrives.
-	
+
 	* slime.el (slime-repl-insert-prompt): Don't go to point-max but
-	to slime-repl-input-start-mark if there is one.  
+	to slime-repl-input-start-mark if there is one.
 	(slime-repl-write-string): Insert a :repl-result before the
 	prompt, not at point-max.  Update markers properly.
 
@@ -8340,10 +8352,10 @@
 	Remove the ID argument from :write-string protocol messages.
 	Everything, except for rigid-indentation tricks, can be achieved
 	by using :write-string in conjunction with :presentation-start and
-	:presentation-end. 
-	
+	:presentation-end.
+
 	* swank.lisp (present-in-emacs): Unused, removed.
-	
+
 	* swank.lisp (make-output-function-for-target): Remove id argument
 	from :write-string.
 	(send-repl-results-to-emacs): Don't call
@@ -8362,7 +8374,7 @@
 	to end of symbol at point.
 	(slime-make-form-spec-from-string): Fixes unexpected behaviour of
 	`save-excursion'.
-	
+
 2007-08-27  Tobias C. Rittweiler <tcr at freebits.de>
 
 	* slime.el (slime-sexp-at-point): Fixes a few edge cases were
@@ -8382,7 +8394,7 @@
 	against a possible endless recursion.
 
 	* swank.lisp (parse-form-spec): Looses restriction for nesting.
-	
+
 2007-08-27  Helmut Eller  <heller at common-lisp.net>
 
 	* slime.el (slime-eval-feature-conditional): Fix typo.
@@ -8406,7 +8418,7 @@
 	recent work on autodoc to a minimum. Also fixes this issue for
 	`slime-complete-form' which always interned symbols even before my
 	changes.
-	

[3656 lines skipped]
--- /project/slime/cvsroot/slime/slime.el	2012/03/26 15:36:50	1.1395
+++ /project/slime/cvsroot/slime/slime.el	2012/04/07 08:19:32	1.1396
@@ -406,8 +406,10 @@
 \\[slime-remove-notes]	- Remove compiler-note annotations in buffer.
 
 Finding definitions:
-\\[slime-edit-definition]	- Edit the definition of the function called at point.
-\\[slime-pop-find-definition-stack]	- Pop the definition stack to go back from a definition.
+\\[slime-edit-definition]	\
+- Edit the definition of the function called at point.
+\\[slime-pop-find-definition-stack]	\
+- Pop the definition stack to go back from a definition.
 
 Documentation commands:
 \\[slime-describe-symbol]	- Describe symbol.
@@ -417,7 +419,8 @@
 Evaluation commands:
 \\[slime-eval-defun]	- Evaluate top-level from containing point.
 \\[slime-eval-last-expression]	- Evaluate sexp before point.
-\\[slime-pprint-eval-last-expression]	- Evaluate sexp before point, pretty-print result.
+\\[slime-pprint-eval-last-expression]	\
+- Evaluate sexp before point, pretty-print result.
 
 Full set of commands:
 \\{slime-mode-map}"
@@ -2670,8 +2673,8 @@
 (defun slime-compile-region (start end)
   "Compile the region."
   (interactive "r")
-  ;; Check connection before running hooks
-  ;; things like slime-flash-region don't make much sense if there's no connection
+  ;; Check connection before running hooks things like
+  ;; slime-flash-region don't make much sense if there's no connection
   (slime-connection)
   (slime-flash-region start end)
   (run-hook-with-args 'slime-before-compile-functions start end)
@@ -3189,8 +3192,10 @@
  
         ==> \"/usr/local/src/joe/hacked/sbcl/code/late-extensions.lisp\"
 "
-  (let ((target-dirs (slime-split-string (file-name-directory target-filename) "/" t))
-        (buffer-dirs (slime-split-string (file-name-directory buffer-filename) "/" t)))
+  (let ((target-dirs (slime-split-string (file-name-directory target-filename)
+                                         "/" t))
+        (buffer-dirs (slime-split-string (file-name-directory buffer-filename)
+                                         "/" t)))
     ;; Starting from the end, we look if one of the TARGET-DIRS exists
     ;; in BUFFER-FILENAME---if so, it and everything left from that dirname
     ;; is considered to be the source root directory of BUFFER-FILENAME.
@@ -3203,12 +3208,17 @@
                (let ((pos (position target-dir buffer-dirs* :test #'equal)))
                  (if (not pos)    ; TARGET-DIR not in BUFFER-FILENAME?
                      (push target-dir target-suffix-dirs)
-                     (let* ((target-suffix (concat-dirs target-suffix-dirs)) ; PUSH reversed for us!
-                            (buffer-root   (concat-dirs (reverse (nthcdr pos buffer-dirs*)))))
+                     (let* ((target-suffix 
+                                        ; PUSH reversed for us!
+                             (concat-dirs target-suffix-dirs)) 
+                            (buffer-root   
+                             (concat-dirs 
+                              (reverse (nthcdr pos buffer-dirs*)))))
                        (return (concat (slime-filesystem-toplevel-directory)
                                        buffer-root
                                        target-suffix
-                                       (file-name-nondirectory target-filename))))))))))
+                                       (file-name-nondirectory 
+                                        target-filename))))))))))
 
 (defun slime-highlight-differences-in-dirname (base-dirname contrast-dirname)
   "Returns a copy of BASE-DIRNAME where all differences between
@@ -3230,7 +3240,8 @@
                 (if (not pos)
                     (insert-dir/propzd base-dir)
                     (progn (insert-dir base-dir)
-                           (setq contrast-dirs (nthcdr (1+ pos) contrast-dirs))))))
+                           (setq contrast-dirs 
+                                 (nthcdr (1+ pos) contrast-dirs))))))
         (buffer-substring (point-min) (point-max))))))
 
 (defvar slime-warn-when-possibly-tricked-by-M-. t
@@ -3255,7 +3266,8 @@
 if you encounter such a warning, it's a strong indication that
 you should check twice before modifying.")
 
-(defun slime-maybe-warn-for-different-source-root (target-filename buffer-filename)
+(defun slime-maybe-warn-for-different-source-root (target-filename 
+                                                   buffer-filename)
   (let ((guessed-target (slime-file-name-merge-source-root target-filename
                                                            buffer-filename)))
     (when (and guessed-target
@@ -3269,7 +3281,8 @@
 
 (defun slime-check-location-filename-sanity (filename)
   (when slime-warn-when-possibly-tricked-by-M-.
-    (flet ((file-truename-safe (filename) (and filename (file-truename filename))))
+    (flet ((file-truename-safe (filename) (and filename 
+                                               (file-truename filename))))
       (let ((target-filename (file-truename-safe filename))
             (buffer-filename (file-truename-safe (buffer-file-name))))
         (when (and target-filename
@@ -3368,14 +3381,17 @@
          (name (regexp-quote name))
          (qualifiers (mapconcat (lambda (el) (concat ".+?\\<" el "\\>"))
                                 qualifiers ""))
-         (specializers (mapconcat (lambda (el) 
-                                    (if (eql (aref el 0) ?\()
-                                        (let ((spec (read el)))
-                                          (if (eq (car spec) 'EQL)
-                                              (concat ".*?\\n\\{0,1\\}.*?(EQL.*?'\\{0,1\\}"
-                                                      (format "%s" (second spec)) ")")
-                                            (error "don't understand specializer: %s,%s" el (car spec))))
-                                      (concat ".+?\n\\{0,1\\}.+?\\<" el "\\>")))
+         (specializers (mapconcat 
+                        (lambda (el) 
+                          (if (eql (aref el 0) ?\()
+                              (let ((spec (read el)))
+                                (if (eq (car spec) 'EQL)
+                                    (concat 
+                                     ".*?\\n\\{0,1\\}.*?(EQL.*?'\\{0,1\\}"
+                                     (format "%s" (second spec)) ")")
+                                  (error "don't understand specializer: %s,%s"
+                                         el (car spec))))
+                            (concat ".+?\n\\{0,1\\}.+?\\<" el "\\>")))
                                   (remove "T" specializers) ""))
          (regexp (format "\\s *(def\\(\\s_\\|\\sw\\)*\\s +%s\\s +%s%s" name
                          qualifiers specializers)))
@@ -3422,7 +3438,7 @@
              | (:line <line> [<column>])
              | (:function-name <string>)
              | (:source-path <list> <start-position>) 
-             | (:method <name string> <specializer strings> . <qualifiers strings>)"
+             | (:method <name string> <specializers> . <qualifiers>)"
   (destructure-case location
     ((:location buffer _position _hints)
      (slime-goto-location-buffer buffer)
@@ -3687,7 +3703,8 @@
     (error
      ;; Because this is called on the pre-command-hook, we mustn't let
      ;; errors propagate.
-     (message "Error in slime-complete-restore-window-configuration: %S" err))))
+     (message "Error in slime-complete-restore-window-configuration: %S"
+              err))))
 
 (defun slime-completion-window-active-p ()
   "Is the completion window currently active?"
@@ -3760,8 +3777,9 @@
 (defun slime-maybe-complete-as-filename ()
   "If point is at a string starting with \", complete it as filename.
 Return nil if point is not at filename."
-  (when (save-excursion (re-search-backward "\"[^ \t\n]+\\=" (max (point-min)
-                                                                  (- (point) 1000)) t))
+  (when (save-excursion (re-search-backward "\"[^ \t\n]+\\=" 
+                                            (max (point-min)
+                                                 (- (point) 1000)) t))
     (let ((comint-completion-addsuffix '("/" . "\"")))
       (comint-replace-by-expanded-filename)
       t)))
@@ -6820,8 +6838,9 @@
   ("g" 'slime-inspector-reinspect)
   ("v" 'slime-inspector-toggle-verbose)
   ("\C-i" 'slime-inspector-next-inspectable-object)
-  ([(shift tab)] 'slime-inspector-previous-inspectable-object) ; Emacs translates S-TAB
-  ([backtab]     'slime-inspector-previous-inspectable-object) ; to BACKTAB on X.
+  ([(shift tab)] 
+   'slime-inspector-previous-inspectable-object) ; Emacs translates S-TAB
+  ([backtab] 'slime-inspector-previous-inspectable-object) ; to BACKTAB on X.
   ("." 'slime-inspector-show-source)
   (">" 'slime-inspector-fetch-all))
 
@@ -6996,7 +7015,8 @@
                      (get symbol 'slime-indent))
           (put symbol 'common-lisp-indent-function indent)
           (put symbol 'slime-indent indent)))
-      (run-hook-with-args 'slime-indentation-update-hooks symbol indent packages))))
+      (run-hook-with-args 'slime-indentation-update-hooks 
+                          symbol indent packages))))
 
 
 ;;;; Contrib modules
@@ -7211,7 +7231,8 @@
                 (slime-compile-defun "Compile current top level form")
                 (slime-interactive-eval "Prompt for form and eval it")
                 (slime-compile-and-load-file "Compile and load current file")
-                (slime-sync-package-and-default-directory "Synch default package and directory with current buffer")
+                (slime-sync-package-and-default-directory 
+                 "Synch default package and directory with current buffer")
                 (slime-next-note "Next compiler note")
                 (slime-previous-note "Previous compiler note")
                 (slime-remove-notes "Remove notes")
@@ -7229,11 +7250,14 @@
                 (sldb-continue "Invoke CONTINUE restart (if available)")
                 (sldb-show-source "Jump to frame's source code")
                 (sldb-eval-in-frame "Evaluate in frame at point")
-                (sldb-inspect-in-frame "Evaluate in frame at point and inspect result")))
+                (sldb-inspect-in-frame 
+                 "Evaluate in frame at point and inspect result")))
     (:title "Within the Inspector" 
      :map slime-inspector-mode-map
-     :bindings ((slime-inspector-next-inspectable-object "Jump to next inspectable object")
-                (slime-inspector-operate-on-point "Inspect object or execute action at point")
+     :bindings ((slime-inspector-next-inspectable-object 
+                 "Jump to next inspectable object")
+                (slime-inspector-operate-on-point 
+                 "Inspect object or execute action at point")
                 (slime-inspector-reinspect "Reinspect current object")
                 (slime-inspector-pop "Return to previous object")
                 ;;(slime-inspector-copy-down "Send object at point to REPL")
@@ -7541,8 +7565,10 @@
                        (name  (first name))
                        (fails-for (cdr (assq :fails-for opts)))
                        (style (cdr (assq :style opts))))
-                  ;; :style and :fails-for only options, given no more than one time?
-                  (assert (null (remove* :style (remove* :fails-for opts :key #'car)
+                  ;; :style and :fails-for only options,
+                  ;; given no more than one time?
+                  (assert (null (remove* :style 
+                                         (remove* :fails-for opts :key #'car)
                                          :key #'car)))
                   (values name fails-for style))))
     (let ((fname (intern (format "slime-test-%s" name))))
@@ -7787,17 +7813,20 @@
        (slime-buffer-narrowed-p))
 
       (slime-with-popup-buffer (random-buffer-name)
-        (slime-check ("Checking that we're in Slime's temp buffer `%s'" random-buffer-name)
+        (slime-check ("Checking that we're in Slime's temp buffer `%s'" 
+                      random-buffer-name)
           (equal (buffer-name (current-buffer)) random-buffer-name)))
       (with-current-buffer random-buffer-name
         ;; Notice that we cannot quit the buffer within the the extent
         ;; of slime-with-output-to-temp-buffer.
         (slime-popup-buffer-quit t)) 
-      (slime-check ("Checking that we've got back from `%s'" random-buffer-name)
+      (slime-check ("Checking that we've got back from `%s'" 
+                    random-buffer-name)
         (and (eq (current-buffer) tmpbuffer)
              (= (point) defun-pos)))
       
-      (slime-check "Checking that narrowing sustained after quitting Slime's temp buffer."
+      (slime-check "Checking that narrowing sustained \
+after quitting Slime's temp buffer."
         (slime-buffer-narrowed-p))
 
       (let ((slime-buffer-package "SWANK")
@@ -7902,9 +7931,11 @@
       ("swank::compute-backtrace" "(swank::compute-backtrace start end)")
       ("swank::emacs-connected" "(swank::emacs-connected)")
       ("swank::compile-string-for-emacs"
-       "(swank::compile-string-for-emacs string buffer position filename policy)")
+       "(swank::compile-string-for-emacs \
+string buffer position filename policy)")
       ("swank::connection.socket-io"
-       "(swank::connection.socket-io \\(struct\\(ure\\)?\\|object\\|instance\\|x\\))")
+       "(swank::connection.socket-io \
+\\(struct\\(ure\\)?\\|object\\|instance\\|x\\))")
       ("cl:lisp-implementation-type" "(cl:lisp-implementation-type)")
       ("cl:class-name" 
        "(cl:class-name \\(class\\|object\\|instance\\|structure\\))"))
@@ -7915,7 +7946,8 @@
                        (lambda (pattern arglist)
                          (and arglist (string-match pattern arglist))))))
 
-(def-slime-test (compile-defun (:fails-for "allegro" "lispworks" "clisp" "ccl"))
+(def-slime-test (compile-defun (:fails-for "allegro" "lispworks" "clisp" 
+                                           "ccl"))
     (program subform)
     "Compile PROGRAM containing errors.
 Confirm that SUBFORM is correctly located."
@@ -8136,7 +8168,10 @@
   (lexical-let ((done nil))
     (let ((sldb-hook (lambda () (sldb-continue) (setq done t))))
       (slime-interactive-eval 
-       "(progn(cerror \"foo\" \"restart\")(cerror \"bar\" \"restart\")(+ 1 2))")
+       "(progn\
+ (cerror \"foo\" \"restart\")\
+ (cerror \"bar\" \"restart\")\
+ (+ 1 2))")
       (while (not done) (slime-accept-process-output))
       (slime-sync-to-top-level 5)
       (slime-check-top-level)
@@ -8612,7 +8647,8 @@
         s
       (format "%s::%s"
               (let* ((package (slime-current-package)))
-                ;; package is a string like ":cl-user" or "CL-USER", or "\"CL-USER\"".
+                ;; package is a string like ":cl-user" 
+                ;; or "CL-USER", or "\"CL-USER\"".
                 (if package
                     (slime-pretty-package-name package)
                   "CL-USER"))
@@ -9226,7 +9262,8 @@
                 (2 font-lock-variable-name-face))))))
  
 (unless (featurep 'xemacs)
-  (loop for (symbol flag) on (symbol-plist 'slime-indulge-pretty-colors) by 'cddr
+  (loop for (symbol flag) on (symbol-plist 'slime-indulge-pretty-colors) 
+        by 'cddr
         when (eq flag 't) do (slime-indulge-pretty-colors symbol)))
  
 ;;;; Finishing up
@@ -9269,6 +9306,8 @@
 ;; outline-regexp: ";;;;+"
 ;; indent-tabs-mode: nil
 ;; coding: latin-1-unix
-;; compile-command: "emacs -batch -L . -eval '(byte-compile-file \"slime.el\")' ; rm -v slime.elc"
+;; compile-command: "emacs -batch -L . \
+;;  -eval '(byte-compile-file \"slime.el\")' ; \
+;;  rm -v slime.elc"
 ;; End:
 ;;; slime.el ends here
--- /project/slime/cvsroot/slime/swank.lisp	2012/04/07 06:14:48	1.785
+++ /project/slime/cvsroot/slime/swank.lisp	2012/04/07 08:19:32	1.786
@@ -134,7 +134,9 @@
   "A DEFUN for functions that Emacs can call by RPC."
   `(progn
      (defun ,name ,arglist , at rest)
-     ;; see <http://www.franz.com/support/documentation/6.2/doc/pages/variables/compiler/s_cltl1-compile-file-toplevel-compatibility-p_s.htm>
+     ;; see <http://www.franz.com/support/documentation/6.2/\
+     ;; doc/pages/variables/compiler/\
+     ;; s_cltl1-compile-file-toplevel-compatibility-p_s.htm>
      (eval-when (:compile-toplevel :load-toplevel :execute)
        (export ',name (symbol-package ',name)))))
 
@@ -1022,7 +1024,8 @@
            (simple-break)))
         (let ((*send-counter* 0)) ;; shouldn't be necessary, but it is
           (send-to-emacs (list :debug-condition (current-thread-id)
-                               (format nil "Thread with id ~a not found" id)))))))
+                               (format nil "Thread with id ~a not found" 
+                                       id)))))))
 
 (defun thread-for-evaluation (connection id)
   "Find or create a thread to evaluate the next request."
@@ -1942,7 +1945,8 @@
   (when *auto-abbreviate-dotted-packages*
     (loop with package-name = (package-name package)
           with offset = nil
-          do (let ((last-dot-pos (position #\. package-name :end offset :from-end t)))
+          do (let ((last-dot-pos (position #\. package-name :end offset 
+                                           :from-end t)))
                (unless last-dot-pos
                  (return nil))
                ;; If a dot chunk contains only numbers, that chunk most
@@ -2279,10 +2283,12 @@
   (with-simple-restart (continue "Continue from break.")
     (invoke-slime-debugger (coerce-to-condition datum args))))
 
+;; FIXME: (last (compute-restarts)) looks dubious.
 (defslimefun throw-to-toplevel ()
   "Invoke the ABORT-REQUEST restart abort an RPC from Emacs.
 If we are not evaluating an RPC then ABORT instead."
-  (let ((restart (or (and *sldb-quit-restart* (find-restart *sldb-quit-restart*))
+  (let ((restart (or (and *sldb-quit-restart* 
+                          (find-restart *sldb-quit-restart*))
                      (car (last (compute-restarts))))))
     (cond (restart (invoke-restart restart))
           (t (format nil "Restart not active [~s]" *sldb-quit-restart*)))))





More information about the slime-cvs mailing list