From e4d8c334b4004086440e60155994565a5e06aca7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 16 Jul 2009 14:05:14 +0000 Subject: [PATCH] JDEE: Add wizard usability patch. svn path=/nixpkgs/trunk/; revision=16395 --- .../editors/emacs-modes/jdee/default.nix | 4 ++-- .../jdee/jde-wiz-update-implements-clause.patch | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/editors/emacs-modes/jdee/jde-wiz-update-implements-clause.patch diff --git a/pkgs/applications/editors/emacs-modes/jdee/default.nix b/pkgs/applications/editors/emacs-modes/jdee/default.nix index 0ea68d4d7425..3b8cce053e51 100644 --- a/pkgs/applications/editors/emacs-modes/jdee/default.nix +++ b/pkgs/applications/editors/emacs-modes/jdee/default.nix @@ -18,7 +18,7 @@ in patches = [ ./installation-layout.patch ./cedet-paths.patch ./elib-avltree.patch ./java-directory.patch ./jde-directory-files-recurs.patch - ./jde-help-find-javadoc.patch + ./jde-help-find-javadoc.patch ./jde-wiz-update-implements-clause.patch ]; configurePhase = '' @@ -45,7 +45,7 @@ in buildInputs = [ emacs ant ]; propagatedBuildInputs = [ cedet ]; - propagatedUserEnvPkgs = propagatedBuildInputs; + propagatedUserEnvPkgs = propagatedBuildInputs; # FIXME: Not honored meta = { description = "JDEE, a Java development environment for Emacs"; diff --git a/pkgs/applications/editors/emacs-modes/jdee/jde-wiz-update-implements-clause.patch b/pkgs/applications/editors/emacs-modes/jdee/jde-wiz-update-implements-clause.patch new file mode 100644 index 000000000000..614a0ce37f1f --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/jdee/jde-wiz-update-implements-clause.patch @@ -0,0 +1,14 @@ +This patch allows `C-c C-v e' (`jde-wiz-extend-abstract-class') to do the +right thing, even when invoked, say, on an empty file. + +--- jde/lisp/jde-wiz.el (revision 90) ++++ jde/lisp/jde-wiz.el (working copy) +@@ -99,7 +99,7 @@ extends clause is updated" + (save-excursion + (let* ((class-re "class[ \t]+\\([a-zA-z]+[a-zA-Z0-9._]*\\).*[ \n]*") + (open-brace-pos +- (scan-lists (point) -1 1)) ++ (ignore-errors (scan-lists (point) -1 1))) + (class-name-end-pos + (when open-brace-pos + (goto-char open-brace-pos)