diff options
| author | Reuben Thomas <rrt@sc3d.org> | 2016-12-04 14:38:51 +0000 |
|---|---|---|
| committer | Reuben Thomas <rrt@sc3d.org> | 2016-12-13 19:43:49 +0000 |
| commit | 8886f156b305b76ffd69a96d7470eb3b700f43a4 (patch) | |
| tree | e6041906310e88a9c50aef03597ad13bfea444d0 | |
| parent | 6e88249cdcfefee6ed8f27ff4e93e433ac58ada0 (diff) | |
| download | emacs-8886f156b305b76ffd69a96d7470eb3b700f43a4.tar.gz emacs-8886f156b305b76ffd69a96d7470eb3b700f43a4.tar.bz2 emacs-8886f156b305b76ffd69a96d7470eb3b700f43a4.zip | |
Remove XEmacs-specific minibuffer handling code from ispell.el
* lisp/textmodes/ispell.el (ispell-init-process): Assume we are not in
XEmacs.
| -rw-r--r-- | lisp/textmodes/ispell.el | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el index 8978d1460bc..c2d6d60bb79 100644 --- a/lisp/textmodes/ispell.el +++ b/lisp/textmodes/ispell.el @@ -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)) |