Merge from emacs--rel--22

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

diff --git a/lisp/textmodes/underline.el b/lisp/textmodes/underline.el
index 2f6ef391e06de589face1d62f17fb7462fbb72c5..7b8f98f86859177f1e7db083b8e0467206121792 100644 (file)
--- a/lisp/textmodes/underline.el
+++ b/lisp/textmodes/underline.el
@@ -1,6 +1,7 @@
-;;; underline.el --- insert/remove underlining (done by overstriking) in Emacs.
+;;; underline.el --- insert/remove underlining (done by overstriking) in Emacs
 
-;; Copyright (C) 1985 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: wp
@@ -18,8 +19,16 @@
 ;; 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; 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.
+
+;;; Commentary:
+
+;; This package deals with the primitive form of underlining
+;; consisting of prefixing each character with "_\^h".  The entry
+;; point `underline-region' performs such underlining on a region.
+;; The entry point `ununderline-region' removes it.
 
 ;;; Code:
 
@@ -29,14 +38,14 @@
 Works by overstriking underscores.
 Called from program, takes two arguments START and END
 which specify the range to operate on."
-  (interactive "r")
+  (interactive "*r")
   (save-excursion
    (let ((end1 (make-marker)))
      (move-marker end1 (max start end))
      (goto-char (min start end))
      (while (< (point) end1)
        (or (looking-at "[_\^@- ]")
-          (insert "_\b"))
+          (insert "_\b"))
        (forward-char 1)))))
 
 ;;;###autoload
@@ -44,12 +53,15 @@ which specify the range to operate on."
   "Remove all underlining (overstruck underscores) in the region.
 Called from program, takes two arguments START and END
 which specify the range to operate on."
-  (interactive "r")
+  (interactive "*r")
   (save-excursion
    (let ((end1 (make-marker)))
      (move-marker end1 (max start end))
      (goto-char (min start end))
-     (while (re-search-forward "_\b\\|\b_" end1 t)
+     (while (re-search-forward "_\b\\|\b_" end1 t)
        (delete-char -2)))))
 
+(provide 'underline)
+
+;;; arch-tag: e7b48582-c3ea-4386-987a-87415f3c372a
 ;;; underline.el ends here