;;; 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
;; 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:
)
(defgroup delphi nil
- "Major mode for editing Delphi source in Emacs"
+ "Major mode for editing Delphi source in Emacs."
:version "21.1"
:group 'languages)
(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)
(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))))
(save-selected-window
(switch-to-buffer-other-window to-buffer)
(goto-char (point-max))
- (set-window-dot (get-buffer-window to-buffer) (point))
+ (set-window-point (get-buffer-window to-buffer) (point))
(insert the-msg))))
;; Debugging helpers:
(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.
;; // 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)
(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)))))
(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