Package: jde
Version: 2.3.5
Tags: patch
The bug seems to be due to void function "jde-require", which seems be fixed
by the changes below to jde-bug.
Even if that problem is fixed, jde still does not work, as it requires cedet
version be between 1.0beta and 1.0 and 1.0pre is considered beyond that
range. The changes to jde.el below should fix that problem.
I also include a patch that fixes the cedet version problem. I came across the
patch after I fixed the bug.
Since /usr/info does not exist in Debian any more, I include a patch to fix
that in emacs-install and emacs-remove, though at present that's not used
since install-info-altdir still does not exist.
--- jde-2.3.5.orig/lisp/jde-bug.el
+++ jde-2.3.5/lisp/jde-bug.el
@@ -36,6 +36,7 @@
;;; Code:
(require 'cl)
+(require 'jde-util)
(require 'jde-parse)
(require 'jde-dbs)
(require 'jde-dbo)
--- jde-2.3.5.orig/lisp/jde.el
+++ jde-2.3.5/lisp/jde.el
@@ -999,13 +999,61 @@
(defun jde-earlier-versionp (ver1 ver2)
"Return non-nil if VER1 is earlier than VER2"
(let ((ver1-betap (string-match "beta" ver1))
- (ver2-betap (string-match "beta" ver2)))
+ (ver2-betap (string-match "beta" ver2))
+ (ver1-prep (string-match "pre" ver1))
+ (ver2-prep (string-match "pre" ver2)))
(if (or (and ver1-betap ver2-betap)
(and (not ver1-betap) (not ver2-betap)))
- (string< ver1 ver2)
+ (if (and ver2-prep (not ver1-prep))
+ nil
+ (if (and ver1-prep (not ver2-prep))
+ t
+ (string< ver1 ver2)))
(if ver1-betap
(progn
(or (string= ver2 (substring ver1 0 ver1-betap))
--- jde-2.3.5.orig/debian/emacsen-install
+++ jde-2.3.5/debian/emacsen-install
@@ -27,7 +27,7 @@
# Maybe somebody will write it.
if test -x /usr/sbin/install-info-altdir; then
echo install/${PACKAGE}: install Info links for ${FLAVOR}
- install-info-altdir --quiet --section "" ""
--dirname=${FLAVOR} /usr/info/${PACKAGE}.info.gz
+ install-info-altdir --quiet --section "" ""
--dirname=${FLAVOR} /usr/share/info/${PACKAGE}.info.gz
fi
install -m 755 -d ${ELCDIR}
--- jde-2.3.5.orig/debian/emacsen-remove
+++ jde-2.3.5/debian/emacsen-remove
@@ -7,7 +7,7 @@
if [ ${FLAVOR} != emacs ]; then
if test -x /usr/sbin/install-info-altdir; then
echo remove/${PACKAGE}: removing Info links for ${FLAVOR}
- install-info-altdir --quiet --remove
--dirname=${FLAVOR} /usr/info/jde.info.gz
+ install-info-altdir --quiet --remove
--dirname=${FLAVOR} /usr/share/info/jde.info.gz
fi
echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR}
---8<---
Another patch from http://www.02.246.ne.jp/~torutk/jdee/jdee.html that fixes
the cedet 1.0 prerelease version problem
diff -u jde.el.orig jde.el
--- jde.el.orig 2004-12-17 13:29:35.000000000 +0900
+++ jde.el 2005-05-22 02:23:06.187500000 +0900
@@ -987,14 +987,7 @@
(defun jde-check-version (current-version min-version max-version)
"Return non-nil if CURRENT-VERSION >= MIN-VERSION or <= MAX-VERSION."
- (and (or (jde-earlier-versionp current-version
- max-version)
- (string= current-version
- max-version))
- (or (jde-earlier-versionp min-version
- current-version)
- (string= current-version
- min-version))))
+ (not (inversion-test 'cedet min-version)))
(defun jde-earlier-versionp (ver1 ver2)
"Return non-nil if VER1 is earlier than VER2"
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
