[Emacs-diffs] Changes to emacs/lisp/progmodes/delphi.el

[Juanma Barranquero]

Index: emacs/lisp/progmodes/delphi.el
diff -c emacs/lisp/progmodes/delphi.el:3.15 emacs/lisp/progmodes/delphi.el:3.16
*** emacs/lisp/progmodes/delphi.el:3.15 Fri Jun 10 14:15:47 2005
--- emacs/lisp/progmodes/delphi.el      Mon Jul  4 02:58:48 2005
***************
*** 88,94 ****
    )
  
  (defgroup delphi nil
!   "Major mode for editing Delphi source in Emacs"
    :version "21.1"
    :group 'languages)
  
--- 88,94 ----
    )
  
  (defgroup delphi nil
!   "Major mode for editing Delphi source in Emacs."
    :version "21.1"
    :group 'languages)
  
***************
*** 1510,1516 ****
       (set-marker-insertion-type marked-point t)
       (when (/= old-indent new-indent)
             (delete-region line-start (point))
!            (insert (make-string new-indent ?\ )))
       (goto-char marked-point)
       (set-marker marked-point nil))))
  
--- 1510,1516 ----
       (set-marker-insertion-type marked-point t)
       (when (/= old-indent new-indent)
             (delete-region line-start (point))
!            (insert (make-string new-indent ?\s)))
       (goto-char marked-point)
       (set-marker marked-point nil))))
  
***************
*** 1775,1781 ****
                 (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-re delphi-leading-spaces-re)
                 (p nil)
                 (marked-point (point-marker))) ; Maintain our position 
reliably.
--- 1775,1781 ----
                 (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 ?\s))
                 (content-prefix-re delphi-leading-spaces-re)
                 (p nil)
                 (marked-point (point-marker))) ; Maintain our position 
reliably.
***************
*** 1783,1791 ****
              ;; // style comments need more work.
              (setq content-prefix
                    (let ((comment-indent (delphi-column-of comment-start)))
!                     (concat (make-string comment-indent ?\ ) "//"
                              (make-string (- content-indent comment-indent 2)
!                                          ?\ )))
                    content-prefix-re (concat delphi-leading-spaces-re
                                              "//"
                                              delphi-spaces-re)
--- 1783,1791 ----
              ;; // style comments need more work.
              (setq content-prefix
                    (let ((comment-indent (delphi-column-of comment-start)))
!                     (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,1864 ****
               (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) ?\ ))))
          (delete-horizontal-space)
          (newline)
          (insert prefix)))))
--- 1857,1864 ----
               (comment-start (delphi-token-start start-comment))
               (content-start (delphi-comment-content-start start-comment))
               (prefix
!               (concat (make-string (delphi-column-of comment-start) ?\s) "//"
!                       (make-string (- content-start comment-start 2) ?\s))))
          (delete-horizontal-space)
          (newline)
          (insert prefix)))))