# HG changeset patch
# User Aidan Kehoe <kehoea@parhasard.net>
# Date 1347118428 -3600
# Node ID 0eb4e96fd261faa9079b4b6fef400815d660883a
# Parent  98f762d06c5fb95ba6a6d1883e1cf65f7aca8f13
#'delete-trailing-whitespace needs to work when the region is inactive, too

lisp/ChangeLog addition:

	Update its interactive spec to work correctly in XEmacs.

diff -r 98f762d06c5f -r 0eb4e96fd261 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Sep 08 13:34:20 2012 +0100
+++ b/lisp/ChangeLog	Sat Sep 08 16:33:48 2012 +0100
@@ -5,6 +5,7 @@
 	* simple.el (delete-trailing-whitespace): New.
 	Import this function and an associated variable from GNU, thank
 	you GNU.
+	Update its interactive spec to work correctly in XEmacs.
 
 2012-09-07  Aidan Kehoe  <kehoea@parhasard.net>
 
diff -r 98f762d06c5f -r 0eb4e96fd261 lisp/simple.el
--- a/lisp/simple.el	Sat Sep 08 13:34:20 2012 +0100
+++ b/lisp/simple.el	Sat Sep 08 16:33:48 2012 +0100
@@ -391,8 +391,13 @@
 interactively with the mark inactive, or called from Lisp with
 END nil), it also deletes all trailing lines at the end of the
 buffer if the variable `delete-trailing-lines' is non-nil."
-  ;; XEmacs; "*r" instead of re-implementing it.
-  (interactive "*r")
+  (interactive (progn
+                 (barf-if-buffer-read-only)
+                 (if (if zmacs-regions
+                         zmacs-region-active-p
+                       (eq (marker-buffer (mark-marker t)) (current-buffer)))
+                     (list (region-beginning) (region-end))
+                   (list nil nil))))
   (save-match-data
     (save-excursion
       (let ((end-marker (copy-marker (or end (point-max))))