Add 2010 to copyright years.

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

diff --git a/lisp/textmodes/tildify.el b/lisp/textmodes/tildify.el
index a49c44b..c723893 100644 (file)
--- a/lisp/textmodes/tildify.el
+++ b/lisp/textmodes/tildify.el
@@ -1,17 +1,18 @@
 ;;; tildify.el --- adding hard spaces into texts
 
-;; Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
-;; Author:     Milan Zamazal <pdm@freesoft.cz>
-;; Version:    4.4
+;; Author:     Milan Zamazal <pdm@zamazal.org>
+;; Version:    4.5
 ;; Keywords:   text, TeX, SGML, wp
 
 ;; 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 2, 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,16 +20,14 @@
 ;; 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., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; 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 +41,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.
 
@@ -62,7 +61,7 @@
   "Alist specifying where to insert hard spaces.
 
 Each alist item is of the form (MAJOR-MODE REGEXP NUMBER) or
-(MAJOR-MODE . SYMBOL).
+\(MAJOR-MODE . SYMBOL).
 
 MAJOR-MODE defines major mode, for which the item applies.  It can be either:
 - a symbol equal to the major mode of the buffer to be fixed
@@ -84,13 +83,15 @@ mode, the item for the mode SYMBOL is looked up in the alist instead."
 (defcustom tildify-string-alist
   '((latex-mode . "~")
     (tex-mode . latex-mode)
+    (plain-tex-mode . latex-mode)
     (sgml-mode . "&nbsp;")
+    (xml-mode . sgml-mode)
     (html-mode . sgml-mode)
     (t . " "))
   "Alist specifying what is a hard space in the current major mode.
 
 Each alist item is of the form (MAJOR-MODE . STRING) or
-(MAJOR-MODE . SYMBOL).
+\(MAJOR-MODE . SYMBOL).
 
 MAJOR-MODE defines major mode, for which the item applies.  It can be either:
 - a symbol equal to the major mode of the buffer to be fixed
@@ -105,12 +106,12 @@ The form (MAJOR-MODE . SYMBOL) defines alias item for MAJOR-MODE.  For this
 mode, the item for the mode SYMBOL is looked up in the alist instead."
   :group 'tildify
   :type '(repeat (cons symbol (choice string symbol))))
-     
+
 (defcustom tildify-ignored-environments-alist
   '((latex-mode
      ("\\\\\\\\" . "")         ; do not remove this
      ("\\\\begin{verbatim}" . "\\\\end{verbatim}")
-     ("\\\\verb\\(.\\)" . (1))
+     ("\\\\verb\\*?\\(.\\)" . (1))
      ("\\$\\$" . "\\$\\$")
      ("\\$" . "\\$")
      ("\\\\(" . "\\\\)")
@@ -219,12 +220,12 @@ 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 ()
   "Add hard spaces in the current buffer.
@@ -260,7 +261,7 @@ This function performs no refilling of the changed text."
             (symbolp alist))
        (tildify-mode-alist mode-alist alist)
       alist)))
-  
+
 (defun tildify-find-env (regexp)
   "Find environment using REGEXP.
 Return regexp for the end of the environment or nil if no environment was
@@ -352,4 +353,5 @@ further questions)."
 ;; coding: iso-latin-2
 ;; End:
 
+;; arch-tag: fc9b05a6-7355-4639-8170-dcf57853ba22
 ;;; tildify.el ends here