Add 2011 to FSF/AIST copyright years.

[bpt/emacs.git] / lisp / textmodes / spell.el

diff --git a/lisp/textmodes/spell.el b/lisp/textmodes/spell.el
index 01eff76..bccd4a5 100644 (file)
--- a/lisp/textmodes/spell.el
+++ b/lisp/textmodes/spell.el
@@ -1,17 +1,17 @@
 ;;; spell.el --- spelling correction interface for Emacs
 
 ;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
-;;   2006, 2007, 2008 Free Software Foundation, Inc.
+;;   2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: wp, unix
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,9 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -95,8 +93,7 @@ for example, \"word\"."
   (interactive "r")
   (let ((filter spell-filter)
        (buf (get-buffer-create " *temp*")))
-    (save-excursion
-     (set-buffer buf)
+    (with-current-buffer buf
      (widen)
      (erase-buffer))
     (message "Checking spelling of %s..." (or description "region"))
@@ -106,41 +103,37 @@ for example, \"word\"."
          (call-process-region start end shell-file-name
                               nil buf nil "-c" spell-command))
       (let ((oldbuf (current-buffer)))
-       (save-excursion
-        (set-buffer buf)
-        (insert-buffer-substring oldbuf start end)
-        (or (bolp) (insert ?\n))
-        (if filter (funcall filter))
-        (if (string= "spell" spell-command)
-            (call-process-region (point-min) (point-max) "spell" t buf)
-          (call-process-region (point-min) (point-max) shell-file-name
-                               t buf nil "-c" spell-command)))))
+       (with-current-buffer buf
+          (insert-buffer-substring oldbuf start end)
+          (or (bolp) (insert ?\n))
+          (if filter (funcall filter))
+          (if (string= "spell" spell-command)
+              (call-process-region (point-min) (point-max) "spell" t buf)
+            (call-process-region (point-min) (point-max) shell-file-name
+                                 t buf nil "-c" spell-command)))))
     (message "Checking spelling of %s...%s"
             (or description "region")
-            (if (save-excursion
-                 (set-buffer buf)
-                 (> (buffer-size) 0))
+            (if (with-current-buffer buf
+                   (> (buffer-size) 0))
                 "not correct"
               "correct"))
     (let (word newword
          (case-fold-search t)
          (case-replace t))
-      (while (save-excursion
-             (set-buffer buf)
-             (> (buffer-size) 0))
-       (save-excursion
-        (set-buffer buf)
-        (goto-char (point-min))
-        (setq word (downcase
-                    (buffer-substring (point)
-                                      (progn (end-of-line) (point)))))
-        (forward-char 1)
-        (delete-region (point-min) (point))
-        (setq newword
-              (read-string (concat "`" word
-                                    "' not recognized; edit a replacement: ")
-                            word))
-        (flush-lines (concat "^" (regexp-quote word) "$")))
+      (while (with-current-buffer buf
+               (> (buffer-size) 0))
+       (with-current-buffer buf
+          (goto-char (point-min))
+          (setq word (downcase
+                      (buffer-substring (point)
+                                        (progn (end-of-line) (point)))))
+          (forward-char 1)
+          (delete-region (point-min) (point))
+          (setq newword
+                (read-string (concat "`" word
+                                     "' not recognized; edit a replacement: ")
+                             word))
+          (flush-lines (concat "^" (regexp-quote word) "$")))
        (if (not (equal word newword))
            (progn
             (goto-char (point-min))
@@ -154,27 +147,26 @@ for example, \"word\"."
   "Check spelling of string supplied as argument."
   (interactive "sSpell string: ")
   (let ((buf (get-buffer-create " *temp*")))
-    (save-excursion
-     (set-buffer buf)
-     (widen)
-     (erase-buffer)
-     (insert string "\n")
-     (if (string= "spell" spell-command)
-        (call-process-region (point-min) (point-max) "spell"
-                             t t)
-       (call-process-region (point-min) (point-max) shell-file-name
-                           t t nil "-c" spell-command))
-     (if (= 0 (buffer-size))
-        (message "%s is correct" string)
-       (goto-char (point-min))
-       (while (search-forward "\n" nil t)
-        (replace-match " "))
-       (message "%sincorrect" (buffer-substring 1 (point-max)))))))
+    (with-current-buffer buf
+      (widen)
+      (erase-buffer)
+      (insert string "\n")
+      (if (string= "spell" spell-command)
+          (call-process-region (point-min) (point-max) "spell"
+                               t t)
+        (call-process-region (point-min) (point-max) shell-file-name
+                             t t nil "-c" spell-command))
+      (if (= 0 (buffer-size))
+          (message "%s is correct" string)
+        (goto-char (point-min))
+        (while (search-forward "\n" nil t)
+          (replace-match " "))
+        (message "%sincorrect" (buffer-substring 1 (point-max)))))))
 ;;;###autoload
 (make-obsolete 'spell-string "The `spell' package is obsolete - use `ispell'."
                "23.1")
 
 (provide 'spell)
 
-;;; arch-tag: 7eabb848-9c76-431a-bcdb-0e0592d2db04
+;; arch-tag: 7eabb848-9c76-431a-bcdb-0e0592d2db04
 ;;; spell.el ends here