Merge from emacs--rel--22

[gnu-emacs] / lisp / textmodes / tildify.el

diff --git a/lisp/textmodes/tildify.el b/lisp/textmodes/tildify.el
index c8dcc4dba11293117197d391213ce71f5b118368..9e282792dd5f81507a6fe503e8fadc24da841135 100644 (file)
--- a/lisp/textmodes/tildify.el
+++ b/lisp/textmodes/tildify.el
@@ -1,6 +1,7 @@
 ;;; tildify.el --- adding hard spaces into texts
 
-;; Copyright (C) 1997, 1998, 1999, 2000, 2002 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author:     Milan Zamazal <pdm@zamazal.org>
 ;; Version:    4.5
@@ -20,15 +21,15 @@
 
 ;; 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., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
 ;; This package can be typically used for adding forgotten tildes in TeX
 ;; sources or adding `&nbsp;' sequences in SGML (e.g. HTML) texts.
 ;;
-;; For example, the Czech ortography requires avoiding one letter
+;; For example, the Czech orthography requires avoiding one letter
 ;; prepositions at line endings.  So they should be connected with the
 ;; following words by a tilde.  Some users forget to do this all the
 ;; time.  The purpose of this program is to check the text and suggest
@@ -42,7 +43,7 @@
 ;; The default variable settings are suited for Czech, so do not try to
 ;; understand them if you are not familiar with Czech grammar and spelling.
 ;;
-;; The algorithm was inspired by Petr Ol¹ák's program `vlna'.  Abbilities of
+;; The algorithm was inspired by Petr Ol¹ák's program `vlna'.  Abilities of
 ;; `tildify.el' are a little limited; if you have improvement suggestions, let
 ;; me know.
 
@@ -221,11 +222,11 @@ This function performs no refilling of the changed text."
                      (if (> (point) (marker-position marker-end))
                          (setq finish t))
                    (message
-                    (format "End of environment not found: %s" end-env))
+                    "End of environment not found: %s" end-env)
                    (setq finish t))))))
       ;; No ignored environments, tildify directly
       (tildify-tildify beg end ask)))
-  (message (format "%d spaces replaced." tildify-count)))
+  (message "%d spaces replaced." tildify-count))
 
 ;;;###autoload
 (defun tildify-buffer ()