diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-05-07 07:50:49 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-05-07 07:50:49 -0700 |
| commit | 766b057e41df7316808ec7658836fda75facda75 (patch) | |
| tree | 9f35f8fdc99192a66c01c10b8a6b3cae1fb6ebd4 /lisp/textmodes | |
| parent | 6e362a32bc9d21f73a0f29ca6f45481edeea6f29 (diff) | |
| parent | 1d732d699d63b5dbfa7d0a0f44e6119d58f852bc (diff) | |
| download | emacs-766b057e41df7316808ec7658836fda75facda75.tar.gz emacs-766b057e41df7316808ec7658836fda75facda75.tar.bz2 emacs-766b057e41df7316808ec7658836fda75facda75.zip | |
Merge from origin/emacs-26
1d732d6 (origin/emacs-26) Fix gud-statement for pdb
91a68b5 ; * msdos/INSTALL: Add info about GCC versions.
7ddcc9a Document 'custom-group'
58f9e15 A minor addition to etc/DEBUG
4590414 Avoid errors in ispell.el when Enchant returns empty extra chars
d0d75f9 Make 'ispell-initialize-spellchecker-hook' work again
b90ce66 Handle selected_window change in prepare_menu_bars (Bug#31312)
79ad0b3 ; * INSTALL: Fix Emacs version number. (Bug#31358)
91de88b Fix report-emacs-bug via mailclient on MS-Windows
f4b5ff2 Port collation tests to glibc 2.27
Diffstat (limited to 'lisp/textmodes')
| -rw-r--r-- | lisp/textmodes/ispell.el | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el index d03d12b3758..73a2c2da8b1 100644 --- a/lisp/textmodes/ispell.el +++ b/lisp/textmodes/ispell.el @@ -1212,8 +1212,10 @@ Internal use.") (defun ispell--get-extra-word-characters (&optional lang) "Get the extra word characters for LANG as a character class. If LANG is omitted, get the extra word characters for the default language." - (concat "[" (string-trim-right (apply 'ispell--call-enchant-lsmod - (append '("-word-chars") (if lang `(,lang))))) "]")) + (let ((extra (string-trim-right + (apply 'ispell--call-enchant-lsmod + (append '("-word-chars") (if lang `(,lang))))))) + (if (string= extra "") "" (concat "[" extra "]")))) (defun ispell-find-enchant-dictionaries () "Find Enchant's dictionaries, and record in `ispell-enchant-dictionary-alist'." @@ -1243,6 +1245,10 @@ If LANG is omitted, get the extra word characters for the default language." (defvar ispell-last-program-name nil "Last value of `ispell-program-name'. Internal use.") +;; Allow dynamically binding ispell-base-dicts-override-alist as +;; advertised in the doc string of ispell-initialize-spellchecker-hook. +(defvar ispell-base-dicts-override-alist) + (defvar ispell-initialize-spellchecker-hook nil "Normal hook run on spellchecker initialization. This hook is run when a spellchecker is used for the first |