Mercurial > emacs

diff lisp/textmodes/ispell.el @ 90428:a8190f7e546e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 285-296) - Update from CVS - Merge from gnus--rel--5.10 - Update from CVS: admin/FOR-RELEASE: Update refcard section. * gnus--rel--5.10 (patch 102-104) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-64
author Miles Bader <miles@gnu.org>
date Wed, 07 Jun 2006 18:05:10 +0000
parents 146cd8369025 6a91e8b1eea0
children 138027c8c982
line wrap: on
line diff
--- a/lisp/textmodes/ispell.el	Wed Jun 07 11:41:58 2006 +0000
+++ b/lisp/textmodes/ispell.el	Wed Jun 07 18:05:10 2006 +0000
@@ -416,11 +416,12 @@
   :type 'boolean
   :group 'ispell)
 
-(defcustom ispell-format-word (function upcase)
+(defcustom ispell-format-word-function (function upcase)
   "*Formatting function for displaying word being spell checked.
 The function must take one string argument and return a string."
   :type 'function
   :group 'ispell)
+(defvaralias 'ispell-format-word 'ispell-format-word-function)
 
 (defcustom ispell-use-framepop-p nil
   "When non-nil ispell uses framepop to display choices in a dedicated frame.
@@ -1565,7 +1566,7 @@
       ;; But that is silly; if the user asks for it, we should do it. - rms.
       (or quietly
 	  (message "Checking spelling of %s..."
-		   (funcall ispell-format-word word)))
+		   (funcall ispell-format-word-function word)))
       (ispell-send-string "%\n")	; put in verbose mode
       (ispell-send-string (concat "^" word "\n"))
       ;; wait until ispell has processed word
@@ -1581,7 +1582,7 @@
       (cond ((eq poss t)
 	     (or quietly
 		 (message "%s is correct"
-			  (funcall ispell-format-word word)))
+			  (funcall ispell-format-word-function word)))
 	     (and (fboundp 'extent-at)
 		  (extent-at start)
 		  (and (fboundp 'delete-extent)
@@ -1589,8 +1590,8 @@
 	    ((stringp poss)
 	     (or quietly
 		 (message "%s is correct because of root %s"
-			  (funcall ispell-format-word word)
-			  (funcall ispell-format-word poss)))
+			  (funcall ispell-format-word-function word)
+			  (funcall ispell-format-word-function poss)))
 	     (and (fboundp 'extent-at)
 		  (extent-at start)
 		  (and (fboundp 'delete-extent)
@@ -1603,7 +1604,8 @@
 		       (set-extent-property ext 'face ispell-highlight-face)
 		       (set-extent-property ext 'priority 2000)))
 	       (beep)
-	       (message "%s is incorrect"(funcall ispell-format-word word))))
+	       (message "%s is incorrect"
+                        (funcall ispell-format-word-function word))))
 	    (t				; prompt for correct word.
 	     (save-window-excursion
 	       (setq replace (ispell-command-loop
@@ -3329,6 +3331,7 @@
   "*End of text which will be checked in `ispell-message'.
 If it is a string, limit at first occurrence of that regular expression.
 Otherwise, it must be a function which is called to get the limit.")
+(put 'ispell-message-text-end 'risky-local-variable t)
 
 
 (defun ispell-mime-multipartp (&optional limit)