[gentoo-commits] gentoo-x86 commit in app-emacs/jde/files: jde-2.4.1-semantic-emacs-24.patch jde-2.4.1-doc-directory.patch

[gentoo-commits] gentoo-x86 commit in app-emacs/jde/files: jde-2.4.1-semantic-emacs-24.patch jde-2.4.1-doc-directory.patch

[Ulrich Mueller (ulm)]

ulm         11/12/13 17:29:40

  Added:                jde-2.4.1-semantic-emacs-24.patch
                        jde-2.4.1-doc-directory.patch
  Log:
  Version bump, bug 394365. This version depends on CEDET included with >=emacs-23.2. Thanks to Alex Bennee <alex@bennee.com>.
  
  (Portage version: 2.1.10.40/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  app-emacs/jde/files/jde-2.4.1-semantic-emacs-24.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emacs/jde/files/jde-2.4.1-semantic-emacs-24.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emacs/jde/files/jde-2.4.1-semantic-emacs-24.patch?rev=1.1&content-type=text/plain

Index: jde-2.4.1-semantic-emacs-24.patch
===================================================================
semantic-add-minor-mode accepts two arguments only.
http://bzr.savannah.gnu.org/lh/emacs/trunk/revision/100114

--- jdee-orig/lisp/jde-bug.el
+++ jdee/lisp/jde-bug.el
@@ -570,7 +570,7 @@
 
   (run-hook-with-args 'jde-bug-minor-mode-hook jde-bug-minor-mode))
 
-(semantic-add-minor-mode 'jde-bug-minor-mode " JDEbug" jde-bug-mode-map)
+(semantic-add-minor-mode 'jde-bug-minor-mode " JDEbug")
 
 ;; (fmakunbound 'jde-bug-key-bindings)
 (defcustom jde-bug-key-bindings
--- jdee-orig/lisp/jde-jdb.el
+++ jdee/lisp/jde-jdb.el
@@ -1830,7 +1830,7 @@
     (if (featurep 'xemacs)
       (easy-menu-remove jde-jdb-xemacs-menu-spec))))
 
-(semantic-add-minor-mode 'jde-jdb-minor-mode " jdb" jde-jdb-mode-map)
+(semantic-add-minor-mode 'jde-jdb-minor-mode " jdb")
 
 
 ;; (fmakunbound 'jde-jdb-key-bindings)
--- jdee-orig/lisp/jde-plugins.el
+++ jdee/lisp/jde-plugins.el
@@ -194,7 +194,7 @@
 		(easy-menu-add menu-spec jde-plugin-mode-map)
 	      (easy-menu-remove menu-spec))))))
 
-(semantic-add-minor-mode 'jde-plugin-minor-mode " plugin" jde-plugin-mode-map)
+(semantic-add-minor-mode 'jde-plugin-minor-mode " plugin")
 
 
 (provide 'jde-plugins)



1.1                  app-emacs/jde/files/jde-2.4.1-doc-directory.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emacs/jde/files/jde-2.4.1-doc-directory.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emacs/jde/files/jde-2.4.1-doc-directory.patch?rev=1.1&content-type=text/plain

Index: jde-2.4.1-doc-directory.patch
===================================================================
Move definition of jde-find-jde-doc-directory to jde-util.el.

--- jdee-orig/lisp/beanshell.el
+++ jdee/lisp/beanshell.el
@@ -82,7 +82,7 @@
 (eval-when-compile
   (require 'cl))
 
-(declare-function jde-find-jde-doc-directory "jde" nil)
+(require 'jde-util)
 
 (defgroup bsh nil
   "Customizations for the Emacs inteface to Pat Neimeyer's Java
--- jdee-orig/lisp/jde-util.el
+++ jdee/lisp/jde-util.el
@@ -139,6 +139,17 @@
 	  (if dir dir (jde-root)))
       (jde-root))))
 
+(defun jde-find-jde-doc-directory ()
+  "Return the path of the JDE documentation directory.
+Returns  nil if the directory cannot be found. At some
+point, XEmacs will include the JDE. Versions of XEmacs
+that include JDE will store the JDE doc in a data
+directory called jde. On all other Emacs versions, the JDE
+expects to find the documentation in a subdirectory
+named doc of the directory that contains the file
+jde.el."
+  (jde-find-jde-data-directory))
+
 (defun jde-temp-directory ()
 "Get the location used by the host system to store temporary files."
   (or (if (boundp 'temporary-file-directory) temporary-file-directory)
--- jdee-orig/lisp/jde.el
+++ jdee/lisp/jde.el
@@ -1762,17 +1762,6 @@
 
 
 ;; JDE help
-(defun jde-find-jde-doc-directory ()
-  "Return the path of the JDE documentation directory.
-Returns  nil if the directory cannot be found. At some
-point, XEmacs will include the JDE. Versions of XEmacs
-that include JDE will store the JDE doc in a data
-directory called jde. On all other Emacs versions, the JDE
-expects to find the documentation in a subdirectory
-named doc of the directory that contains the file
-jde.el."
-  (jde-find-jde-data-directory))
-
 (defcustom jde-html-directory
   (expand-file-name "doc/html" (jde-find-jde-doc-directory))
   "Directory of the JDE HTML documentation."