...

ran9er · Jun 2, 2013 · 7b7a8b5 · 7b7a8b5
1 parent 77bc72e
commit 7b7a8b5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 22 deletions.
diff --git a/_autoload-conf/slime.el b/_autoload-conf/slime.el
@@ -62,19 +62,9 @@
     '(progn
        (define-key lisp-mode-map (kbd "TAB") 'lisp-indent-or-complete)))
 
-(add-hook 'slime-mode-hook
+(add-hook 'slime-repl-mode-hook
           (lambda ()
-            (set (make-local-variable 'skeleton-pair-cond-alist)
-                 (append
-                  '(
-                    (?\( . ((t _ ")")))
-                    (?\{ . (((match-str-bf "(.*)\\|function") n _ n "}")
-                            (t _ "}")))
-                    (?\[ . (((match-str-bf "--") "[" n _ n "--]]")
-                            (t _ "]")))
-                    )
-                  skeleton-pair-cond-alist))
-            (skeleton-pair-alist-update)))
+            (skeleton-pair-alist-update slime-repl-mode-map)))
 
 
 ;;按回车键后下一行代码自动缩进
@@ -86,10 +76,11 @@
 
 ;(setq inferior-lisp-program "lisp")
 (slime-setup '(slime-fancy
+               slime-autodoc
                slime-asdf
                slime-banner
                slime-clipboard
-               slime-scheme
+               slime-highlight-edits
                ))
 (setq slime-complete-symbol*-fancy t)
 (setq slime-complete-symbol-function 'slime-fuzzy-complete-symbol)

diff --git a/_lib/skeleton-pair.el b/_lib/skeleton-pair.el
@@ -48,15 +48,16 @@
       (progn (funcall (or back 'backward-sexp))(point))))))
 
 ;;;###autoload
-(defun skeleton-pair-alist-update ()
+(defun skeleton-pair-alist-update (&optional keymap)
   (interactive)
-  (mapc
-   (lambda(x)
-     ;; (local-set-key (char-to-string (cadr x)) 'skeleton-pair-insert-maybe)
-     (define-key (current-local-map)
-       (eval `(kbd ,(char-to-string (car x))))
-       ;; (char-to-string (cadr x))
-       'skeleton-pair-insert-maybe))
-   skeleton-pair-cond-alist))
+  (let ((keymap (or keymap (current-local-map))))
+    (mapc ;; (local-set-key (char-to-string (cadr x)) 'skeleton-pair-insert-maybe)
+     (eval
+      `(lambda(x)
+         (define-key ',keymap
+           (eval `(kbd ,(char-to-string (car x))))
+           ;; (char-to-string (cadr x))
+           'skeleton-pair-insert-maybe)))
+     skeleton-pair-cond-alist)))
 ;; (skeleton-pair-alist-update)