(makefile-cleanup-continuations, makefile-warn-suspicious-lines):

Use `derived-mode-p'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 60eb38d26133ddef186ca9918998a655ea1faf19..1cdfc807853495ee7477ba35fc31d1ecc9ea1d19 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-03  John Paul Wallington  <jpw@pobox.com>
+
+       * progmodes/make-mode.el (makefile-cleanup-continuations)
+       (makefile-warn-suspicious-lines, makefile-warn-continuations):
+       Use `derived-mode-p'.
+
 2008-06-03  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * Makefile.in (update-elclist): Impose a fixed collation for sorting.

diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index c3ba2bf19c08a18ba3fa28419fa8ff7cb1049440..0d83f66701ddb92d61537d431522dc43e3dc5091 100644 (file)
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -1688,7 +1688,7 @@ and generates the overview, one line per target name."
 ;;; ------------------------------------------------------------
 
 (defun makefile-cleanup-continuations ()
-  (if (eq major-mode 'makefile-mode)
+  (if (derived-mode-p 'makefile-mode)
       (if (and makefile-cleanup-continuations
               (not buffer-read-only))
          (save-excursion
@@ -1703,7 +1703,7 @@ and generates the overview, one line per target name."
 
 (defun makefile-warn-suspicious-lines ()
   ;; Returning non-nil cancels the save operation
-  (if (eq major-mode 'makefile-mode)
+  (if (derived-mode-p 'makefile-mode)
       (save-excursion
        (goto-char (point-min))
        (if (re-search-forward "^\\(\t+$\\| +\t\\)" nil t)
@@ -1712,7 +1712,7 @@ and generates the overview, one line per target name."
                          (count-lines (point-min) (point)))))))))
 
 (defun makefile-warn-continuations ()
-  (if (eq major-mode 'makefile-mode)
+  (if (derived-mode-p 'makefile-mode)
       (save-excursion
        (goto-char (point-min))
        (if (re-search-forward "\\\\[ \t]+$" nil t)