From 3451ae1a64e5e2b87875fb5f949c5308f0f9542a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 17 Jul 2009 14:22:02 +0000
Subject: [PATCH] JDEE: Augment `jde-help-docsets.patch'; actually use it.

svn path=/nixpkgs/trunk/; revision=16413
---
 .../editors/emacs-modes/jdee/default.nix      |  1 +
 .../emacs-modes/jdee/jde-help-docsets.patch   | 25 +++++++++++++++----
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/jdee/default.nix b/pkgs/applications/editors/emacs-modes/jdee/default.nix
index 039dc91dbaae..425be3dd51b1 100644
--- a/pkgs/applications/editors/emacs-modes/jdee/default.nix
+++ b/pkgs/applications/editors/emacs-modes/jdee/default.nix
@@ -19,6 +19,7 @@ in
       ./installation-layout.patch ./cedet-paths.patch ./elib-avltree.patch
       ./java-directory.patch ./jde-directory-files-recurs.patch
       ./jde-help-find-javadoc.patch ./jde-wiz-update-implements-clause.patch
+      ./jde-help-docsets.patch
     ];
 
     configurePhase = ''
diff --git a/pkgs/applications/editors/emacs-modes/jdee/jde-help-docsets.patch b/pkgs/applications/editors/emacs-modes/jdee/jde-help-docsets.patch
index 9be1c2a22809..a779541feff8 100644
--- a/pkgs/applications/editors/emacs-modes/jdee/jde-help-docsets.patch
+++ b/pkgs/applications/editors/emacs-modes/jdee/jde-help-docsets.patch
@@ -2,15 +2,30 @@ Provide a sensible default for `jde-help-docsets'.
 
 --- jde/lisp/jde-help.el	(revision 90)
 +++ jde/lisp/jde-help.el	(working copy)
-@@ -28,7 +28,10 @@
+@@ -28,7 +28,25 @@
  (require 'jde-util)
  
  ;; (makunbound 'jde-help-docsets)
 -(defcustom jde-help-docsets (list (list "JDK API" "" nil))
-+(defcustom jde-help-docsets (list
-+			     (list "JDK API"
-+				   "http://java.sun.com/javase/6/docs/api"
-+				   nil))
++(defcustom jde-help-docsets
++  (list (list "JDK API"
++	      "http://java.sun.com/javase/6/docs/api"
++	      nil)
++	("User (javadoc)"
++	 "http://static.springsource.org/spring/docs/3.0.x/javadoc-api/"
++	 nil)
++	("User (javadoc)"
++	 "http://commons.apache.org/sandbox/functor/apidocs/"
++	 nil)
++	("User (javadoc)"
++	 "https://www.hibernate.org/hib_docs/v3/api"
++	 nil)
++	("User (javadoc)"
++	 "http://acegisecurity.org/acegi-security/apidocs"
++	 nil)
++	("User (javadoc)"
++	 "http://wicket.apache.org/docs/1.4"
++	 nil))
    "*Lists collections of HTML files documenting Java classes. 
  This list is used by the `jde-help-class' command to find help for 
  a class. You can specify the following information for each docset: