Accepting request 643901 from editors

- Let ispell.el perform even on older systems without default
  hunspell dictionary as otherwise this leads to wrong type
  error as nil is not a pointer to a string

- Let site-start.el also seek for hunspell to load the ispell
  lisp library (boo#1110387)

- Help ispell(.el) to find and provide the usable dictionaries
  even for hunspell (boo#1110387)

OBS-URL: https://build.opensuse.org/request/show/643901
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/emacs?expand=0&rev=141
This commit is contained in:
Dominique Leuenberger 2018-11-06 12:58:31 +00:00 committed by Git OBS Bridge
commit 1917de2b41
4 changed files with 58 additions and 7 deletions

View File

@ -11,13 +11,13 @@
lisp/net/ange-ftp.el | 8 +--
lisp/site-load.el | 41 ++++++++++++++++
lisp/speedbar.el | 1
lisp/textmodes/ispell.el | 60 +++++++++++++++++++++++-
lisp/textmodes/ispell.el | 85 ++++++++++++++++++++++++++++++++---
site-lisp/term/func-keys.el | 33 +++++++++++++
site-lisp/term/gnome.el | 97 ++++++++++++++++++++++++++++++++++++++++
site-lisp/term/kvt.el | 97 ++++++++++++++++++++++++++++++++++++++++
site-lisp/term/linux.el | 79 ++++++++++++++++++++++++++++++++
site-lisp/term/locale.el | 13 +++++
18 files changed, 449 insertions(+), 32 deletions(-)
18 files changed, 473 insertions(+), 33 deletions(-)
--- Makefile.in
+++ Makefile.in 2018-05-29 13:07:53.479965338 +0000
@ -346,7 +346,17 @@
"Program invoked by \\[ispell-word] and \\[ispell-region] commands."
:type 'string
:set (lambda (symbol value)
@@ -1414,6 +1416,56 @@ The variable `ispell-library-directory'
@@ -1179,7 +1181,8 @@ dictionary from that list was found."
(setq hunspell-default-dict (or hunspell-multi-dict
(car hunspell-default-dict)))
(setq hunspell-default-dict-entry
- (ispell-parse-hunspell-affix-file hunspell-default-dict))
+ (if hunspell-default-dict
+ (ispell-parse-hunspell-affix-file hunspell-default-dict) nil))
;; Create an alist of found dicts with only names, except for default dict.
(setq ispell-hunspell-dictionary-alist
(list (cons nil (cdr hunspell-default-dict-entry))))
@@ -1414,6 +1417,78 @@ The variable `ispell-library-directory'
(if ispell-menu-map-needed
(progn
(setq ispell-menu-map (make-sparse-keymap "Spell"))
@ -398,7 +408,29 @@
+ (define-key ispell-menu-map (vector (intern name))
+ (cons (concat "Select " (capitalize name) " Dict")
+ (list 'lambda () '(interactive)
+ (list 'ispell-change-dictionary name)))))))))))
+ (list 'ispell-change-dictionary name)))))))))
+ (if (and (functionp 'ispell-find-hunspell-dictionaries)
+ (symbolp 'ispell-program-name)
+ (string-match "hunspell" ispell-program-name))
+ (progn
+ (ispell-find-hunspell-dictionaries)
+ (let ((dicts (reverse (cons (cons "default" nil)
+ (append ispell-local-dictionary-alist ispell-hunspell-dictionary-alist))))
+ name load-dict)
+ (dolist (dict dicts)
+ (setq name (car dict))
+ (cond ((not (stringp name))
+ (define-key ispell-menu-map (vector 'default)
+ (cons "Select Default Dict"
+ (cons "Dictionary for which Hunspell was configured"
+ (list 'lambda () '(interactive)
+ (list 'ispell-change-dictionary "default"))))))
+ ((stringp name)
+ (define-key ispell-menu-map (vector (intern name))
+ (cons (concat "Select " (capitalize name) " Dict")
+ (list 'lambda () '(interactive)
+ (list 'ispell-change-dictionary name)
+ )))))))))))
+ ;; End adding list for ispell dictonaries installed on SuSE
(define-key ispell-menu-map [ispell-change-dictionary]
`(menu-item ,(purecopy "Change Dictionary...") ispell-change-dictionary

View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Tue Oct 23 08:25:39 UTC 2018 - Dr. Werner Fink <werner@suse.de>
- Let ispell.el perform even on older systems without default
hunspell dictionary as otherwise this leades to wrong type
error as nil is not a pointer to a string
-------------------------------------------------------------------
Tue Oct 23 06:37:33 UTC 2018 - Dr. Werner Fink <werner@suse.de>
- Let site-start.el also seek for hunspell to load the ispell
lisp library (boo#1110387)
-------------------------------------------------------------------
Mon Oct 22 13:56:16 UTC 2018 - Dr. Werner Fink <werner@suse.de>
- Help ispell(.el) to find and provide the usable dictionaries
even for hunspell (boo#1110387)
-------------------------------------------------------------------
Fri Jul 20 09:33:08 UTC 2018 - werner@suse.de

View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:573745709c98d3a20e5805fbde9f52ae57528eb74b9966434c0a0c369fe50b6a
size 51723
oid sha256:a1d2ebbc40bd8a9d89fdf72ceb92465087fc803567c65259bd884cfa33c11dbc
size 51806