(compilation-disable-input): Default to nil.

[gnu-emacs] / lisp / progmodes / delphi.el

diff --git a/lisp/progmodes/delphi.el b/lisp/progmodes/delphi.el
index 8d3ee554026462046206a6eba30521458857830f..0c94120a0f8b2071a26c962413c63ca96d1196e1 100644 (file)
--- a/lisp/progmodes/delphi.el
+++ b/lisp/progmodes/delphi.el
@@ -1,6 +1,7 @@
 ;;; delphi.el --- major mode for editing Delphi source (Object Pascal) in Emacs
 
-;; Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004, 2005
+;; Free Software Foundation, Inc.
 
 ;; Author: Ray Blaak <blaak@infomatch.com>
 ;; Keywords: languages
@@ -19,7 +20,7 @@
 
 ;; You should have received a copy of the GNU General Public License along with
 ;; GNU Emacs; see the file COPYING.  If not, write to the Free Software
-;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -88,7 +89,7 @@
   )
 
 (defgroup delphi nil
-  "Major mode for editing Delphi source in Emacs"
+  "Major mode for editing Delphi source in Emacs."
   :version "21.1"
   :group 'languages)
 
@@ -152,8 +153,8 @@ regardless of where in the line point is when the TAB command is used."
 (defcustom delphi-newline-always-indents t
   "*Non-nil means NEWLINE in Delphi mode should always reindent the current
 line, insert a blank line and move to the default indent column of the blank
-line. If nil, then no indentation occurs, and NEWLINE does the usual
-behaviour. This is useful when one needs to do customized indentation that
+line.  If nil, then no indentation occurs, and NEWLINE does the usual
+behavior.  This is useful when one needs to do customized indentation that
 differs from the default."
   :type 'boolean
   :group 'delphi)
@@ -1510,7 +1511,7 @@ before the indent, the point is moved to the indent."
      (set-marker-insertion-type marked-point t)
      (when (/= old-indent new-indent)
            (delete-region line-start (point))
-           (insert (make-string new-indent ?\ )))
+           (insert (make-string new-indent ?\s)))
      (goto-char marked-point)
      (set-marker marked-point nil))))
 
@@ -1775,7 +1776,7 @@ An error is raised if not in a comment."
                (comment-end (delphi-token-end end-comment))
                (content-start (delphi-comment-content-start start-comment))
                (content-indent (delphi-column-of content-start))
-               (content-prefix (make-string content-indent ?\ ))
+               (content-prefix (make-string content-indent ?\s))
                (content-prefix-re delphi-leading-spaces-re)
                (p nil)
                (marked-point (point-marker))) ; Maintain our position reliably.
@@ -1783,9 +1784,9 @@ An error is raised if not in a comment."
             ;; // style comments need more work.
             (setq content-prefix
                   (let ((comment-indent (delphi-column-of comment-start)))
-                    (concat (make-string comment-indent ?\ ) "//"
+                    (concat (make-string comment-indent ?\s) "//"
                             (make-string (- content-indent comment-indent 2)
-                                         ?\ )))
+                                         ?\s)))
                   content-prefix-re (concat delphi-leading-spaces-re
                                             "//"
                                             delphi-spaces-re)
@@ -1857,8 +1858,8 @@ comment block. If not in a // comment, just does a normal newline."
              (comment-start (delphi-token-start start-comment))
              (content-start (delphi-comment-content-start start-comment))
              (prefix
-              (concat (make-string (delphi-column-of comment-start) ?\ ) "//"
-                      (make-string (- content-start comment-start 2) ?\ ))))
+              (concat (make-string (delphi-column-of comment-start) ?\s) "//"
+                      (make-string (- content-start comment-start 2) ?\s))))
         (delete-horizontal-space)
         (newline)
         (insert prefix)))))
@@ -2002,7 +2003,7 @@ no args, if that value is non-nil."
        (delphi-parse-region (point-min) (point-max))
        (delphi-progress-done))))
 
-  (run-hooks 'delphi-mode-hook))
+  (run-mode-hooks 'delphi-mode-hook))
 
 ;;; arch-tag: 410e192d-e9b5-4397-ad62-12340fc3fa41
 ;;; delphi.el ends here