[slime-cvs] CVS update: slime/slime.el

[Luke Gorrie]

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

Modified Files:
	slime.el 
Log Message:
(slime-preserve-zmacs-region): Function to ensure that the current
command doesn't deactive zmacs-region (XEmacs only).
(slime-repl-bol, slime-repl-eol): Use it.

(slime-kill-all-buffers): Changed buffer-name regexps for XEmacs
compatibility. The ",quit" shortcut now works in XEmacs.

Date: Fri Jun 18 09:45:33 2004
Author: lgorrie

Index: slime/slime.el
diff -u slime/slime.el:1.316 slime/slime.el:1.317
--- slime/slime.el:1.316	Fri Jun 18 09:10:22 2004
+++ slime/slime.el	Fri Jun 18 09:45:33 2004
@@ -2235,7 +2235,8 @@
   (if (and (>= (point) slime-repl-input-start-mark)
            (slime-same-line-p (point) slime-repl-input-start-mark))
       (goto-char slime-repl-input-start-mark)
-    (beginning-of-line 1)))
+    (beginning-of-line 1))
+  (slime-preserve-zmacs-region))
 
 (defun slime-repl-eol ()
   "Go to the end of line or the prompt."
@@ -2243,7 +2244,13 @@
   (if (and (<= (point) slime-repl-input-end-mark)
            (slime-same-line-p (point) slime-repl-input-end-mark))
       (goto-char slime-repl-input-end-mark)
-    (end-of-line 1)))
+    (end-of-line 1))
+  (slime-preserve-zmacs-region))
+
+(defun slime-preserve-zmacs-region ()
+  "In XEmacs, ensure that the zmacs-region stays active after this command."
+  (when (boundp 'zmacs-region-stays)
+    (set 'zmacs-region-stays t)))
 
 (defun slime-repl-in-input-area-p ()
    (and (<= slime-repl-input-start-mark (point))
@@ -6264,8 +6271,8 @@
   (dolist (buf (buffer-list))
     (when (or (member (buffer-name buf) '("*inferior-lisp*" 
                                           slime-event-buffer-name))
-              (string-match "\*slime-repl\[\d+\]\*" (buffer-name buf))
-              (string-match "\*sldb .*\*" (buffer-name buf)))
+              (string-match "^\\*slime-repl\\[[0-9]+\\]\\*$" (buffer-name buf))
+              (string-match "^\\*sldb .*\\*$" (buffer-name buf)))
       (kill-buffer buf))))