[slime-cvs] CVS slime

[CVS User trittweiler]

Update of /project/slime/cvsroot/slime
In directory cl-net:/tmp/cvs-serv6418

Modified Files:
	slime.el ChangeLog 
Log Message:

	* slime.el (slime-editing-keys): New variable; splitted from
	`slime-keys'. Contains key bindings that are useful for buffers
	where users can edit s-exprs, such as source buffers and the REPL.
	(slime-keys): Use it.


--- /project/slime/cvsroot/slime/slime.el	2009/01/17 20:27:28	1.1118
+++ /project/slime/cvsroot/slime/slime.el	2009/01/23 10:05:03	1.1119
@@ -491,7 +491,7 @@
 ;;;;; Key bindings
 
 (defvar slime-parent-map (make-sparse-keymap)
-  "Parent keymap for various Slime related modes.")
+  "Parent keymap for shared between all Slime related modes.")
 
 (defvar slime-parent-bindings
   '(("\M-."      slime-edit-definition)
@@ -500,6 +500,7 @@
     ("\C-x5." 	 slime-edit-definition-other-frame)
     ("\C-x\C-e"  slime-eval-last-expression)
     ("\C-\M-x"   slime-eval-defun)
+    ;; Include PREFIX keys...
     ("\C-c"	 slime-prefix-map)))
 
 (defvar slime-prefix-map (make-sparse-keymap)
@@ -519,36 +520,42 @@
     ("\C-xc" slime-list-connections)
     ("<"     slime-list-callers)
     (">"     slime-list-callees)
+    ;; Include DOC keys...
     ("\C-d"  slime-doc-map)
+    ;; Include XREF WHO-FOO keys...
     ("\C-w"  slime-who-map)
-    ;;("\C-z" slime-switch-to-output-buffer :prefixed t :sldb t)
     ))
 
-(defvar slime-keys
-  '(;; Compiler notes
-    ("\M-p"       slime-previous-note)
-    ("\M-n"       slime-next-note)
-    ("\C-c\M-c"   slime-remove-notes)
-    ("\C-c\C-k"   slime-compile-and-load-file)
-    ("\C-c\M-k"   slime-compile-file)
-    ("\C-c\C-c"   slime-compile-defun)
-    ;; Editing
+;;; These keys are useful for buffers where the user can insert and
+;;; edit s-exprs, e.g. for source buffers and the REPL.
+(defvar slime-editing-keys
+  '(;; Arglist display & completion
     ("\M-\t"      slime-complete-symbol)
     (" "          slime-space)
     ;; Evaluating
     ;;("\C-x\M-e" slime-eval-last-expression-display-output :inferior t)
     ("\C-c\C-p"   slime-pprint-eval-last-expression)
-    ;; Misc
-    ("\C-c\C-u"   slime-undefine-function)
+    ;; Macroexpand
     ("\C-c\C-m"   slime-macroexpand-1)
     ("\C-c\M-m"   slime-macroexpand-all)
+    ;; Misc
+    ("\C-c\C-u"   slime-undefine-function)
     ([?\C-\M-.]   slime-next-location)
-    ;; ;; Shadow unwanted bindings from inf-lisp
-    ;; ("\C-a"    slime-nop :prefixed t :inferior t :sldb t)
-    ;; ("\C-v"    slime-nop :prefixed t :inferior t :sldb t)
     ;; Obsolete, redundant bindings
     ("\C-c\C-i" slime-complete-symbol)
-    ("\M-*" slime-edit-definition)))
+    ("\M-*" slime-edit-definition)
+    ))
+
+(defvar slime-keys
+  (append slime-editing-keys
+          '( ;; Compiler notes
+            ("\M-p"       slime-previous-note)
+            ("\M-n"       slime-next-note)
+            ("\C-c\M-c"   slime-remove-notes)
+            ("\C-c\C-k"   slime-compile-and-load-file)
+            ("\C-c\M-k"   slime-compile-file)
+            ("\C-c\C-c"   slime-compile-defun)
+            )))
 
 (defun slime-nop ()
   "The null command. Used to shadow currently-unused keybindings."
--- /project/slime/cvsroot/slime/ChangeLog	2009/01/17 20:27:28	1.1670
+++ /project/slime/cvsroot/slime/ChangeLog	2009/01/23 10:05:03	1.1671
@@ -1,3 +1,10 @@
+2009-01-23  Tobias C. Rittweiler  <tcr at freebits.de>
+
+	* slime.el (slime-editing-keys): New variable; splitted from
+	`slime-keys'. Contains key bindings that are useful for buffers
+	where users can edit s-exprs, such as source buffers and the REPL.
+	(slime-keys): Use it.
+
 2009-01-17  Tobias C. Rittweiler  <tcr at freebits.de>
 
 	Fix C-u C-c C-c in SLDB.