| 1 |
commit: d2c8a7a975be56584155e48633d44ec7f6ab20dc |
| 2 |
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Mon Jul 4 19:32:21 2016 +0000 |
| 4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jul 7 07:19:15 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2c8a7a9 |
| 7 |
|
| 8 |
app-emacs/magit: remove unused patch |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/1826 |
| 11 |
|
| 12 |
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> |
| 13 |
|
| 14 |
.../magit/files/magit-1.2.0-delete-directory.patch | 33 ---------------------- |
| 15 |
1 file changed, 33 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-emacs/magit/files/magit-1.2.0-delete-directory.patch b/app-emacs/magit/files/magit-1.2.0-delete-directory.patch |
| 18 |
deleted file mode 100644 |
| 19 |
index 6c85345..0000000 |
| 20 |
--- a/app-emacs/magit/files/magit-1.2.0-delete-directory.patch |
| 21 |
+++ /dev/null |
| 22 |
@@ -1,33 +0,0 @@ |
| 23 |
-Fix byte-compile failure with Emacs 24.3.91. |
| 24 |
- |
| 25 |
-The upstream git repo has a more complicated fix which we don't use, |
| 26 |
-because the Gentoo package need not care about Emacs 22 and XEmacs |
| 27 |
-compatibility. Instead, always define magit-delete-directory as an |
| 28 |
-alias of delete-directory. This will work for all supported Emacs |
| 29 |
-versions. |
| 30 |
- |
| 31 |
---- magit-1.2.0-orig/magit.el |
| 32 |
-+++ magit-1.2.0/magit.el |
| 33 |
-@@ -775,21 +775,7 @@ |
| 34 |
- after-change-functions) |
| 35 |
- ,@body))))) |
| 36 |
- |
| 37 |
-- (if (>= (magit-max-args-internal 'delete-directory) 2) |
| 38 |
-- (defalias 'magit-delete-directory 'delete-directory) |
| 39 |
-- (defun magit-delete-directory (directory &optional recursive) |
| 40 |
-- "Deletes a directory named DIRECTORY. If RECURSIVE is non-nil, |
| 41 |
--recursively delete all of DIRECTORY's contents as well. |
| 42 |
-- |
| 43 |
--Does not follow symlinks." |
| 44 |
-- (if (or (file-symlink-p directory) |
| 45 |
-- (not (file-directory-p directory))) |
| 46 |
-- (delete-file directory) |
| 47 |
-- (if recursive |
| 48 |
-- ;; `directory-files-no-dot-files-regex' borrowed from Emacs 23 |
| 49 |
-- (dolist (file (directory-files directory 'full "\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*")) |
| 50 |
-- (magit-delete-directory file recursive))) |
| 51 |
-- (delete-directory directory))))) |
| 52 |
-+ (defalias 'magit-delete-directory 'delete-directory)) |
| 53 |
- |
| 54 |
- ;;; Utilities |
| 55 |
- |
Archives