Archives
Archives
| From: | "Ulrich Mueller (ulm)" <ulm@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in app-emacs/jde/files: jde-2.3.5.1-import.patch |
| Date: | Sat, 21 Mar 2009 08:16:49 |
| Message-Id: | E1LkwNp-00015l-1p@stork.gentoo.org |
| 1 | ulm 09/03/21 08:16:45 |
| 2 | |
| 3 | Added: jde-2.3.5.1-import.patch |
| 4 | Log: |
| 5 | Make jde-import.el work with Emacs 22. |
| 6 | (Portage version: 2.2_rc26/cvs/Linux i686) |
| 7 | |
| 8 | Revision Changes Path |
| 9 | 1.1 app-emacs/jde/files/jde-2.3.5.1-import.patch |
| 10 | |
| 11 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emacs/jde/files/jde-2.3.5.1-import.patch?rev=1.1&view=markup |
| 12 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emacs/jde/files/jde-2.3.5.1-import.patch?rev=1.1&content-type=text/plain |
| 13 | |
| 14 | Index: jde-2.3.5.1-import.patch |
| 15 | =================================================================== |
| 16 | Fix error with jde-import-kill-extra-imports in Emacs 22. |
| 17 | http://patch-tracking.debian.net/patch/series/view/jde/2.3.5.1-5/0008-lisp-jde-import.el-Fix-error-with-jde-import-kill-e.patch |
| 18 | |
| 19 | --- jde-2.3.5.1-orig/lisp/jde-import.el 2006-02-19 15:22:36.000000000 +0100 |
| 20 | +++ jde-2.3.5.1/lisp/jde-import.el 2009-03-21 08:49:49.000000000 +0100 |
| 21 | @@ -495,15 +495,17 @@ |
| 22 | (classname (jde-import-get-classname name)) |
| 23 | (case-fold-search nil) |
| 24 | - (number-of-matches |
| 25 | - (substring (count-matches |
| 26 | - (concat "\\b" classname "\\b")) 0 2))) |
| 27 | + (number-of-matches |
| 28 | + (count-matches (concat "\\b" classname "\\b")))) |
| 29 | + (when (stringp number-of-matches) |
| 30 | + (setq number-of-matches |
| 31 | + (string-to-number (substring number-of-matches 0 2)))) |
| 32 | (if (or |
| 33 | ;; If name is already listed in the set |
| 34 | ;; of required imports... |
| 35 | (member name required-imports) |
| 36 | ;;or the class is not reference in the file |
| 37 | ;;and is not an import of the whole package i.e. .* |
| 38 | - (and (< (string-to-number number-of-matches) 2) |
| 39 | + (and (< number-of-matches 2) |
| 40 | (not (string= classname "*"))) |
| 41 | ;; or imports a class in the current package... |
| 42 | (and |