aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/textmodes/ispell.el
diff options
context:
space:
mode:
authorKaroly Lorentey2005-06-15 12:57:51 +0000
committerKaroly Lorentey2005-06-15 12:57:51 +0000
commitef85512e51f043d73788f00a2aed13cccde0682c (patch)
treefc1fa1378533250f260ef8eaa9a84ae882d9df84 /lisp/textmodes/ispell.el
parent8736257554f49445f7b4402ac7a9436b38ce6452 (diff)
parentef88a9999004e6c26148c8d280d6a41f623d7249 (diff)
downloademacs-ef85512e51f043d73788f00a2aed13cccde0682c.tar.gz
emacs-ef85512e51f043d73788f00a2aed13cccde0682c.zip
Merged from miles@gnu.org--gnu-2005 (patch 80-82, 350-422)
Patches applied: * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-350 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-351 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-352 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-353 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-354 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-355 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-356 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-357 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-358 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-359 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-360 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-361 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-362 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-363 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-364 Remove "-face" suffix from widget faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-365 Remove "-face" suffix from custom faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-366 Remove "-face" suffix from change-log faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-367 Remove "-face" suffix from compilation faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368 Remove "-face" suffix from diff-mode faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-369 lisp/longlines.el (longlines-visible-face): Face removed * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-370 Remove "-face" suffix from woman faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-371 Remove "-face" suffix from whitespace-highlight face * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-372 Remove "-face" suffix from ruler-mode faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-373 Remove "-face" suffix from show-paren faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-374 Remove "-face" suffix from log-view faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-375 Remove "-face" suffix from smerge faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-376 Remove "-face" suffix from show-tabs faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-377 Remove "-face" suffix from highlight-changes faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-378 Remove "-face" suffix from and downcase info faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-379 Remove "-face" suffix from pcvs faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-380 Update uses of renamed pcvs faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-381 Tweak ChangeLog * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-382 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-383 Remove "-face" suffix from strokes-char face * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-384 Remove "-face" suffix from compare-windows face * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-385 Remove "-face" suffix from calendar faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-386 Remove "-face" suffix from diary-button face * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-387 Remove "-face" suffix from testcover faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-388 Remove "-face" suffix from viper faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-389 Remove "-face" suffix from org faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-390 Remove "-face" suffix from sgml-namespace face * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-391 Remove "-face" suffix from table-cell face * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-392 Remove "-face" suffix from tex-mode faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-393 Remove "-face" suffix from texinfo-heading face * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-394 Remove "-face" suffix from flyspell faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-395 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-396 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-397 Remove "-face" suffix from gomoku faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-398 Remove "-face" suffix from mpuz faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-399 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-400 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-401 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-402 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-403 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-404 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-405 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-406 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-407 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-408 Remove "-face" suffix from Buffer-menu-buffer face * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-409 Remove "-face" suffix from antlr-mode faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-410 Remove "-face" suffix from ebrowse faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-411 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-412 Remove "-face" suffix from flymake faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-413 Remove "-face" suffix from idlwave faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-414 Remove "-face" suffix from sh-script faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-415 Remove "-face" suffix from vhdl-mode faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-416 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-417 Remove "-face" suffix from which-func face * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-418 Remove "-face" suffix from cperl-mode faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-419 Remove "-face" suffix from ld-script faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-420 Fix cperl-mode font-lock problem * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-421 Tweak which-func face * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-422 Update from CVS * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-80 Merge from emacs--cvs-trunk--0 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-81 Update from CVS * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-82 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-350
Diffstat (limited to 'lisp/textmodes/ispell.el')
-rw-r--r--lisp/textmodes/ispell.el27
1 files changed, 9 insertions, 18 deletions
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 1de27265b08..afdfc951b96 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -796,19 +796,16 @@ Otherwise returns the library directory name, if that is defined."
796 nil t) 796 nil t)
797 case-fold-search case-fold-search-val) 797 case-fold-search case-fold-search-val)
798 (if (or (not status) ; major version mismatch 798 (if (or (not status) ; major version mismatch
799 (< (car (read-from-string (buffer-substring-no-properties 799 (< (car (read-from-string (match-string-no-properties 2)))
800 (match-beginning 2) (match-end 2))))
801 (car (cdr ispell-required-version)))) ; minor version mismatch 800 (car (cdr ispell-required-version)))) ; minor version mismatch
802 (error "%s version 3 release %d.%d.%d or greater is required" 801 (error "%s version 3 release %d.%d.%d or greater is required"
803 ispell-program-name (car ispell-required-version) 802 ispell-program-name (car ispell-required-version)
804 (car (cdr ispell-required-version)) 803 (car (cdr ispell-required-version))
805 (car (cdr (cdr ispell-required-version)))) 804 (car (cdr (cdr ispell-required-version))))
806 ;; check that it is the correct version. 805 ;; check that it is the correct version.
807 (if (and (= (car (read-from-string (buffer-substring-no-properties 806 (if (and (= (car (read-from-string (match-string-no-properties 2)))
808 (match-beginning 2)(match-end 2))))
809 (car (cdr ispell-required-version))) 807 (car (cdr ispell-required-version)))
810 (< (car (read-from-string (buffer-substring-no-properties 808 (< (car (read-from-string (match-string-no-properties 3)))
811 (match-beginning 3)(match-end 3))))
812 (car (cdr (cdr ispell-required-version))))) 809 (car (cdr (cdr ispell-required-version)))))
813 (setq ispell-offset 0)) 810 (setq ispell-offset 0))
814 ;; Check to see if it's really aspell. 811 ;; Check to see if it's really aspell.
@@ -945,7 +942,7 @@ The variable `ispell-library-directory' defines the library location."
945 '(menu-item "Automatic spell checking (Flyspell)" 942 '(menu-item "Automatic spell checking (Flyspell)"
946 flyspell-mode 943 flyspell-mode
947 :help "Check spelling while you edit the text" 944 :help "Check spelling while you edit the text"
948 :button (:toggle . flyspell-mode))) 945 :button (:toggle . (bound-and-true-p flyspell-mode))))
949 (define-key ispell-menu-map [ispell-complete-word] 946 (define-key ispell-menu-map [ispell-complete-word]
950 '(menu-item "Complete Word" ispell-complete-word 947 '(menu-item "Complete Word" ispell-complete-word
951 :help "Complete word at cursor using dictionary")) 948 :help "Complete word at cursor using dictionary"))
@@ -2567,9 +2564,7 @@ Return nil if spell session is quit,
2567 (ispell-begin-skip-region-regexp) 2564 (ispell-begin-skip-region-regexp)
2568 ispell-region-end t)) 2565 ispell-region-end t))
2569 (progn 2566 (progn
2570 (setq key (buffer-substring-no-properties 2567 (setq key (match-string-no-properties 0))
2571 (car (match-data))
2572 (car (cdr (match-data)))))
2573 (set-marker skip-region-start 2568 (set-marker skip-region-start
2574 (- (point) (length key))) 2569 (- (point) (length key)))
2575 (goto-char rstart)) 2570 (goto-char rstart))
@@ -3510,8 +3505,7 @@ Includes Latex/Nroff modes and extended character mode."
3510 (search-forward ispell-parsing-keyword) 3505 (search-forward ispell-parsing-keyword)
3511 (while (re-search-forward " *\\([^ \"]+\\)" end t) 3506 (while (re-search-forward " *\\([^ \"]+\\)" end t)
3512 ;; space separated definitions. 3507 ;; space separated definitions.
3513 (setq string (downcase (buffer-substring-no-properties 3508 (setq string (downcase (match-string-no-properties 1)))
3514 (match-beginning 1) (match-end 1))))
3515 (cond ((and (string-match "latex-mode" string) 3509 (cond ((and (string-match "latex-mode" string)
3516 (not (eq 'exclusive ispell-check-comments))) 3510 (not (eq 'exclusive ispell-check-comments)))
3517 (ispell-send-string "+\n~tex\n")) 3511 (ispell-send-string "+\n~tex\n"))
@@ -3544,8 +3538,7 @@ Both should not be used to define a buffer-local dictionary."
3544 (setq end (save-excursion (end-of-line) (point))) 3538 (setq end (save-excursion (end-of-line) (point)))
3545 (if (re-search-forward " *\\([^ \"]+\\)" end t) 3539 (if (re-search-forward " *\\([^ \"]+\\)" end t)
3546 (setq ispell-local-dictionary 3540 (setq ispell-local-dictionary
3547 (buffer-substring-no-properties (match-beginning 1) 3541 (match-string-no-properties 1))))))
3548 (match-end 1)))))))
3549 (goto-char (point-max)) 3542 (goto-char (point-max))
3550 (if (search-backward ispell-pdict-keyword nil t) 3543 (if (search-backward ispell-pdict-keyword nil t)
3551 (progn 3544 (progn
@@ -3553,8 +3546,7 @@ Both should not be used to define a buffer-local dictionary."
3553 (setq end (save-excursion (end-of-line) (point))) 3546 (setq end (save-excursion (end-of-line) (point)))
3554 (if (re-search-forward " *\\([^ \"]+\\)" end t) 3547 (if (re-search-forward " *\\([^ \"]+\\)" end t)
3555 (setq ispell-local-pdict 3548 (setq ispell-local-pdict
3556 (buffer-substring-no-properties (match-beginning 1) 3549 (match-string-no-properties 1)))))))
3557 (match-end 1))))))))
3558 ;; Reload if new personal dictionary defined. 3550 ;; Reload if new personal dictionary defined.
3559 (if (and ispell-local-pdict 3551 (if (and ispell-local-pdict
3560 (not (equal ispell-local-pdict ispell-personal-dictionary))) 3552 (not (equal ispell-local-pdict ispell-personal-dictionary)))
@@ -3584,8 +3576,7 @@ Both should not be used to define a buffer-local dictionary."
3584 ;; buffer-local words separated by a space, and can contain 3576 ;; buffer-local words separated by a space, and can contain
3585 ;; any character other than a space. Not rigorous enough. 3577 ;; any character other than a space. Not rigorous enough.
3586 (while (re-search-forward " *\\([^ ]+\\)" end t) 3578 (while (re-search-forward " *\\([^ ]+\\)" end t)
3587 (setq string (buffer-substring-no-properties (match-beginning 1) 3579 (setq string (match-string-no-properties 1))
3588 (match-end 1)))
3589 ;; This can fail when string contains a word with illegal chars. 3580 ;; This can fail when string contains a word with illegal chars.
3590 ;; Error handling needs to be added between ispell and emacs. 3581 ;; Error handling needs to be added between ispell and emacs.
3591 (if (and (< 1 (length string)) 3582 (if (and (< 1 (length string))