procyberian/emacs
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Packages Wiki Activity Actions

Use quit-window in some functions

Browse source 
* 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).
This commit is contained in:
Andreas Politz 2019-10-13 05:08:37 +02:00 committed by Lars Ingebrigtsen
parent e1a4ed67b3
commit 4d74b2b953
4 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lisp/progmodes/idlwave.el
View file

@ -8271,7 +8271,7 @@ If we do not know about MODULE, just return KEYWORD literally."
(select-window olh-window) (select-window olh-window)
(idlwave-help-quit)) (idlwave-help-quit))
(when (window-live-p ri-window) (when (window-live-p ri-window)
(delete-window ri-window)))) (quit-window nil ri-window))))
(defun idlwave-display-calling-sequence (name type class (defun idlwave-display-calling-sequence (name type class
&optional initial-class) &optional initial-class)

6
lisp/progmodes/verilog-mode.el
View file

@ -7598,8 +7598,7 @@ and `verilog-separator-keywords'.)"
(display-completion-list allcomp)) (display-completion-list allcomp))
;; Wait for a key press. Then delete *Completion* window ;; Wait for a key press. Then delete *Completion* window
(momentary-string-display "" (point)) (momentary-string-display "" (point))
(delete-window (get-buffer-window (get-buffer "*Completions*"))) (quit-window nil (get-buffer-window "*Completions*")))))))
)))))
(defun verilog-show-completions () (defun verilog-show-completions ()
"Show all possible completions at current point." "Show all possible completions at current point."
@ -7611,7 +7610,8 @@ and `verilog-separator-keywords'.)"
(display-completion-list (nth 2 (verilog-completion-at-point)))) (display-completion-list (nth 2 (verilog-completion-at-point))))
;; Wait for a key press. Then delete *Completion* window ;; Wait for a key press. Then delete *Completion* window
(momentary-string-display "" (point)) (momentary-string-display "" (point))
(delete-window (get-buffer-window (get-buffer "*Completions*")))) (quit-window nil (get-buffer-window "*Completions*")))
(defun verilog-get-default-symbol () (defun verilog-get-default-symbol ()
"Return symbol around current point as a string." "Return symbol around current point as a string."

4
lisp/startup.el
View file

@ -1856,9 +1856,7 @@ a face or button specification."
(customize-set-variable 'inhibit-startup-screen t) (customize-set-variable 'inhibit-startup-screen t)
(customize-mark-to-save 'inhibit-startup-screen) (customize-mark-to-save 'inhibit-startup-screen)
(custom-save-all)) (custom-save-all))
(let ((w (get-buffer-window "*GNU Emacs*"))) (quit-windows-on "*GNU Emacs*" t)))
(and w (not (one-window-p)) (delete-window w)))
(kill-buffer "*GNU Emacs*")))
" ") " ")
(when (or user-init-file custom-file) (when (or user-init-file custom-file)
(let ((checked (create-image "checked.xpm" (let ((checked (create-image "checked.xpm"

4
lisp/strokes.el
View file

@ -1216,9 +1216,7 @@ the stroke as a character in some language."
;;(defun strokes-edit-quit () ;;(defun strokes-edit-quit ()
;; (interactive) ;; (interactive)
;; (or (one-window-p t 0) ;; (quit-windows-on "*Strokes List*" t))
;; (delete-window))
;; (kill-buffer "*Strokes List*"))
;;(define-derived-mode edit-strokes-mode list-mode ;;(define-derived-mode edit-strokes-mode list-mode
;; "Edit-Strokes" ;; "Edit-Strokes"