ulm 14/05/23 19:23:25 Added: magit-1.2.0-delete-directory.patch Log: Fix incompatibily with emacs-vcs. Call elisp-compile, because the upstream build system doesn't care about byte-compile errors. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)
Revision Changes Path 1.1 app-emacs/magit/files/magit-1.2.0-delete-directory.patch 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 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 Index: magit-1.2.0-delete-directory.patch =================================================================== Fix byte-compile failure with Emacs 24.3.91. The upstream git repo has a more complicated fix which we don't use, because the Gentoo package need not care about Emacs 22 and XEmacs compatibility. Instead, always define magit-delete-directory as an alias of delete-directory. This will work for all supported Emacs versions. --- magit-1.2.0-orig/magit.el +++ magit-1.2.0/magit.el @@ -775,21 +775,7 @@ after-change-functions) ,@body))))) - (if (>= (magit-max-args-internal 'delete-directory) 2) - (defalias 'magit-delete-directory 'delete-directory) - (defun magit-delete-directory (directory &optional recursive) - "Deletes a directory named DIRECTORY. If RECURSIVE is non-nil, -recursively delete all of DIRECTORY's contents as well. - -Does not follow symlinks." - (if (or (file-symlink-p directory) - (not (file-directory-p directory))) - (delete-file directory) - (if recursive - ;; `directory-files-no-dot-files-regex' borrowed from Emacs 23 - (dolist (file (directory-files directory 'full "\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*")) - (magit-delete-directory file recursive))) - (delete-directory directory))))) + (defalias 'magit-delete-directory 'delete-directory)) ;;; Utilities
