Use quit-window in some functions

* lisp/strokes.el:
* lisp/startup.el (fancy-startup-tail):
* lisp/progmodes/verilog-mode.el (verilog-complete-word)
(verilog-show-completions):
* lisp/progmodes/idlwave.el (idlwave-quit-help): Use `quit-window'
(bug#24213).

4 files changed, 6 insertions, 10 deletions

diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el
index 1b4b55c94f3..3535a7b4aa3 100644
--- a/lisp/progmodes/idlwave.el
+++ b/lisp/progmodes/idlwave.el
@@ -8271,7 +8271,7 @@ If we do not know about MODULE, just return KEYWORD literally."
       (select-window olh-window)
       (idlwave-help-quit))
     (when (window-live-p ri-window)
-      (delete-window ri-window))))
+      (quit-window nil ri-window))))
 
 (defun idlwave-display-calling-sequence (name type class
                                               &optional initial-class)
diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el
index baeaf8b95de..5bfa5f837a0 100644
--- a/lisp/progmodes/verilog-mode.el
+++ b/lisp/progmodes/verilog-mode.el
@@ -7598,8 +7598,7 @@ and `verilog-separator-keywords'.)"
                (display-completion-list allcomp))
              ;; Wait for a key press. Then delete *Completion*  window
              (momentary-string-display "" (point))
-             (delete-window (get-buffer-window (get-buffer "*Completions*")))
-             )))))
+             (quit-window nil (get-buffer-window "*Completions*")))))))
 
 (defun verilog-show-completions ()
   "Show all possible completions at current point."
@@ -7611,7 +7610,8 @@ and `verilog-separator-keywords'.)"
     (display-completion-list (nth 2 (verilog-completion-at-point))))
   ;; Wait for a key press. Then delete *Completion*  window
   (momentary-string-display "" (point))
-  (delete-window (get-buffer-window (get-buffer "*Completions*"))))
+  (quit-window nil (get-buffer-window "*Completions*")))
+
 
 (defun verilog-get-default-symbol ()
   "Return symbol around current point as a string."
diff --git a/lisp/startup.el b/lisp/startup.el
index 393d7872560..48b483415a3 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1856,9 +1856,7 @@ a face or button specification."
                   (customize-set-variable 'inhibit-startup-screen t)
                   (customize-mark-to-save 'inhibit-startup-screen)
                   (custom-save-all))
-                (let ((w (get-buffer-window "*GNU Emacs*")))
-                  (and w (not (one-window-p)) (delete-window w)))
-                (kill-buffer "*GNU Emacs*")))
+                (quit-windows-on "*GNU Emacs*" t)))
      "  ")
     (when (or user-init-file custom-file)
       (let ((checked (create-image "checked.xpm"
diff --git a/lisp/strokes.el b/lisp/strokes.el
index 6edf58c7b6b..2c88b1eefdc 100644
--- a/lisp/strokes.el
+++ b/lisp/strokes.el
@@ -1216,9 +1216,7 @@ the stroke as a character in some language."
 
 ;;(defun strokes-edit-quit ()
 ;;  (interactive)
-;;  (or (one-window-p t 0)
-;;      (delete-window))
-;;  (kill-buffer "*Strokes List*"))
+;;  (quit-windows-on "*Strokes List*" t))
 
 ;;(define-derived-mode edit-strokes-mode list-mode
 ;;  "Edit-Strokes"