(py-electric-delete): Implement the XEmacs 21 blessed way of checking

for delete forwardness.

diff --git a/Misc/python-mode.el b/Misc/python-mode.el
index 48d1b612fa010f6d2d31a3a6f8dc3cf886b79240..15d9f0995e33e13cd348f3ccbecbcd69e1c320aa 100644 (file)
--- a/Misc/python-mode.el
+++ b/Misc/python-mode.el
@@ -1519,10 +1519,11 @@ function in `py-delete-function'.
 \\[universal-argument] (programmatically, argument ARG) specifies the
 number of characters to delete (default is 1)."
   (interactive "*p")
-  (if (and (boundp 'delete-key-deletes-forward)
-          delete-key-deletes-forward)
+  (if (or (and (fboundp 'delete-forward-p) ;XEmacs 21
+              (delete-forward-p))
+         (and (boundp 'delete-key-deletes-forward) ;XEmacs 20
+              delete-key-deletes-forward))
       (funcall py-delete-function arg)
-    ;; else
     (py-electric-backspace arg)))
 
 ;; required for pending-del and delsel modes