| 1 |
ulm 14/05/23 19:23:25 |
| 2 |
|
| 3 |
Added: magit-1.2.0-delete-directory.patch |
| 4 |
Log: |
| 5 |
Fix incompatibily with emacs-vcs. Call elisp-compile, because the upstream build system doesn't care about byte-compile errors. |
| 6 |
|
| 7 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 app-emacs/magit/files/magit-1.2.0-delete-directory.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emacs/magit/files/magit-1.2.0-delete-directory.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emacs/magit/files/magit-1.2.0-delete-directory.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: magit-1.2.0-delete-directory.patch |
| 16 |
=================================================================== |
| 17 |
Fix byte-compile failure with Emacs 24.3.91. |
| 18 |
|
| 19 |
The upstream git repo has a more complicated fix which we don't use, |
| 20 |
because the Gentoo package need not care about Emacs 22 and XEmacs |
| 21 |
compatibility. Instead, always define magit-delete-directory as an |
| 22 |
alias of delete-directory. This will work for all supported Emacs |
| 23 |
versions. |
| 24 |
|
| 25 |
--- magit-1.2.0-orig/magit.el |
| 26 |
+++ magit-1.2.0/magit.el |
| 27 |
@@ -775,21 +775,7 @@ |
| 28 |
after-change-functions) |
| 29 |
,@body))))) |
| 30 |
|
| 31 |
- (if (>= (magit-max-args-internal 'delete-directory) 2) |
| 32 |
- (defalias 'magit-delete-directory 'delete-directory) |
| 33 |
- (defun magit-delete-directory (directory &optional recursive) |
| 34 |
- "Deletes a directory named DIRECTORY. If RECURSIVE is non-nil, |
| 35 |
-recursively delete all of DIRECTORY's contents as well. |
| 36 |
- |
| 37 |
-Does not follow symlinks." |
| 38 |
- (if (or (file-symlink-p directory) |
| 39 |
- (not (file-directory-p directory))) |
| 40 |
- (delete-file directory) |
| 41 |
- (if recursive |
| 42 |
- ;; `directory-files-no-dot-files-regex' borrowed from Emacs 23 |
| 43 |
- (dolist (file (directory-files directory 'full "\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*")) |
| 44 |
- (magit-delete-directory file recursive))) |
| 45 |
- (delete-directory directory))))) |
| 46 |
+ (defalias 'magit-delete-directory 'delete-directory)) |
| 47 |
|
| 48 |
;;; Utilities |
Archives