(vhdl-template-type)

(vhdl-template-record, vhdl-template-nature)
(vhdl-template-configuration-spec, vhdl-template-component-inst)
(vhdl-template-break, vhdl-regress-line, vhdl-electric-tab): Use
delete-region instead of kill-word and kill-line.

1 files changed, 12 insertions, 10 deletions

diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el
index 2d7bbd79c6b..c549d066b64 100644
--- a/lisp/progmodes/vhdl-mode.el
+++ b/lisp/progmodes/vhdl-mode.el
@@ -7028,7 +7028,7 @@ else indent `correctly'."
             (indent-to comment-column)
             (indent-according-to-mode))
            (t                           ; inline comment indent
-            (kill-line -0))))
+            (delete-region (line-beginning-position) (point)))))
     ;; dedent
     ((and (>= (current-indentation) vhdl-basic-offset)
           (or (eq last-command 'vhdl-electric-tab)
@@ -7161,7 +7161,7 @@ ENDPOS is encountered."
         (when (not (looking-at "^\\s-*\\(--.*\\)?$"))
           (end-of-line)
           (if (search-backward " -- ((" (vhdl-point 'bol) t)
-              (kill-line))
+              (delete-region (point) (line-end-position)))
           (insert " -- ")
           (insert (format "%s" expurgated))))))
   (vhdl-keep-region-active))
@@ -8346,7 +8346,9 @@ Turn on if ARG positive, turn off if ARG negative, toggle if ARG zero or nil."
             (progn (vhdl-insert-keyword "FOR ")
                    (if (vhdl-template-field "[quantity name]" " USE " t)
                        (progn (vhdl-template-field "quantity name" " => ") t)
-                     (kill-word -1) nil))
+                     (delete-region (point)
+                                    (progn (forward-word -1) (point)))
+                     nil))
             (vhdl-template-field "[quantity name]" " => " t))
       (vhdl-template-field "expression")
       (setq position (point))
@@ -8482,7 +8484,7 @@ since these are almost equivalent)."
       (setq position (point))
       (vhdl-insert-keyword "PORT ")
       (unless (vhdl-template-map position t t)
-        (kill-line -0)
+        (delete-region (line-beginning-position) (point))
         (delete-char -1))
       (insert ";"))))
 
@@ -8573,7 +8575,7 @@ a configuration declaration if not within a design unit."
                (setq position (point))
                (vhdl-insert-keyword "PORT ")
                (unless (vhdl-template-map position t t)
-                 (kill-line -0)
+                 (delete-region (line-beginning-position) (point))
                  (delete-char -1))
                (insert ";")
                t)
@@ -9116,11 +9118,11 @@ otherwise."
         (cond ((equal definition "")
                (insert ";"))
               ((equal definition "ARRAY")
-               (kill-word -1)
+               (delete-region (point) (progn (forward-word -1) (point)))
                (vhdl-template-array 'nature t))
               ((equal definition "RECORD")
                (setq mid-pos (point-marker))
-               (kill-word -1)
+               (delete-region (point) (progn (forward-word -1) (point)))
                (vhdl-template-record 'nature name t))
               (t
                (vhdl-insert-keyword " ACROSS ")
@@ -9435,7 +9437,7 @@ otherwise."
         (insert "\n")
         (indent-to (+ margin vhdl-basic-offset))
         (setq first nil))
-      (kill-line -0)
+      (delete-region (line-beginning-position) (point))
       (indent-to margin)
       (vhdl-insert-keyword "END RECORD")
       (unless (vhdl-standard-p '87) (and name (insert " " name)))
@@ -9600,11 +9602,11 @@ otherwise."
                (delete-backward-char 4)
                (insert ";"))
               ((equal definition "ARRAY")
-               (kill-word -1)
+               (delete-region (point) (progn (forward-word -1) (point)))
                (vhdl-template-array 'type t))
               ((equal definition "RECORD")
                (setq mid-pos (point-marker))
-               (kill-word -1)
+               (delete-region (point) (progn (forward-word -1) (point)))
                (vhdl-template-record 'type name t))
               ((equal definition "ACCESS")
                (insert " ")