* progmodes/ada-mode.el (ada-clean-buffer-before-saving): Make obsolete.

  (ada-mode): Don't obey `ada-clean-buffer-before-saving' anymore.

2 files changed, 9 insertions, 10 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2b14d89c325..fae0eb39051 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-14  Stephen Leake  <stephen_leake@member.fsf.org>
+
+        * progmodes/ada-mode.el (ada-clean-buffer-before-saving): Make obsolete.
+        (ada-mode): Don't obey `ada-clean-buffer-before-saving' anymore.
+
 2010-01-14  Glenn Morris  <rgm@gnu.org>
 
         * frame.el (show-trailing-whitespace): Safe if boolean.  (Bug#5312)
diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el
index d0affdc0726..e246118fae2 100644
--- a/lisp/progmodes/ada-mode.el
+++ b/lisp/progmodes/ada-mode.el
@@ -229,11 +229,13 @@ It may be `downcase-word', `upcase-word', `ada-loose-case-word' or
                  (const ada-no-auto-case))
   :group 'ada)
 
-;; FIXME If this is not something required by the ada language, this
-;; should be removed.
 (defcustom ada-clean-buffer-before-saving t
   "*Non-nil means remove trailing spaces and untabify the buffer before saving."
   :type 'boolean :group 'ada)
+(make-obsolete-variable 'ada-clean-buffer-before-saving
+                        "use the `write-file-functions' hook."
+                        "23.2")
+
 
 (defcustom ada-indent 3
   "*Size of Ada indentation.
@@ -1303,14 +1305,6 @@ the file name."
 
   (set-syntax-table ada-mode-syntax-table)
 
-  (if ada-clean-buffer-before-saving
-      (progn
-        ;; remove all spaces at the end of lines in the whole buffer.
-        (add-hook 'local-write-file-hooks 'delete-trailing-whitespace)
-        ;; convert all tabs to the correct number of spaces.
-        (add-hook 'local-write-file-hooks
-                  (lambda () (untabify (point-min) (point-max))))))
-
   (set (make-local-variable 'skeleton-further-elements)
        '((< '(backward-delete-char-untabify
               (min ada-indent (current-column))))))