* simple.el (delete-trailing-whitespace): New interactive function.

* progmodes/ada-mode.el (ada-mode): Use it instead of
`ada-remove-trailing-spaces'
(ada-remove-trailing-spaces): Removed.
* textmodes/two-column.el (2C-merge): Recommend it in the doc.
* textmodes/picture.el (picture-mode-exit): Call it instead of
`picture-clean'.
(picture-clean): Removed.

2 files changed, 4 insertions, 11 deletions

diff --git a/lisp/textmodes/picture.el b/lisp/textmodes/picture.el
index 1c6fb384063..05e5f98db91 100644
--- a/lisp/textmodes/picture.el
+++ b/lisp/textmodes/picture.el
@@ -24,7 +24,7 @@
 
 ;;; Commentary:
 
-;; This code provides the picture-mode commands documented in the Emacs 
+;; This code provides the picture-mode commands documented in the Emacs
 ;; manual.  The screen is treated as a semi-infinite quarter-plane with
 ;; support for rectangle operations and `etch-a-sketch' character
 ;; insertion in any of eight directions.
@@ -735,7 +735,7 @@ With no argument strips whitespace from end of every line in Picture buffer
   (interactive "P")
   (if (not (eq major-mode 'picture-mode))
       (error "You aren't editing a Picture.")
-    (if (not nostrip) (picture-clean))
+    (if (not nostrip) (delete-trailing-whitespace))
     (setq mode-name picture-mode-old-mode-name)
     (use-local-map picture-mode-old-local-map)
     (setq major-mode picture-mode-old-major-mode)
@@ -743,13 +743,6 @@ With no argument strips whitespace from end of every line in Picture buffer
     (setq truncate-lines picture-mode-old-truncate-lines)
     (force-mode-line-update)))
 
-(defun picture-clean ()
-  "Eliminate whitespace at ends of lines."
-  (save-excursion
-   (goto-char (point-min))
-   (while (re-search-forward "[ \t][ \t]*$" nil t)
-     (delete-region (match-beginning 0) (point)))))
-
 (provide 'picture)
 
 ;;; picture.el ends here
diff --git a/lisp/textmodes/two-column.el b/lisp/textmodes/two-column.el
index 08b7c3c8288..a4c965a6966 100644
--- a/lisp/textmodes/two-column.el
+++ b/lisp/textmodes/two-column.el
@@ -363,7 +363,7 @@ first and the associated buffer to its right."
                     (generate-new-buffer (concat "2C/" (buffer-name)))))
                (or buffer
                    (run-hooks '2C-other-buffer-hook))))
-    
+
     (2C-mode (prog1 (point-marker)
                (other-window -1)))))
 
@@ -503,7 +503,7 @@ this one, then this one becomes the left column.
 
 If you want `2C-separator' on empty lines in the second column,
 you should put just one space in them.  In the final result, you can strip
-off trailing spaces with \\[beginning-of-buffer] \\[replace-regexp] [ SPC TAB ] + $ RET RET"
+off trailing spaces with \\[delete-trailing-whitespace]."
   (interactive)
   (and (> (car (window-edges)) 0)       ; not touching left edge of screen
        (eq (window-buffer (previous-window))