New CVS snapshot. Fix M-. errors on SBCL functions, thanks to Stelian Ionescu.

(Portage version: 2.1.3.7)

7 files changed, 98 insertions, 61 deletions

diff --git a/app-emacs/slime/ChangeLog b/app-emacs/slime/ChangeLog
index 5214f85f6774..8ff908cd8a0e 100644
--- a/app-emacs/slime/ChangeLog
+++ b/app-emacs/slime/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-emacs/slime
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/slime/ChangeLog,v 1.46 2007/08/30 22:58:35 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/slime/ChangeLog,v 1.47 2007/09/08 19:50:26 ulm Exp $
+
+*slime-2.0_p20070816 (08 Sep 2007)
+
+  08 Sep 2007; Ulrich Mueller <ulm@gentoo.org>
+  +files/slime-2.0_p20070816-save-restriction-if-possible.patch,
+  -slime-2.0_p20070809.ebuild, +slime-2.0_p20070816.ebuild,
+  -slime-2.0_p20070822.ebuild:
+  Another CVS snapshot, of 2007-08-16, as suggested by tcr. Fix M-. errors on
+  SBCL functions, thanks to Stelian Ionescu <sionescu@common-lisp.net>.
 
 *slime-2.0_p20070809 (30 Aug 2007)
 
diff --git a/app-emacs/slime/files/digest-slime-2.0_p20070809 b/app-emacs/slime/files/digest-slime-2.0_p20070809
deleted file mode 100644
index 3c6eaadcc22c..000000000000
--- a/app-emacs/slime/files/digest-slime-2.0_p20070809
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 983cf045e3bbf3057c1930adc48ed928 slime-2.0_p20070809.tar.bz2 497356
-RMD160 28d5408a98cc8e7211d8681a76662397c373177d slime-2.0_p20070809.tar.bz2 497356
-SHA256 8b7cd808dc9bbca84fa7100214476e9a9ab47893ccf8cdf5432f0f450beeb1d7 slime-2.0_p20070809.tar.bz2 497356
diff --git a/app-emacs/slime/files/digest-slime-2.0_p20070816 b/app-emacs/slime/files/digest-slime-2.0_p20070816
new file mode 100644
index 000000000000..2e40c1cd6350
--- /dev/null
+++ b/app-emacs/slime/files/digest-slime-2.0_p20070816
@@ -0,0 +1,3 @@
+MD5 1351f621af33894bac95acc97488ed81 slime-2.0_p20070816.tar.bz2 500700
+RMD160 6b6fb7c4cf0e797d901b4aa4dec45555350621df slime-2.0_p20070816.tar.bz2 500700
+SHA256 dc393f8343b6c7e0ef32802c34e0943d45dc1b93997090d95afa1a0c0c03e977 slime-2.0_p20070816.tar.bz2 500700
diff --git a/app-emacs/slime/files/digest-slime-2.0_p20070822 b/app-emacs/slime/files/digest-slime-2.0_p20070822
deleted file mode 100644
index a19118002a0b..000000000000
--- a/app-emacs/slime/files/digest-slime-2.0_p20070822
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c293ac883b4ae9a2e31dce1eab5e9552 slime-2.0_p20070822.tar.bz2 504132
-RMD160 f8fe92a0419ea0a4ff8ebbd38a0db342dbf1e85c slime-2.0_p20070822.tar.bz2 504132
-SHA256 040762efc619302d61817ffb990ea444c4a53ce16faecffee58444fb9fc06c7a slime-2.0_p20070822.tar.bz2 504132
diff --git a/app-emacs/slime/files/slime-2.0_p20070816-save-restriction-if-possible.patch b/app-emacs/slime/files/slime-2.0_p20070816-save-restriction-if-possible.patch
new file mode 100644
index 000000000000..952b3a79c00d
--- /dev/null
+++ b/app-emacs/slime/files/slime-2.0_p20070816-save-restriction-if-possible.patch
@@ -0,0 +1,82 @@
+--- slime-2.0_p20070816-orig/slime.el	2007-08-16 10:26:33.000000000 +0200
++++ slime-2.0_p20070816/slime.el	2007-09-08 19:32:09.000000000 +0200
+@@ -5341,6 +5341,39 @@
+        (set-buffer buffer)
+        (goto-char (point-min))))))
+ 
++(defmacro save-restriction-if-possible (&rest body)
++  "Very similiarly to `save-restriction'. The only difference is
++that it's not enforcing the restriction as strictly: It's only
++enforced if `point' was not moved outside of the restriction
++after executing BODY.
++
++Example: 
++
++  (progn (goto-line 1000)
++         (narrow-to-page) 
++         (save-restriction-if-possible (widen) (goto-line 999)))
++
++  In this case, the buffer is narrowed to the current page, and
++  point is on line 999.
++
++  (progn (goto-char 1000)
++         (narrow-to-page) 
++         (save-restriction-if-possible (widen) (goto-line 1)))
++
++  Whereas in this case, the buffer is widened and point is on
++  line 1."
++  (let ((gcfg (gensym "NARROWING-CFG+"))
++        (gbeg (gensym "OLDBEG+"))
++        (gend (gensym "OLDEND+")))
++    `(let ((,gcfg (current-slime-narrowing-configuration)))
++       (unwind-protect (progn ,@body)
++         (let ((,gbeg (slime-narrowing-configuration.beg ,gcfg))
++               (,gend (slime-narrowing-configuration.end ,gcfg)))
++           (when (and (>= (point) ,gbeg) (<= (point) ,gend))
++             (set-slime-narrowing-configuration ,gcfg)))))))
++
++(put 'save-restriction-if-possible 'lisp-indent-function 0)
++
+ (defun slime-goto-location-position (position)
+   (save-restriction-if-possible         ; try to keep restriction if possible.
+     (widen)
+@@ -11128,39 +11161,6 @@
+           (total (buffer-size)))
+       (or (/= beg 1) (/= end (1+ total))))))
+ 
+-(defmacro save-restriction-if-possible (&rest body)
+-  "Very similiarly to `save-restriction'. The only difference is
+-that it's not enforcing the restriction as strictly: It's only
+-enforced if `point' was not moved outside of the restriction
+-after executing BODY.
+-
+-Example: 
+-
+-  (progn (goto-line 1000)
+-         (narrow-to-page) 
+-         (save-restriction-if-possible (widen) (goto-line 999)))
+-
+-  In this case, the buffer is narrowed to the current page, and
+-  point is on line 999.
+-
+-  (progn (goto-char 1000)
+-         (narrow-to-page) 
+-         (save-restriction-if-possible (widen) (goto-line 1)))
+-
+-  Whereas in this case, the buffer is widened and point is on
+-  line 1."
+-  (let ((gcfg (gensym "NARROWING-CFG+"))
+-        (gbeg (gensym "OLDBEG+"))
+-        (gend (gensym "OLDEND+")))
+-    `(let ((,gcfg (current-slime-narrowing-configuration)))
+-       (unwind-protect (progn ,@body)
+-         (let ((,gbeg (slime-narrowing-configuration.beg ,gcfg))
+-               (,gbeg (slime-narrowing-configuration.end ,gcfg)))
+-           (when (and (>= (point) ,gbeg) (<= (point) ,gend))
+-             (set-slime-current-narrowing-configuration ,gcfg)))))))
+-
+-(put 'save-restriction-if-possible 'lisp-indent-function 0)
+-
+ ;;;;; Common Lisp-style package-qualified symbols
+ 
+ (defun slime-cl-symbol-name (symbol)
diff --git a/app-emacs/slime/slime-2.0_p20070809.ebuild b/app-emacs/slime/slime-2.0_p20070816.ebuild
index 524e9c5474bb..0f50fd73caa7 100644
--- a/app-emacs/slime/slime-2.0_p20070809.ebuild
+++ b/app-emacs/slime/slime-2.0_p20070816.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/slime/slime-2.0_p20070809.ebuild,v 1.1 2007/08/30 22:58:35 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/slime/slime-2.0_p20070816.ebuild,v 1.1 2007/09/08 19:50:26 ulm Exp $
 
 inherit common-lisp elisp
 
@@ -17,13 +17,14 @@ DEPEND="virtual/commonlisp
 	doc? ( virtual/tetex sys-apps/texinfo )"
 
 CLPACKAGE=swank
-SWANK_VERSION="2007-08-22"
+SWANK_VERSION="2007-08-16"
 SITEFILE=70${PN}-gentoo.el
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/slime-set-swank-wire-protocol-version.patch
+	epatch "${FILESDIR}"/${P}-save-restriction-if-possible.patch
 	sed -i "s:@SWANK-WIRE-PROTOCOL-VERSION@:${SWANK_VERSION}:" swank.lisp
 }
 
diff --git a/app-emacs/slime/slime-2.0_p20070822.ebuild b/app-emacs/slime/slime-2.0_p20070822.ebuild
deleted file mode 100644
index 21b74bc99086..000000000000
--- a/app-emacs/slime/slime-2.0_p20070822.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/slime/slime-2.0_p20070822.ebuild,v 1.2 2007/08/28 06:12:19 ulm Exp $
-
-inherit common-lisp elisp
-
-DESCRIPTION="SLIME, the Superior Lisp Interaction Mode (Extended)"
-HOMEPAGE="http://common-lisp.net/project/slime/"
-#SRC_URI="http://common-lisp.net/~sionescu/files/${P}.tar.bz2"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2 xref.lisp"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="doc"
-
-DEPEND="virtual/commonlisp
-	doc? ( virtual/tetex sys-apps/texinfo )"
-
-CLPACKAGE=swank
-SWANK_VERSION="2007-08-22"
-SITEFILE=70${PN}-gentoo.el
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/slime-set-swank-wire-protocol-version.patch
-	sed -i "s:@SWANK-WIRE-PROTOCOL-VERSION@:${SWANK_VERSION}:" swank.lisp
-}
-
-src_compile() {
-	elisp-comp *.el || die "Cannot compile Elisp files"
-	use doc && make -C doc all slime.pdf
-}
-
-src_install() {
-	elisp-install ${PN} *.el{,c} ChangeLog "${FILESDIR}"/swank-loader.lisp \
-		|| die "Cannot install SLIME core"
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	insinto "${CLSOURCEROOT}"/swank
-	doins *.lisp "${FILESDIR}"/swank.asd
-	dodir "${CLSYSTEMROOT}"
-	dosym "${CLSOURCEROOT}"/swank/swank.asd "${CLSYSTEMROOT}"
-	dosym "${SITELISP}"/${PN}/swank-version.el "${CLSOURCEROOT}"/swank
-
-	# install docs
-	dodoc README* ChangeLog HACKING NEWS PROBLEMS || die "dodoc failed"
-	if use doc; then
-		dodoc doc/slime.{ps,pdf} || die "dodoc failed"
-		doinfo doc/slime.info
-	fi
-}