mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Remove XEmacs-specific minibuffer handling code from ispell.el

Browse source 
* lisp/textmodes/ispell.el (ispell-init-process): Assume we are not in
XEmacs.
This commit is contained in:
Reuben Thomas 2016-12-04 14:38:51 +00:00
parent 6e88249cdc
commit 8886f156b3
1 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lisp/textmodes/ispell.el
View file

@ -2794,7 +2794,7 @@ Keeps argument list for future Ispell invocations for no async support."
(current-ispell-directory default-directory) ;FIXME: Unused?
;; The default directory for the process.
;; Use "~/" as default-directory unless using Ispell with per-dir
;; personal dictionaries and not in a minibuffer under XEmacs
;; personal dictionaries
(default-directory
(if (or ispell-really-aspell
ispell-really-hunspell
@ -2807,9 +2807,8 @@ Keeps argument list for future Ispell invocations for no async support."
".ispell_"
(or dict-bname
"default")))))
;; Ispell, in a minibuffer, and XEmacs
(and (window-minibuffer-p)
(not (fboundp 'minibuffer-selected-window))))
;; Ispell, in a minibuffer
(window-minibuffer-p))
(expand-file-name "~/")
(expand-file-name default-directory))))
;; Check if process needs restart
@ -2841,12 +2840,11 @@ Keeps argument list for future Ispell invocations for no async support."
(unless (equal ispell-process-directory (expand-file-name "~/"))
;; At this point, `ispell-process-directory' will be "~/" unless using
;; Ispell with directory-specific dicts and not in XEmacs minibuffer.
;; Ispell with directory-specific dicts.
;; If not, kill ispell process when killing buffer. It may be in a
;; removable device that would otherwise become un-mountable.
(with-current-buffer
(if (and (window-minibuffer-p) ;; In minibuffer
(fboundp 'minibuffer-selected-window)) ;; Not XEmacs.
(if (window-minibuffer-p) ;; In minibuffer
;; In this case kill ispell only when parent buffer is killed
;; to avoid over and over ispell kill.
(window-buffer (minibuffer-selected-window))