/[emacs]/emacs/lisp/textmodes/ispell.el
ViewVC logotype

Diff of /emacs/lisp/textmodes/ispell.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.163 by lektu, Mon May 16 11:29:12 2005 UTC revision 1.164 by rms, Wed Jun 8 15:45:34 2005 UTC
# Line 796  Otherwise returns the library directory Line 796  Otherwise returns the library directory
796                      nil t)                      nil t)
797              case-fold-search case-fold-search-val)              case-fold-search case-fold-search-val)
798        (if (or (not status)      ; major version mismatch        (if (or (not status)      ; major version mismatch
799                (< (car (read-from-string (buffer-substring-no-properties                (< (car (read-from-string (match-string-no-properties 2)))
                                          (match-beginning 2) (match-end 2))))  
800                   (car (cdr ispell-required-version)))) ; minor version mismatch                   (car (cdr ispell-required-version)))) ; minor version mismatch
801            (error "%s version 3 release %d.%d.%d or greater is required"            (error "%s version 3 release %d.%d.%d or greater is required"
802                   ispell-program-name (car ispell-required-version)                   ispell-program-name (car ispell-required-version)
803                   (car (cdr ispell-required-version))                   (car (cdr ispell-required-version))
804                   (car (cdr (cdr ispell-required-version))))                   (car (cdr (cdr ispell-required-version))))
805          ;; check that it is the correct version.          ;; check that it is the correct version.
806          (if (and (= (car (read-from-string (buffer-substring-no-properties          (if (and (= (car (read-from-string (match-string-no-properties 2)))
                                             (match-beginning 2)(match-end 2))))  
807                      (car (cdr ispell-required-version)))                      (car (cdr ispell-required-version)))
808                   (< (car (read-from-string (buffer-substring-no-properties                   (< (car (read-from-string (match-string-no-properties 3)))
                                             (match-beginning 3)(match-end 3))))  
809                      (car (cdr (cdr ispell-required-version)))))                      (car (cdr (cdr ispell-required-version)))))
810            (setq ispell-offset 0))            (setq ispell-offset 0))
811          ;; Check to see if it's really aspell.          ;; Check to see if it's really aspell.
# Line 2567  Return nil if spell session is quit, Line 2564  Return nil if spell session is quit,
2564                                (ispell-begin-skip-region-regexp)                                (ispell-begin-skip-region-regexp)
2565                                ispell-region-end t))                                ispell-region-end t))
2566                          (progn                          (progn
2567                            (setq key (buffer-substring-no-properties                            (setq key (match-string-no-properties 0))
                                      (car (match-data))  
                                      (car (cdr (match-data)))))  
2568                            (set-marker skip-region-start                            (set-marker skip-region-start
2569                                        (- (point) (length key)))                                        (- (point) (length key)))
2570                            (goto-char rstart))                            (goto-char rstart))
# Line 3510  Includes Latex/Nroff modes and extended Line 3505  Includes Latex/Nroff modes and extended
3505            (search-forward ispell-parsing-keyword)            (search-forward ispell-parsing-keyword)
3506            (while (re-search-forward " *\\([^ \"]+\\)" end t)            (while (re-search-forward " *\\([^ \"]+\\)" end t)
3507              ;; space separated definitions.              ;; space separated definitions.
3508              (setq string (downcase (buffer-substring-no-properties              (setq string (downcase (match-string-no-properties 1)))
                                     (match-beginning 1) (match-end 1))))  
3509              (cond ((and (string-match "latex-mode" string)              (cond ((and (string-match "latex-mode" string)
3510                          (not (eq 'exclusive ispell-check-comments)))                          (not (eq 'exclusive ispell-check-comments)))
3511                     (ispell-send-string "+\n~tex\n"))                     (ispell-send-string "+\n~tex\n"))
# Line 3544  Both should not be used to define a buff Line 3538  Both should not be used to define a buff
3538                (setq end (save-excursion (end-of-line) (point)))                (setq end (save-excursion (end-of-line) (point)))
3539                (if (re-search-forward " *\\([^ \"]+\\)" end t)                (if (re-search-forward " *\\([^ \"]+\\)" end t)
3540                    (setq ispell-local-dictionary                    (setq ispell-local-dictionary
3541                          (buffer-substring-no-properties (match-beginning 1)                          (match-string-no-properties 1))))))
                                                         (match-end 1)))))))  
3542        (goto-char (point-max))        (goto-char (point-max))
3543        (if (search-backward ispell-pdict-keyword nil t)        (if (search-backward ispell-pdict-keyword nil t)
3544            (progn            (progn
# Line 3553  Both should not be used to define a buff Line 3546  Both should not be used to define a buff
3546              (setq end (save-excursion (end-of-line) (point)))              (setq end (save-excursion (end-of-line) (point)))
3547              (if (re-search-forward " *\\([^ \"]+\\)" end t)              (if (re-search-forward " *\\([^ \"]+\\)" end t)
3548                  (setq ispell-local-pdict                  (setq ispell-local-pdict
3549                        (buffer-substring-no-properties (match-beginning 1)                        (match-string-no-properties 1)))))))
                                                       (match-end 1))))))))  
3550    ;; Reload if new personal dictionary defined.    ;; Reload if new personal dictionary defined.
3551    (if (and ispell-local-pdict    (if (and ispell-local-pdict
3552             (not (equal ispell-local-pdict ispell-personal-dictionary)))             (not (equal ispell-local-pdict ispell-personal-dictionary)))
# Line 3584  Both should not be used to define a buff Line 3576  Both should not be used to define a buff
3576          ;; buffer-local words separated by a space, and can contain          ;; buffer-local words separated by a space, and can contain
3577          ;; any character other than a space.  Not rigorous enough.          ;; any character other than a space.  Not rigorous enough.
3578          (while (re-search-forward " *\\([^ ]+\\)" end t)          (while (re-search-forward " *\\([^ ]+\\)" end t)
3579            (setq string (buffer-substring-no-properties (match-beginning 1)            (setq string (match-string-no-properties 1))
                                                        (match-end 1)))  
3580            ;; This can fail when string contains a word with illegal chars.            ;; This can fail when string contains a word with illegal chars.
3581            ;; Error handling needs to be added between ispell and emacs.            ;; Error handling needs to be added between ispell and emacs.
3582            (if (and (< 1 (length string))            (if (and (< 1 (length string))

Legend:
Removed from v.1.163  
changed lines
  Added in v.1.164

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26