mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
app-emacs/magit: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/1826 Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
This commit is contained in:
committed by
Patrice Clement
parent
14e7075181
commit
d2c8a7a975
@@ -1,33 +0,0 @@
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user