[Emacs-diffs] Changes to emacs/lisp/textmodes/ispell.el

[Richard M . Stallman]

Index: emacs/lisp/textmodes/ispell.el
diff -c emacs/lisp/textmodes/ispell.el:1.163 
emacs/lisp/textmodes/ispell.el:1.164
*** emacs/lisp/textmodes/ispell.el:1.163        Mon May 16 11:29:12 2005
--- emacs/lisp/textmodes/ispell.el      Wed Jun  8 15:45:34 2005
***************
*** 796,814 ****
                    nil t)
            case-fold-search case-fold-search-val)
        (if (or (not status)    ; major version mismatch
!             (< (car (read-from-string (buffer-substring-no-properties
!                                        (match-beginning 2) (match-end 2))))
                 (car (cdr ispell-required-version)))) ; minor version mismatch
          (error "%s version 3 release %d.%d.%d or greater is required"
                 ispell-program-name (car ispell-required-version)
                 (car (cdr ispell-required-version))
                 (car (cdr (cdr ispell-required-version))))
        ;; check that it is the correct version.
!       (if (and (= (car (read-from-string (buffer-substring-no-properties
!                                           (match-beginning 2)(match-end 2))))
                    (car (cdr ispell-required-version)))
!                (< (car (read-from-string (buffer-substring-no-properties
!                                           (match-beginning 3)(match-end 3))))
                    (car (cdr (cdr ispell-required-version)))))
            (setq ispell-offset 0))
          ;; Check to see if it's really aspell.
--- 796,811 ----
                    nil t)
            case-fold-search case-fold-search-val)
        (if (or (not status)    ; major version mismatch
!             (< (car (read-from-string (match-string-no-properties 2)))
                 (car (cdr ispell-required-version)))) ; minor version mismatch
          (error "%s version 3 release %d.%d.%d or greater is required"
                 ispell-program-name (car ispell-required-version)
                 (car (cdr ispell-required-version))
                 (car (cdr (cdr ispell-required-version))))
        ;; check that it is the correct version.
!       (if (and (= (car (read-from-string (match-string-no-properties 2)))
                    (car (cdr ispell-required-version)))
!                (< (car (read-from-string (match-string-no-properties 3)))
                    (car (cdr (cdr ispell-required-version)))))
            (setq ispell-offset 0))
          ;; Check to see if it's really aspell.
***************
*** 2567,2575 ****
                              (ispell-begin-skip-region-regexp)
                              ispell-region-end t))
                        (progn
!                         (setq key (buffer-substring-no-properties
!                                    (car (match-data))
!                                    (car (cdr (match-data)))))
                          (set-marker skip-region-start
                                      (- (point) (length key)))
                          (goto-char rstart))
--- 2564,2570 ----
                              (ispell-begin-skip-region-regexp)
                              ispell-region-end t))
                        (progn
!                         (setq key (match-string-no-properties 0))
                          (set-marker skip-region-start
                                      (- (point) (length key)))
                          (goto-char rstart))
***************
*** 3510,3517 ****
          (search-forward ispell-parsing-keyword)
          (while (re-search-forward " *\\([^ \"]+\\)" end t)
            ;; space separated definitions.
!           (setq string (downcase (buffer-substring-no-properties
!                                   (match-beginning 1) (match-end 1))))
            (cond ((and (string-match "latex-mode" string)
                        (not (eq 'exclusive ispell-check-comments)))
                   (ispell-send-string "+\n~tex\n"))
--- 3505,3511 ----
          (search-forward ispell-parsing-keyword)
          (while (re-search-forward " *\\([^ \"]+\\)" end t)
            ;; space separated definitions.
!           (setq string (downcase (match-string-no-properties 1)))
            (cond ((and (string-match "latex-mode" string)
                        (not (eq 'exclusive ispell-check-comments)))
                   (ispell-send-string "+\n~tex\n"))
***************
*** 3544,3551 ****
              (setq end (save-excursion (end-of-line) (point)))
              (if (re-search-forward " *\\([^ \"]+\\)" end t)
                  (setq ispell-local-dictionary
!                       (buffer-substring-no-properties (match-beginning 1)
!                                                       (match-end 1)))))))
        (goto-char (point-max))
        (if (search-backward ispell-pdict-keyword nil t)
          (progn
--- 3538,3544 ----
              (setq end (save-excursion (end-of-line) (point)))
              (if (re-search-forward " *\\([^ \"]+\\)" end t)
                  (setq ispell-local-dictionary
!                       (match-string-no-properties 1))))))
        (goto-char (point-max))
        (if (search-backward ispell-pdict-keyword nil t)
          (progn
***************
*** 3553,3560 ****
            (setq end (save-excursion (end-of-line) (point)))
            (if (re-search-forward " *\\([^ \"]+\\)" end t)
                (setq ispell-local-pdict
!                     (buffer-substring-no-properties (match-beginning 1)
!                                                     (match-end 1))))))))
    ;; Reload if new personal dictionary defined.
    (if (and ispell-local-pdict
           (not (equal ispell-local-pdict ispell-personal-dictionary)))
--- 3546,3552 ----
            (setq end (save-excursion (end-of-line) (point)))
            (if (re-search-forward " *\\([^ \"]+\\)" end t)
                (setq ispell-local-pdict
!                     (match-string-no-properties 1)))))))
    ;; Reload if new personal dictionary defined.
    (if (and ispell-local-pdict
           (not (equal ispell-local-pdict ispell-personal-dictionary)))
***************
*** 3584,3591 ****
        ;; buffer-local words separated by a space, and can contain
        ;; any character other than a space.  Not rigorous enough.
        (while (re-search-forward " *\\([^ ]+\\)" end t)
!         (setq string (buffer-substring-no-properties (match-beginning 1)
!                                                      (match-end 1)))
          ;; This can fail when string contains a word with illegal chars.
          ;; Error handling needs to be added between ispell and emacs.
          (if (and (< 1 (length string))
--- 3576,3582 ----
        ;; buffer-local words separated by a space, and can contain
        ;; any character other than a space.  Not rigorous enough.
        (while (re-search-forward " *\\([^ ]+\\)" end t)
!         (setq string (match-string-no-properties 1))
          ;; This can fail when string contains a word with illegal chars.
          ;; Error handling needs to be added between ispell and emacs.
          (if (and (< 1 (length string))