* gnus-compat.el: More the compat functions more compatible.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d94f352..b34cccc 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2012-02-02  Lars Ingebrigtsen  <larsi@gnus.org>
 
+       * gnus-compat.el: More the compat functions more compatible.
+
        * shr.el (shr-put-image): Remove underlines from sliced images.
        (shr-zoom-image): Compute the region to be replaced more correctly.
 

diff --git a/lisp/gnus-compat.el b/lisp/gnus-compat.el
index f92c5b2..2cca394 100644 (file)
--- a/lisp/gnus-compat.el
+++ b/lisp/gnus-compat.el
@@ -36,12 +36,18 @@
 (when (and (not (fboundp 'help-function-arglist))
           (fboundp 'function-arglist))
   (defun help-function-arglist (def &optional preserve-names)
+    "Return a formal argument list for the function DEF.
+PRESERVE-NAMES is ignored."
     (cdr (car (read-from-string (downcase (function-arglist def)))))))
 
 (when (= (length (help-function-arglist 'delete-directory)) 1)
   (defvar gnus-compat-original-delete-directory
     (symbol-function 'delete-directory))
-  (defun delete-directory (directory &optional recursive)
+  (defun delete-directory (directory &optional recursive trash)
+    "Delete the directory named DIRECTORY.  Does not follow symlinks.
+If RECURSIVE is non-nil, all files in DIRECTORY are deleted as well.
+TRASH is ignored."
+    (interactive "DDirectory: ")
     (if (not recursive)
        (funcall gnus-compat-original-delete-directory directory)
       (dolist (file (directory-files directory t))