mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-61

Browse source 
Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 353-357)

   - Update from CVS
This commit is contained in:
Miles Bader 2005-06-09 07:13:03 +00:00
commit d113efea8e
77 changed files with 3187 additions and 4103 deletions
Download patch file Download diff file Expand all files Collapse all files

25
lisp/textmodes/ispell.el
View file

@ -796,19 +796,16 @@ Otherwise returns the library directory name, if that is defined."
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 (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 (buffer-substring-no-properties
(match-beginning 2)(match-end 2))))
(if (and (= (car (read-from-string (match-string-no-properties 2)))
(car (cdr ispell-required-version)))
(< (car (read-from-string (buffer-substring-no-properties
(match-beginning 3)(match-end 3))))
(< (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.
@ -2537,9 +2534,7 @@ Return nil if spell session is quit,
(ispell-begin-skip-region-regexp)
ispell-region-end t))
(progn
(setq key (buffer-substring-no-properties
(car (match-data))
(car (cdr (match-data)))))
(setq key (match-string-no-properties 0))
(set-marker skip-region-start
(- (point) (length key)))
(goto-char rstart))
@ -3480,8 +3475,7 @@ Includes Latex/Nroff modes and extended character mode."
(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))))
(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"))
@ -3514,8 +3508,7 @@ Both should not be used to define a buffer-local dictionary."
(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)))))))
(match-string-no-properties 1))))))
(goto-char (point-max))
(if (search-backward ispell-pdict-keyword nil t)
(progn
@ -3523,8 +3516,7 @@ Both should not be used to define a buffer-local dictionary."
(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))))))))
(match-string-no-properties 1)))))))
;; Reload if new personal dictionary defined.
(if (and ispell-local-pdict
(not (equal ispell-local-pdict ispell-personal-dictionary)))
@ -3554,8 +3546,7 @@ Both should not be used to define a buffer-local dictionary."
;; 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)))
(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))