aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2015-08-22 13:38:51 +0300
committerEli Zaretskii2015-08-22 13:38:51 +0300
commit19efb9db0a03c453475f3b735d4f2e6fdfb853e4 (patch)
treeb559b4f0e8741d1844fa87f0fbd53c12ee2181f2
parenta3f3cd7c4a79ba54f00ebd8424db3137f297517b (diff)
downloademacs-19efb9db0a03c453475f3b735d4f2e6fdfb853e4.tar.gz
emacs-19efb9db0a03c453475f3b735d4f2e6fdfb853e4.zip
Minor formatting changes in ispell.el
* lisp/textmodes/ispell.el (ispell-create-debug-buffer) (ispell-print-if-debug, ispell-aspell-find-dictionary) (ispell-aspell-add-aliases, ispell-hunspell-dict-paths-alist) (ispell-hunspell-dictionary-alist) (ispell-hunspell-fill-dictionary-entry) (ispell-find-hunspell-dictionaries, ispell-send-replacement) (ispell-buffer-with-debug, ispell-complete-word) (ispell-current-dictionary, ispell-current-personal-dictionary) (ispell-accept-output, ispell-minor-mode) (ispell-personal-dictionary, ispell-dictionary-alist) (ispell-really-aspell, ispell-really-hunspell) (ispell-encoding8-command, ispell-aspell-supports-utf8) (ispell-aspell-dictionary-alist, ispell-set-spellchecker-params): Fix whitespace, inconsistent capitalization, and arguments in doc strings.
-rw-r--r--lisp/textmodes/ispell.el82
1 files changed, 41 insertions, 41 deletions
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index b0fcb1724f5..5831fc82ac3 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -492,7 +492,7 @@ window system by evaluating the following on startup to set this variable:
492(defcustom ispell-personal-dictionary nil 492(defcustom ispell-personal-dictionary nil
493 "File name of your personal spelling dictionary, or nil. 493 "File name of your personal spelling dictionary, or nil.
494If nil, the default personal dictionary, (\"~/.ispell_DICTNAME\" for ispell or 494If nil, the default personal dictionary, (\"~/.ispell_DICTNAME\" for ispell or
495\"~/.aspell.LANG.pws\" for aspell) is used, where DICTNAME is the name of your 495\"~/.aspell.LANG.pws\" for Aspell) is used, where DICTNAME is the name of your
496default dictionary and LANG the two letter language code." 496default dictionary and LANG the two letter language code."
497 :type '(choice file 497 :type '(choice file
498 (const :tag "default" nil)) 498 (const :tag "default" nil))
@@ -747,29 +747,29 @@ when the language uses non-ASCII characters.
747Note that with \"ispell\" as the speller, the CASECHARS and 747Note that with \"ispell\" as the speller, the CASECHARS and
748OTHERCHARS slots of the alist should contain the same character 748OTHERCHARS slots of the alist should contain the same character
749set as casechars and otherchars in the LANGUAGE.aff file \(e.g., 749set as casechars and otherchars in the LANGUAGE.aff file \(e.g.,
750english.aff\). aspell and hunspell don't have this limitation.") 750english.aff\). Aspell and Hunspell don't have this limitation.")
751 751
752(defvar ispell-really-aspell nil 752(defvar ispell-really-aspell nil
753 "Non-nil if we can use aspell extensions.") 753 "Non-nil if we can use Aspell extensions.")
754(defvar ispell-really-hunspell nil 754(defvar ispell-really-hunspell nil
755 "Non-nil if we can use hunspell extensions.") 755 "Non-nil if we can use Hunspell extensions.")
756(defvar ispell-encoding8-command nil 756(defvar ispell-encoding8-command nil
757 "Command line option prefix to select encoding if supported, nil otherwise. 757 "Command line option prefix to select encoding if supported, nil otherwise.
758If setting the encoding is supported by spellchecker and is selectable from 758If setting the encoding is supported by spellchecker and is selectable from
759the command line, this variable will contain \"--encoding=\" for aspell 759the command line, this variable will contain \"--encoding=\" for Aspell
760and \"-i \" for hunspell, so the appropriate mime charset can be selected. 760and \"-i \" for Hunspell, so the appropriate mime charset can be selected.
761That will be set in `ispell-check-version' for hunspell >= 1.1.6 and 761That will be set in `ispell-check-version' for Hunspell >= 1.1.6 and
762aspell >= 0.60. 762Aspell >= 0.60.
763 763
764For aspell, non-nil also means to try to automatically find its dictionaries. 764For Aspell, non-nil also means to try to automatically find its dictionaries.
765 765
766Earlier aspell versions do not consistently support charset encoding. Handling 766Earlier Aspell versions do not consistently support charset encoding. Handling
767this would require some extra guessing in `ispell-aspell-find-dictionary'.") 767this would require some extra guessing in `ispell-aspell-find-dictionary'.")
768 768
769(defvar ispell-aspell-supports-utf8 nil 769(defvar ispell-aspell-supports-utf8 nil
770 "Non-nil if aspell has consistent command line UTF-8 support. Obsolete. 770 "Non-nil if Aspell has consistent command line UTF-8 support. Obsolete.
771ispell.el and flyspell.el will use for this purpose the more generic 771ispell.el and flyspell.el will use for this purpose the more generic
772variable `ispell-encoding8-command' for both aspell and hunspell. Is left 772variable `ispell-encoding8-command' for both Aspell and Hunspell. Is left
773here just for backwards compatibility.") 773here just for backwards compatibility.")
774 774
775(make-obsolete-variable 'ispell-aspell-supports-utf8 775(make-obsolete-variable 'ispell-aspell-supports-utf8
@@ -944,7 +944,7 @@ Otherwise returns the library directory name, if that is defined."
944 944
945(defun ispell-create-debug-buffer (&optional append) 945(defun ispell-create-debug-buffer (&optional append)
946 "Create an ispell debug buffer for debugging output. 946 "Create an ispell debug buffer for debugging output.
947Use APPEND to append the info to previous buffer if exists, 947If APPEND is non-nil, append the info to previous buffer if exists,
948otherwise is reset. Returns name of ispell debug buffer. 948otherwise is reset. Returns name of ispell debug buffer.
949See `ispell-buffer-with-debug' for an example of use." 949See `ispell-buffer-with-debug' for an example of use."
950 (let ((ispell-debug-buffer (get-buffer-create "*ispell-debug*"))) 950 (let ((ispell-debug-buffer (get-buffer-create "*ispell-debug*")))
@@ -956,7 +956,7 @@ See `ispell-buffer-with-debug' for an example of use."
956 ispell-debug-buffer)) 956 ispell-debug-buffer))
957 957
958(defsubst ispell-print-if-debug (format &rest args) 958(defsubst ispell-print-if-debug (format &rest args)
959 "Print message to `ispell-debug-buffer' buffer if enabled." 959 "Print message using FORMAT and ARGS to `ispell-debug-buffer' buffer if enabled."
960 (if (boundp 'ispell-debug-buffer) 960 (if (boundp 'ispell-debug-buffer)
961 (with-current-buffer ispell-debug-buffer 961 (with-current-buffer ispell-debug-buffer
962 (goto-char (point-max)) 962 (goto-char (point-max))
@@ -1009,13 +1009,13 @@ and added as a submenu of the \"Edit\" menu.")
1009;; Make ispell.el work better with aspell. 1009;; Make ispell.el work better with aspell.
1010 1010
1011(defvar ispell-aspell-dictionary-alist nil 1011(defvar ispell-aspell-dictionary-alist nil
1012 "An alist of parsed aspell dicts and associated parameters. 1012 "An alist of parsed Aspell dicts and associated parameters.
1013Internal use.") 1013Internal use.")
1014 1014
1015(defun ispell-find-aspell-dictionaries () 1015(defun ispell-find-aspell-dictionaries ()
1016 "Find Aspell's dictionaries, and record in `ispell-dictionary-alist'." 1016 "Find Aspell's dictionaries, and record in `ispell-dictionary-alist'."
1017 (unless (and ispell-really-aspell ispell-encoding8-command) 1017 (unless (and ispell-really-aspell ispell-encoding8-command)
1018 (error "This function only works with aspell >= 0.60")) 1018 (error "This function only works with Aspell >= 0.60"))
1019 (let* ((dictionaries 1019 (let* ((dictionaries
1020 (split-string 1020 (split-string
1021 (with-temp-buffer 1021 (with-temp-buffer
@@ -1053,7 +1053,7 @@ Assumes that value contains no whitespace."
1053 (car (split-string (buffer-string))))) 1053 (car (split-string (buffer-string)))))
1054 1054
1055(defun ispell-aspell-find-dictionary (dict-name) 1055(defun ispell-aspell-find-dictionary (dict-name)
1056 "For aspell dictionary DICT-NAME, return a list of parameters if an 1056 "For Aspell dictionary DICT-NAME, return a list of parameters if an
1057associated data file is found or nil otherwise. List format is that 1057associated data file is found or nil otherwise. List format is that
1058of `ispell-dictionary-base-alist' elements." 1058of `ispell-dictionary-base-alist' elements."
1059 1059
@@ -1119,7 +1119,7 @@ of `ispell-dictionary-base-alist' elements."
1119 'utf-8))))) 1119 'utf-8)))))
1120 1120
1121(defun ispell-aspell-add-aliases (alist) 1121(defun ispell-aspell-add-aliases (alist)
1122 "Find aspell's dictionary aliases and add them to dictionary ALIST. 1122 "Find Aspell's dictionary aliases and add them to dictionary ALIST.
1123Return the new dictionary alist." 1123Return the new dictionary alist."
1124 (let ((aliases 1124 (let ((aliases
1125 (file-expand-wildcards 1125 (file-expand-wildcards
@@ -1150,20 +1150,20 @@ Return the new dictionary alist."
1150;; Make ispell.el work better with hunspell. 1150;; Make ispell.el work better with hunspell.
1151 1151
1152(defvar ispell-hunspell-dict-paths-alist nil 1152(defvar ispell-hunspell-dict-paths-alist nil
1153 "Alist of parsed hunspell dicts and associated affix files. 1153 "Alist of parsed Hunspell dicts and associated affix files.
1154Will be used to parse corresponding .aff file and create associated 1154Will be used to parse corresponding .aff file and create associated
1155parameters to be inserted into `ispell-hunspell-dictionary-alist'. 1155parameters to be inserted into `ispell-hunspell-dictionary-alist'.
1156Internal use.") 1156Internal use.")
1157 1157
1158(defvar ispell-hunspell-dictionary-alist nil 1158(defvar ispell-hunspell-dictionary-alist nil
1159 "Alist of parsed hunspell dicts and associated parameters. 1159 "Alist of parsed Hunspell dicts and associated parameters.
1160This alist will initially contain names of found dicts. Associated 1160This alist will initially contain names of found dicts. Associated
1161parameters will be added when dict is used for the first time. 1161parameters will be added when dict is used for the first time.
1162Internal use.") 1162Internal use.")
1163 1163
1164(defun ispell-hunspell-fill-dictionary-entry (dict) 1164(defun ispell-hunspell-fill-dictionary-entry (dict)
1165 "Fill `ispell-dictionary-alist' uninitialized entries for `DICT' and aliases. 1165 "Fill uninitialized entries in `ispell-dictionary-alist' for DICT and aliases.
1166Value will be extracted from hunspell affix file and used for 1166Value of those entries will be extracted from Hunspell affix file and used for
1167all uninitialized dicts using that affix file." 1167all uninitialized dicts using that affix file."
1168 (if (cadr (assoc dict ispell-dictionary-alist)) 1168 (if (cadr (assoc dict ispell-dictionary-alist))
1169 (message "ispell-hfde: Non void entry for %s. Skipping.\n" dict) 1169 (message "ispell-hfde: Non void entry for %s. Skipping.\n" dict)
@@ -1178,13 +1178,13 @@ all uninitialized dicts using that affix file."
1178 (dict-equiv-value (cadr dict-equiv-alist-entry))) 1178 (dict-equiv-value (cadr dict-equiv-alist-entry)))
1179 (if (or (member dict dict-equiv-alist-entry) 1179 (if (or (member dict dict-equiv-alist-entry)
1180 (member dict-alias dict-equiv-alist-entry)) 1180 (member dict-alias dict-equiv-alist-entry))
1181 (dolist ( tmp-dict (list dict-equiv-key dict-equiv-value)) 1181 (dolist (tmp-dict (list dict-equiv-key dict-equiv-value))
1182 (if (cadr (assoc tmp-dict ispell-dictionary-alist)) 1182 (if (cadr (assoc tmp-dict ispell-dictionary-alist))
1183 (ispell-print-if-debug 1183 (ispell-print-if-debug
1184 "ispell-hfde: %s already expanded. Skipping.\n" tmp-dict) 1184 "ispell-hfde: %s already expanded; skipping.\n" tmp-dict)
1185 (add-to-list 'use-for-dicts tmp-dict)))))) 1185 (add-to-list 'use-for-dicts tmp-dict))))))
1186 (ispell-print-if-debug 1186 (ispell-print-if-debug
1187 "ispell-hfde: Filling %s entry. Use for %s.\n" dict use-for-dicts) 1187 "ispell-hfde: Filling %s entry. Use for %s.\n" dict use-for-dicts)
1188 ;; The final loop. 1188 ;; The final loop.
1189 (dolist (entry ispell-dictionary-alist) 1189 (dolist (entry ispell-dictionary-alist)
1190 (if (member (car entry) use-for-dicts) 1190 (if (member (car entry) use-for-dicts)
@@ -1194,7 +1194,7 @@ all uninitialized dicts using that affix file."
1194 (setq ispell-dictionary-alist newlist)))) 1194 (setq ispell-dictionary-alist newlist))))
1195 1195
1196(defun ispell-parse-hunspell-affix-file (dict-key) 1196(defun ispell-parse-hunspell-affix-file (dict-key)
1197 "Parse hunspell affix file to extract parameters for `DICT-KEY'. 1197 "Parse Hunspell affix file to extract parameters for DICT-KEY.
1198Return a list in `ispell-dictionary-alist' format." 1198Return a list in `ispell-dictionary-alist' format."
1199 (let ((affix-file (cadr (assoc dict-key ispell-hunspell-dict-paths-alist)))) 1199 (let ((affix-file (cadr (assoc dict-key ispell-hunspell-dict-paths-alist))))
1200 (unless affix-file 1200 (unless affix-file
@@ -1235,11 +1235,11 @@ Return a list in `ispell-dictionary-alist' format."
1235 'utf-8))))) 1235 'utf-8)))))
1236 1236
1237(defun ispell-find-hunspell-dictionaries () 1237(defun ispell-find-hunspell-dictionaries ()
1238 "Look for installed hunspell dictionaries. 1238 "Look for installed Hunspell dictionaries.
1239Will initialize `ispell-hunspell-dictionary-alist' and 1239Will initialize `ispell-hunspell-dictionary-alist' and
1240`ispell-hunspell-dictionary-alist' after values found 1240`ispell-hunspell-dictionary-alist' after values found
1241and remove `ispell-dicts-name2locale-equivs-alist' 1241and remove `ispell-dicts-name2locale-equivs-alist'
1242entries if a specific dict was found." 1242entries if a specific dictionary was found."
1243 (let ((hunspell-found-dicts 1243 (let ((hunspell-found-dicts
1244 (split-string 1244 (split-string
1245 (with-temp-buffer 1245 (with-temp-buffer
@@ -1260,7 +1260,7 @@ entries if a specific dict was found."
1260 (if (string-match "\\.aff$" dict) 1260 (if (string-match "\\.aff$" dict)
1261 ;; Found default dictionary 1261 ;; Found default dictionary
1262 (if hunspell-default-dict 1262 (if hunspell-default-dict
1263 (error "ispell-fhd: Default dict already defined as %s. Not using %s.\n" 1263 (error "ispell-fhd: Default dict already defined as %s. Not using %s.\n"
1264 hunspell-default-dict dict) 1264 hunspell-default-dict dict)
1265 (setq affix-file dict) 1265 (setq affix-file dict)
1266 (setq hunspell-default-dict (list basename affix-file))) 1266 (setq hunspell-default-dict (list basename affix-file)))
@@ -1280,7 +1280,7 @@ entries if a specific dict was found."
1280 (dolist (dict ispell-dicts-name2locale-equivs-alist) 1280 (dolist (dict ispell-dicts-name2locale-equivs-alist)
1281 (if (assoc (car dict) ispell-hunspell-dict-paths-alist) 1281 (if (assoc (car dict) ispell-hunspell-dict-paths-alist)
1282 (ispell-print-if-debug 1282 (ispell-print-if-debug
1283 "-- ispell-fhd: Excluding %s alias. Standalone dict found.\n" 1283 "-- ispell-fhd: Excluding %s alias. Standalone dict found.\n"
1284 (car dict)) 1284 (car dict))
1285 (add-to-list 'newlist dict))) 1285 (add-to-list 'newlist dict)))
1286 (setq ispell-dicts-name2locale-equivs-alist newlist)) 1286 (setq ispell-dicts-name2locale-equivs-alist newlist))
@@ -1401,7 +1401,7 @@ aspell is used along with Emacs).")
1401 (setq ispell-args 1401 (setq ispell-args
1402 (nconc ispell-args (list "-d" dict-equiv))) 1402 (nconc ispell-args (list "-d" dict-equiv)))
1403 (message 1403 (message
1404 "ispell-set-spellchecker-params: Missing hunspell equiv for \"%s\". Skipping." 1404 "ispell-set-spellchecker-params: Missing Hunspell equiv for \"%s\". Skipping."
1405 dict-name) 1405 dict-name)
1406 (setq skip-dict t))) 1406 (setq skip-dict t)))
1407 1407
@@ -1619,12 +1619,12 @@ The variable `ispell-library-directory' defines their location."
1619 1619
1620(defvar ispell-current-dictionary nil 1620(defvar ispell-current-dictionary nil
1621 "The name of the current dictionary, or nil for the default. 1621 "The name of the current dictionary, or nil for the default.
1622This is passed to the ispell process using the `-d' switch and is 1622This is passed to the Ispell process using the `-d' switch and is
1623used as key in `ispell-local-dictionary-alist' and `ispell-dictionary-alist'.") 1623used as key in `ispell-local-dictionary-alist' and `ispell-dictionary-alist'.")
1624 1624
1625(defvar ispell-current-personal-dictionary nil 1625(defvar ispell-current-personal-dictionary nil
1626 "The name of the current personal dictionary, or nil for the default. 1626 "The name of the current personal dictionary, or nil for the default.
1627This is passed to the ispell process using the `-p' switch.") 1627This is passed to the Ispella process using the `-p' switch.")
1628 1628
1629(defun ispell-decode-string (str) 1629(defun ispell-decode-string (str)
1630 "Decodes multibyte character strings. 1630 "Decodes multibyte character strings.
@@ -1877,9 +1877,9 @@ You can set this variable in hooks in your init file -- eg:
1877 1877
1878 1878
1879(defun ispell-accept-output (&optional timeout-secs timeout-msecs) 1879(defun ispell-accept-output (&optional timeout-secs timeout-msecs)
1880 "Wait for output from ispell process, or TIMEOUT-SECS and TIMEOUT-MSECS. 1880 "Wait for output from Ispell process, or TIMEOUT-SECS and TIMEOUT-MSECS.
1881If asynchronous subprocesses are not supported, call function `ispell-filter' 1881If asynchronous subprocesses are not supported, call function `ispell-filter'
1882and pass it the output of the last ispell invocation." 1882and pass it the output of the last Ispell invocation."
1883 (if ispell-async-processp 1883 (if ispell-async-processp
1884 (accept-process-output ispell-process timeout-secs timeout-msecs) 1884 (accept-process-output ispell-process timeout-secs timeout-msecs)
1885 (if (null ispell-process) 1885 (if (null ispell-process)
@@ -1896,8 +1896,8 @@ and pass it the output of the last ispell invocation."
1896 (erase-buffer))))))) 1896 (erase-buffer)))))))
1897 1897
1898(defun ispell-send-replacement (misspelled replacement) 1898(defun ispell-send-replacement (misspelled replacement)
1899 "Notify aspell that MISSPELLED should be spelled REPLACEMENT. 1899 "Notify Aspell that MISSPELLED should be spelled REPLACEMENT.
1900This allows it to improve the suggestion list based on actual misspellings." 1900This allows to improve the suggestion list based on actual misspellings."
1901 (and ispell-really-aspell 1901 (and ispell-really-aspell
1902 (ispell-send-string (concat "$$ra " misspelled "," replacement "\n")))) 1902 (ispell-send-string (concat "$$ra " misspelled "," replacement "\n"))))
1903 1903
@@ -3702,7 +3702,7 @@ Returns the sum SHIFT due to changes in word replacements."
3702;;;###autoload 3702;;;###autoload
3703(defun ispell-buffer-with-debug (&optional append) 3703(defun ispell-buffer-with-debug (&optional append)
3704 "`ispell-buffer' with some output sent to `ispell-debug-buffer' buffer. 3704 "`ispell-buffer' with some output sent to `ispell-debug-buffer' buffer.
3705Use APPEND to append the info to previous buffer if exists." 3705If APPEND is non-n il, append the info to previous buffer if exists."
3706 (interactive) 3706 (interactive)
3707 (let ((ispell-debug-buffer (ispell-create-debug-buffer append))) 3707 (let ((ispell-debug-buffer (ispell-create-debug-buffer append)))
3708 (ispell-buffer))) 3708 (ispell-buffer)))
@@ -3739,8 +3739,8 @@ Use APPEND to append the info to previous buffer if exists."
3739 3739
3740;;;###autoload 3740;;;###autoload
3741(defun ispell-complete-word (&optional interior-frag) 3741(defun ispell-complete-word (&optional interior-frag)
3742 "Try to complete the word before or under point. 3742 "Try to complete the word before or at point.
3743If optional INTERIOR-FRAG is non-nil then the word may be a character 3743If optional INTERIOR-FRAG is non-nil, then the word may be a character
3744sequence inside of a word. 3744sequence inside of a word.
3745 3745
3746Standard ispell choices are then available." 3746Standard ispell choices are then available."
@@ -3846,7 +3846,7 @@ typing SPC or RET warns you if the previous word is incorrectly
3846spelled. 3846spelled.
3847 3847
3848All the buffer-local variables and dictionaries are ignored. To 3848All the buffer-local variables and dictionaries are ignored. To
3849read them into the running ispell process, type \\[ispell-word] 3849read them into the running Ispell process, type \\[ispell-word]
3850SPC. 3850SPC.
3851 3851
3852For spell-checking \"on the fly\", not just after typing SPC or 3852For spell-checking \"on the fly\", not just after typing SPC or