Use line-end-position rather than end-of-line, etc.

* textmodes/texnfo-upd.el (texinfo-start-menu-description)
(texinfo-update-menu-region-beginning, texinfo-menu-first-node)
(texinfo-delete-existing-pointers, texinfo-find-pointer)
(texinfo-clean-up-node-line, texinfo-insert-node-lines)
(texinfo-multiple-files-update):
* textmodes/table.el (table--probe-cell-left-up)
(table--probe-cell-right-bottom):
* textmodes/picture.el (picture-tab-search):
* textmodes/page-ext.el (pages-copy-header-and-position)
(pages-directory-for-addresses):
* progmodes/vera-mode.el (vera-get-offset):
* progmodes/simula.el (simula-calculate-indent):
* progmodes/python.el (python-pdbtrack-overlay-arrow):
* progmodes/prolog.el (end-of-prolog-clause):
* progmodes/perl-mode.el (perl-calculate-indent, perl-indent-exp):
* progmodes/icon.el (indent-icon-exp):
* progmodes/etags.el (tag-re-match-p):
* progmodes/ebrowse.el (ebrowse-show-file-name-at-point):
* progmodes/ebnf2ps.el (ebnf-begin-file):
* progmodes/dcl-mode.el (dcl-back-to-indentation-1)
(dcl-save-local-variable):
* play/life.el (life-setup):
* play/gametree.el (gametree-looking-at-ply):
* nxml/nxml-maint.el (nxml-insert-target-repertoire-glyph-set):
* mail/sendmail.el (mail-mode-auto-fill):
* emacs-lisp/lisp-mode.el (calculate-lisp-indent):
* emacs-lisp/edebug.el (edebug-overlay-arrow):
* emacs-lisp/checkdoc.el (checkdoc-this-string-valid):
* woman.el (woman-parse-numeric-value, woman2-TH, woman2-SH)
(woman-tab-to-tab-stop, WoMan-warn-ignored):
* type-break.el (type-break-file-keystroke-count):
* term.el (term-replace-by-expanded-history-before-point)
(term-skip-prompt, term-extract-string):
* speedbar.el (speedbar-edit-line, speedbar-expand-line)
(speedbar-contract-line, speedbar-toggle-line-expansion)
(speedbar-parse-c-or-c++tag, speedbar-parse-tex-string)
(speedbar-buffer-revert-buffer, speedbar-highlight-one-tag-line):
* sort.el (sort-skip-fields):
* skeleton.el (skeleton-internal-list):
* simple.el (line-move-finish, line-move-to-column):
* shell.el (shell-forward-command):
* misc.el (copy-from-above-command):
* makesum.el (double-column):
* ebuff-menu.el (electric-buffer-update-highlight):
* dired.el (dired-move-to-end-of-filename):
* dframe.el (dframe-popup-kludge):
* bookmark.el (bookmark-kill-line, bookmark-bmenu-show-filenames):
* arc-mode.el (archive-get-lineno):
Use line-end-position and line-beginning-position.

* net/ange-ftp.el, progmodes/hideif.el, reposition.el:
Same, but only in comments.

40 files changed, 180 insertions, 175 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index aaab0c660c..0c32061f41 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,55 @@
 2010-11-06  Glenn Morris  <rgm@gnu.org>
 
+	* textmodes/texnfo-upd.el (texinfo-start-menu-description)
+	(texinfo-update-menu-region-beginning, texinfo-menu-first-node)
+	(texinfo-delete-existing-pointers, texinfo-find-pointer)
+	(texinfo-clean-up-node-line, texinfo-insert-node-lines)
+	(texinfo-multiple-files-update):
+	* textmodes/table.el (table--probe-cell-left-up)
+	(table--probe-cell-right-bottom):
+	* textmodes/picture.el (picture-tab-search):
+	* textmodes/page-ext.el (pages-copy-header-and-position)
+	(pages-directory-for-addresses):
+	* progmodes/vera-mode.el (vera-get-offset):
+	* progmodes/simula.el (simula-calculate-indent):
+	* progmodes/python.el (python-pdbtrack-overlay-arrow):
+	* progmodes/prolog.el (end-of-prolog-clause):
+	* progmodes/perl-mode.el (perl-calculate-indent, perl-indent-exp):
+	* progmodes/icon.el (indent-icon-exp):
+	* progmodes/etags.el (tag-re-match-p):
+	* progmodes/ebrowse.el (ebrowse-show-file-name-at-point):
+	* progmodes/ebnf2ps.el (ebnf-begin-file):
+	* progmodes/dcl-mode.el (dcl-back-to-indentation-1)
+	(dcl-save-local-variable):
+	* play/life.el (life-setup):
+	* play/gametree.el (gametree-looking-at-ply):
+	* nxml/nxml-maint.el (nxml-insert-target-repertoire-glyph-set):
+	* mail/sendmail.el (mail-mode-auto-fill):
+	* emacs-lisp/lisp-mode.el (calculate-lisp-indent):
+	* emacs-lisp/edebug.el (edebug-overlay-arrow):
+	* emacs-lisp/checkdoc.el (checkdoc-this-string-valid):
+	* woman.el (woman-parse-numeric-value, woman2-TH, woman2-SH)
+	(woman-tab-to-tab-stop, WoMan-warn-ignored):
+	* type-break.el (type-break-file-keystroke-count):
+	* term.el (term-replace-by-expanded-history-before-point)
+	(term-skip-prompt, term-extract-string):
+	* speedbar.el (speedbar-edit-line, speedbar-expand-line)
+	(speedbar-contract-line, speedbar-toggle-line-expansion)
+	(speedbar-parse-c-or-c++tag, speedbar-parse-tex-string)
+	(speedbar-buffer-revert-buffer, speedbar-highlight-one-tag-line):
+	* sort.el (sort-skip-fields):
+	* skeleton.el (skeleton-internal-list):
+	* simple.el (line-move-finish, line-move-to-column):
+	* shell.el (shell-forward-command):
+	* misc.el (copy-from-above-command):
+	* makesum.el (double-column):
+	* ebuff-menu.el (electric-buffer-update-highlight):
+	* dired.el (dired-move-to-end-of-filename):
+	* dframe.el (dframe-popup-kludge):
+	* bookmark.el (bookmark-kill-line, bookmark-bmenu-show-filenames):
+	* arc-mode.el (archive-get-lineno):
+	Use line-end-position and line-beginning-position.
+
 	* progmodes/idlwave.el (idlwave-routine-entry-compare-twins):
 	(idlwave-study-twins): Prefix dynamic local `class'.
 	(idlwave-routine-twin-compare): Update for above name change.
diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el
index 6dda7b2e40..a86203a47d 100644
--- a/lisp/arc-mode.el
+++ b/lisp/arc-mode.el
@@ -616,7 +616,7 @@ the mode is invalid.  If ERROR is nil then nil will be returned."
 (defun archive-get-lineno ()
   (if (>= (point) archive-file-list-start)
       (count-lines archive-file-list-start
-		   (save-excursion (beginning-of-line) (point)))
+		   (line-beginning-position))
     0))
 
 (defun archive-get-descr (&optional noerror)
@@ -2213,5 +2213,4 @@ This doesn't recover lost files, it just undoes changes in the buffer itself."
 
 (provide 'arc-mode)
 
-;; arch-tag: e5966a01-35ec-4f27-8095-a043a79b457b
 ;;; arc-mode.el ends here
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 0eec76f4da..11883febb0 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -1,7 +1,8 @@
 ;;; bookmark.el --- set bookmarks, maybe annotate them, jump to them later
 
-;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 2001, 2002, 2003,
-;;   2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 2001, 2002, 2003, 2004,
+;;   2005, 2006, 2007, 2008, 2009, 2010
+;;   Free Software Foundation, Inc.
 
 ;; Author: Karl Fogel <kfogel@red-bean.com>
 ;; Maintainer: Karl Fogel <kfogel@red-bean.com>
@@ -816,7 +817,7 @@ the list of bookmarks.)"
   "Kill from point to end of line.
 If optional arg NEWLINE-TOO is non-nil, delete the newline too.
 Does not affect the kill ring."
-  (let ((eol (save-excursion (end-of-line) (point))))
+  (let ((eol (line-end-position)))
     (delete-region (point) eol)
     (if (and newline-too (looking-at "\n"))
         (delete-char 1))))
@@ -1684,7 +1685,7 @@ mainly for debugging, and should not be necessary in normal use."
            (while (< (point) (point-max))
              (let ((bmrk (bookmark-bmenu-bookmark)))
                (push bmrk bookmark-bmenu-hidden-bookmarks)
-               (let ((start (save-excursion (end-of-line) (point))))
+               (let ((start (line-end-position)))
                  (move-to-column bookmark-bmenu-file-column t)
                  ;; Strip off `mouse-face' from the white spaces region.
                  (if (display-mouse-p)
@@ -2225,5 +2226,4 @@ This also runs `bookmark-exit-hook'."
 
 (provide 'bookmark)
 
-;; arch-tag: 139f519a-dd0c-4b8d-8b5d-f9fcf53ca8f6
 ;;; bookmark.el ends here
diff --git a/lisp/dframe.el b/lisp/dframe.el
index 2e550d8dd7..9ca0a260f6 100644
--- a/lisp/dframe.el
+++ b/lisp/dframe.el
@@ -1,7 +1,8 @@
 ;;; dframe --- dedicate frame support modes
 
-;;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;    2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005, 2006, 2007, 2008, 2009, 2010
+;;   Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: file, tags, tools
@@ -784,8 +785,8 @@ Must be bound to EVENT."
               (popup-mode-menu event)
             (goto-char (event-closest-point event))
             (beginning-of-line)
-            (forward-char (min 5 (- (save-excursion (end-of-line) (point))
-                                    (save-excursion (beginning-of-line) (point)))))
+            (forward-char (min 5 (- (line-end-position)
+                                    (line-beginning-position))))
             (popup-mode-menu))
           ;; Wait for menu to bail out.  `popup-mode-menu' (and other popup
           ;; menu functions) return immediately.
@@ -991,5 +992,4 @@ mode-line.  This is only useful for non-XEmacs."
 
 (provide 'dframe)
 
-;; arch-tag: df9b91b6-e85e-4a76-a02e-b3cb5b686bd4
 ;;; dframe.el ends here
diff --git a/lisp/dired.el b/lisp/dired.el
index f840b60ab0..345956f029 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -2138,7 +2138,7 @@ Return the position of the beginning of the filename, or nil if none found."
       ;; case-fold-search is nil now, so we can test for capital F:
       (setq used-F (string-match "F" dired-actual-switches)
 	    opoint (point)
-	    eol (save-excursion (end-of-line) (point))
+	    eol (line-end-position)
 	    hidden (and selective-display
 			(save-excursion (search-forward "\r" eol t))))
       (if hidden
@@ -4030,5 +4030,4 @@ For absolute symlinks, use \\[dired-do-symlink].
 
 (run-hooks 'dired-load-hook)		; for your customizations
 
-;; arch-tag: e1af7a8f-691c-41a0-aac1-ddd4d3c87517
 ;;; dired.el ends here
diff --git a/lisp/ebuff-menu.el b/lisp/ebuff-menu.el
index 6e307d1ab8..6b462a22d1 100644
--- a/lisp/ebuff-menu.el
+++ b/lisp/ebuff-menu.el
@@ -1,7 +1,7 @@
 ;;; ebuff-menu.el --- electric-buffer-list mode
 
-;; Copyright (C) 1985, 1986, 1994, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1986, 1994, 2001, 2002, 2003, 2004, 2005, 2006,
+;;   2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 
 ;; Author: Richard Mlynarik <mly@ai.mit.edu>
 ;; Maintainer: FSF
@@ -282,11 +282,10 @@ Return to Electric Buffer Menu when done."
 	  (make-local-variable 'electric-buffer-overlay)
 	  (setq electric-buffer-overlay (make-overlay (point) (point)))))
     (move-overlay electric-buffer-overlay
-		  (save-excursion (beginning-of-line) (point))
-		  (save-excursion (end-of-line) (point)))
+		  (line-beginning-position)
+		  (line-end-position))
     (overlay-put electric-buffer-overlay 'face 'highlight)))
 
 (provide 'ebuff-menu)
 
-;; arch-tag: 1d4509b3-eece-4d4f-95ea-77c83eaf0275
 ;;; ebuff-menu.el ends here
diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el
index 5e4b0dc96c..ac8e8943a2 100644
--- a/lisp/emacs-lisp/checkdoc.el
+++ b/lisp/emacs-lisp/checkdoc.el
@@ -1366,7 +1366,7 @@ See the style guide in the Emacs Lisp manual for more details."
 			   (setq checkdoc-autofix-flag 'never))))
 		 (checkdoc-create-error
 		  "You should convert this comment to documentation"
-		  (point) (save-excursion (end-of-line) (point))))
+		  (point) (line-end-position)))
 	     (checkdoc-create-error
 	      (if (nth 2 fp)
 		  "All interactive functions should have documentation"
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index 145498b905..77953b3702 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -1,8 +1,8 @@
 ;;; edebug.el --- a source-level debugger for Emacs Lisp
 
-;; Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1997, 1999,
-;;   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1997,
+;;   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+;;   2010  Free Software Foundation, Inc.
 
 ;; Author: Daniel LaLiberte <liberte@holonexus.org>
 ;; Maintainer: FSF
@@ -2991,7 +2991,7 @@ MSG is printed after `::::} '."
   ;; Set up the overlay arrow at beginning-of-line in current buffer.
   ;; The arrow string is derived from edebug-arrow-alist and
   ;; edebug-execution-mode.
-  (let ((pos (save-excursion (beginning-of-line) (point))))
+  (let ((pos (line-beginning-position)))
     (setq overlay-arrow-string
 	  (cdr (assq edebug-execution-mode edebug-arrow-alist)))
     (setq overlay-arrow-position (make-marker))
@@ -4454,5 +4454,4 @@ With prefix argument, make it a temporary breakpoint."
 
 (provide 'edebug)
 
-;; arch-tag: 19c8d05c-4554-426e-ac72-e0fa1fcb0808
 ;;; edebug.el ends here
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index ef639d6ec3..5f17514763 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -1067,7 +1067,7 @@ is the buffer position of the start of the containing expression."
                        (goto-char calculate-lisp-indent-last-sexp)
                        (or (and (looking-at ":")
                                 (setq indent (current-column)))
-                           (and (< (save-excursion (beginning-of-line) (point))
+                           (and (< (line-beginning-position)
                                    (prog2 (backward-sexp) (point)))
                                 (looking-at ":")
                                 (setq indent (current-column))))
@@ -1429,5 +1429,4 @@ means don't indent that line."
 
 (provide 'lisp-mode)
 
-;; arch-tag: 414c7f93-c245-4b77-8ed5-ed05ef7ff1bf
 ;;; lisp-mode.el ends here
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 081e743dcd..0f4768b0b6 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -718,7 +718,7 @@ Leave point at the start of the delimiter line."
   "Carry out Auto Fill for Mail mode.
 If within the headers, this makes the new lines into continuation lines."
   (if (< (point) (mail-header-end))
-      (let ((old-line-start (save-excursion (beginning-of-line) (point))))
+      (let ((old-line-start (line-beginning-position)))
 	(if (do-auto-fill)
 	    (save-excursion
 	      (beginning-of-line)
@@ -1955,5 +1955,4 @@ you can move to one of them and type C-c C-c to recover that one."
 
 (provide 'sendmail)
 
-;; arch-tag: 48bc1025-d993-4d31-8d81-2a29491f0626
 ;;; sendmail.el ends here
diff --git a/lisp/makesum.el b/lisp/makesum.el
index c77a248eb4..4b5cd036f9 100644
--- a/lisp/makesum.el
+++ b/lisp/makesum.el
@@ -1,7 +1,7 @@
 ;;; makesum.el --- generate key binding summary for Emacs
 
-;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
-;;   2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+;;   2009, 2010  Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: help
@@ -98,7 +98,7 @@ Previous contents of that buffer are killed first."
        (forward-line half)
        (while (< half nlines)
 	 (setq half (1+ half))
-	 (setq line (buffer-substring (point) (save-excursion (end-of-line) (point))))
+	 (setq line (buffer-substring (point) (line-end-position)))
 	 (setq lines (cons line lines))
 	 (delete-region (point) (progn (forward-line 1) (point)))))
       (setq lines (nreverse lines))
@@ -112,5 +112,4 @@ Previous contents of that buffer are killed first."
 
 (provide 'makesum)
 
-;; arch-tag: c2383336-fc89-46ad-8110-ded42bffaee3
 ;;; makesum.el ends here
diff --git a/lisp/misc.el b/lisp/misc.el
index 6f32a3eb90..55b685fe2b 100644
--- a/lisp/misc.el
+++ b/lisp/misc.el
@@ -1,7 +1,7 @@
 ;;; misc.el --- some nonstandard basic editing commands for Emacs
 
-;; Copyright (C) 1989, 2001, 2002, 2003, 2004, 2005,
-;;   2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1989, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+;;   2009, 2010  Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: convenience
@@ -54,7 +54,7 @@ The characters copied are inserted in the buffer before point."
       (setq string (concat string
 			   (buffer-substring
 			    (point)
-			    (min (save-excursion (end-of-line) (point))
+			    (min (line-end-position)
 				 (+ n (point)))))))
     (insert string)))
 
@@ -132,5 +132,4 @@ variation of `C-x M-c M-butterfly' from url `http://xkcd.com/378/'."
 
 (provide 'misc)
 
-;; arch-tag: 908f7884-c19e-4388-920c-9cfa425e449b
 ;;; misc.el ends here
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index 4b63dfd753..0709166347 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -4901,7 +4901,7 @@ NEWNAME should be the name to give the new compressed or uncompressed file.")
 ;;  ;; This is the Unix dl version.
 ;;  (let ((opoint (point))
 ;;	case-fold-search hidden)
-;;    (or eol (setq eol (save-excursion (end-of-line) (point))))
+;;    (or eol (setq eol (line-end-position)))
 ;;    (setq hidden (and selective-display
 ;;		       (save-excursion
 ;;			 (search-forward "\r" eol t))))
@@ -5300,7 +5300,7 @@ Other orders of $ and _ seem to all work just fine.")
 ;;  ;; This is the VMS version.
 ;;  (let (opoint hidden case-fold-search)
 ;;    (setq opoint (point))
-;;    (or eol (setq eol (save-excursion (end-of-line) (point))))
+;;    (or eol (setq eol (line-end-position)))
 ;;    (setq hidden (and selective-display
 ;;		      (save-excursion (search-forward "\r" eol t))))
 ;;    (if hidden
@@ -5658,7 +5658,7 @@ Other orders of $ and _ seem to all work just fine.")
 ;;  ;; This is the MTS version.
 ;;  (let (opoint hidden case-fold-search)
 ;;    (setq opoint (point)
-;;	  eol (save-excursion (end-of-line) (point))
+;;	  eol (line-end-position)
 ;;	  hidden (and selective-display
 ;;		      (save-excursion (search-forward "\r" eol t))))
 ;;    (if hidden
@@ -5879,7 +5879,7 @@ Other orders of $ and _ seem to all work just fine.")
 ;;  ;; This is the CMS version.
 ;;  (let ((opoint (point))
 ;;	case-fold-search hidden)
-;;    (or eol (setq eol (save-excursion (end-of-line) (point))))
+;;    (or eol (setq eol (line-end-position)))
 ;;    (setq hidden (and selective-display
 ;;		      (save-excursion
 ;;			(search-forward "\r" eol t))))
@@ -6153,5 +6153,4 @@ be recognized automatically (they are all valid BS2000 hosts too)."
 
 (provide 'ange-ftp)
 
-;; arch-tag: 2987ef88-cb56-4ec1-87a9-79132572e316
 ;;; ange-ftp.el ends here
diff --git a/lisp/nxml/nxml-maint.el b/lisp/nxml/nxml-maint.el
index 5062da5cff..a10ad2b21a 100644
--- a/lisp/nxml/nxml-maint.el
+++ b/lisp/nxml/nxml-maint.el
@@ -1,6 +1,7 @@
 ;;; nxml-maint.el --- commands for maintainers of nxml-*.el
 
-;; Copyright (C) 2003, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2007, 2008, 2009, 2010
+;;   Free Software Foundation, Inc.
 
 ;; Author: James Clark
 ;; Keywords: XML
@@ -78,7 +79,7 @@
       (goto-char (point-min))
       (while (re-search-forward "^ *\\([a-FA-F0-9]\\{2\\}\\)[ \t]+" nil t)
 	(let ((row (match-string 1))
-	      (eol (save-excursion (end-of-line) (point))))
+	      (eol (line-end-position)))
 	  (while (re-search-forward "\\([a-FA-F0-9]\\{2\\}\\)-\\([a-FA-F0-9]\\{2\\}\\)\\|\\([a-FA-F0-9]\\{2\\}\\)" eol t)
 	    (setq lst
 		  (cons (if (match-beginning 3)
@@ -102,5 +103,4 @@
 
 (provide 'nxml-maint)
 
-;; arch-tag: 2cff6b55-12af-47db-90da-a91f782f435a
 ;;; nxml-maint.el ends here
diff --git a/lisp/play/gametree.el b/lisp/play/gametree.el
index 6fcc3136d0..215d95db34 100644
--- a/lisp/play/gametree.el
+++ b/lisp/play/gametree.el
@@ -201,7 +201,7 @@ should be no leading white space."
     (let ((boundary (concat "[ \t]*\\([1-9][0-9]*\\)\\("
                             gametree-full-ply-regexp "\\|"
                             gametree-half-ply-regexp "\\)"))
-          (limit (save-excursion (beginning-of-line 1) (point))))
+          (limit (line-beginning-position 1)))
       (if (looking-at boundary)
           (+ (* 2 (string-to-number (match-string 1)))
              (if (string-match gametree-half-ply-regexp (match-string 2)) 1 0))
@@ -617,5 +617,4 @@ shogi, etc.) players, it is a slightly modified version of Outline mode.
 
 (provide 'gametree)
 
-;; arch-tag: aaa30943-9ae4-4cc1-813d-a46f96b7e4f1
 ;;; gametree.el ends here
diff --git a/lisp/play/life.el b/lisp/play/life.el
index f4a6ee1836..996b0c6144 100644
--- a/lisp/play/life.el
+++ b/lisp/play/life.el
@@ -1,7 +1,7 @@
 ;;; life.el --- John Horton Conway's `Life' game for GNU Emacs
 
-;; Copyright (C) 1988, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1988, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+;;   2009, 2010  Free Software Foundation, Inc.
 
 ;; Author: Kyle Jones <kyleuunet.uu.net>
 ;; Maintainer: FSF
@@ -163,7 +163,7 @@ generations (this defaults to 1)."
       (replace-match (life-life-string) t t))
     ;; center the pattern horizontally
     (goto-char (point-min))
-    (setq n (/ (- fill-column (save-excursion (end-of-line) (point))) 2))
+    (setq n (/ (- fill-column (line-end-position)) 2))
     (while (not (eobp))
       (indent-to n)
       (forward-line))
@@ -302,5 +302,4 @@ generations (this defaults to 1)."
 
 (provide 'life)
 
-;; arch-tag: e9373544-755e-42f5-a9a1-4d4c422bb97a
 ;;; life.el ends here
diff --git a/lisp/progmodes/dcl-mode.el b/lisp/progmodes/dcl-mode.el
index bf12d772dd..dd7aa0eddf 100644
--- a/lisp/progmodes/dcl-mode.el
+++ b/lisp/progmodes/dcl-mode.el
@@ -1,7 +1,7 @@
 ;;; dcl-mode.el --- major mode for editing DCL command files
 
-;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+;;   2009, 2010  Free Software Foundation, Inc.
 
 ;; Author: Odd Gripenstam <gripenstamol@decus.se>
 ;; Maintainer: Odd Gripenstam <gripenstamol@decus.se>
@@ -821,7 +821,7 @@ by the numbers in order 1-2-3-1-... :
   ;;  text
   ;;  1
 
-  (let* ((default-limit (save-excursion (end-of-line) (1+ (point))))
+  (let* ((default-limit (1+ (line-end-position)))
 	 (limit (or limit default-limit))
 	 (last-good-point (point))
 	 (opoint (point)))
@@ -1783,7 +1783,7 @@ Set or update the value of VAR in the current buffers
 	  (skip-chars-forward " \t")
 	  (or (eolp)
 	      (setq suffix-string (buffer-substring (point)
-					     (progn (end-of-line) (point)))))
+                                                    (line-end-position))))
 	  (goto-char (match-beginning 0))
 	  (or (bolp)
 	      (setq prefix-string
@@ -2214,5 +2214,4 @@ otherwise return nil."
 
 (run-hooks 'dcl-mode-load-hook)		; for your customizations
 
-;; arch-tag: e00d421b-f26c-483e-a8bd-af412ea7764a
 ;;; dcl-mode.el ends here
diff --git a/lisp/progmodes/ebnf2ps.el b/lisp/progmodes/ebnf2ps.el
index 201a091cc2..a4d1fe85c3 100644
--- a/lisp/progmodes/ebnf2ps.el
+++ b/lisp/progmodes/ebnf2ps.el
@@ -1,7 +1,7 @@
 ;;; ebnf2ps.el --- translate an EBNF to a syntactic chart on PostScript
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+;;   2008, 2009, 2010  Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
@@ -5279,7 +5279,7 @@ killed after process termination."
     (goto-char (point-min))
     (and (search-forward "%%Creator: " nil t)
 	 (not (search-forward "& ebnf2ps v"
-			      (save-excursion (end-of-line) (point))
+			      (line-end-position)
 			      t))
 	 (progn
 	   ;; adjust creator comment
@@ -6395,5 +6395,4 @@ killed after process termination."
 
 (provide 'ebnf2ps)
 
-;; arch-tag: 148bc8af-5398-468b-b922-eeb7afef3e4f
 ;;; ebnf2ps.el ends here
diff --git a/lisp/progmodes/ebrowse.el b/lisp/progmodes/ebrowse.el
index e32c453b91..7101bf21ad 100644
--- a/lisp/progmodes/ebrowse.el
+++ b/lisp/progmodes/ebrowse.el
@@ -1,8 +1,8 @@
 ;;; ebrowse.el --- Emacs C++ class browser & tags facility
 
-;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-;;   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;; Free Software Foundation Inc.
+;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+;;   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+;;   Free Software Foundation Inc.
 
 ;; Author: Gerd Moellmann <gerd@gnu.org>
 ;; Maintainer: FSF
@@ -1313,7 +1313,7 @@ With PREFIX, insert that many filenames."
 	  (skip-chars-forward " \t*a-zA-Z0-9_")
 	  (setq start (point)
 		file-name-existing (looking-at "("))
-	  (delete-region start (save-excursion (end-of-line) (point)))
+	  (delete-region start (line-end-position))
 	  (unless file-name-existing
 	    (indent-to ebrowse-source-file-column)
 	    (insert "(" (or (ebrowse-cs-file
@@ -4491,5 +4491,4 @@ EVENT is the mouse event."
 ;; eval:(put 'ebrowse-for-all-trees 'lisp-indent-hook 1)
 ;; End:
 
-;; arch-tag: 4fa3c8bf-1771-479b-bcd7-b029c7c9677b
 ;;; ebrowse.el ends here
diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index 042cc8c33f..96f36340fd 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -1,8 +1,8 @@
 ;;; etags.el --- etags facility for Emacs
 
-;; Copyright (C) 1985, 1986, 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1998,
-;;   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1986, 1988, 1989, 1992, 1993, 1994, 1995, 1996,
+;;   1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+;;   2010  Free Software Foundation, Inc.
 
 ;; Author: Roland McGrath <roland@gnu.org>
 ;; Maintainer: FSF
@@ -1681,7 +1681,7 @@ Point should be just after a string that matches TAG."
   (save-excursion
     (beginning-of-line)
     (let ((bol (point)))
-      (and (search-forward "\177" (save-excursion (end-of-line) (point)) t)
+      (and (search-forward "\177" (line-end-position) t)
 	   (re-search-backward re bol t)))))
 
 (defcustom tags-loop-revert-buffers nil
@@ -2086,5 +2086,4 @@ for \\[find-tag] (which see)."
 
 (provide 'etags)
 
-;; arch-tag: b897c2b5-08f3-4837-b2d3-0e7d6db1b63e
 ;;; etags.el ends here
diff --git a/lisp/progmodes/hideif.el b/lisp/progmodes/hideif.el
index 04ec915f3d..b21cd9c89e 100644
--- a/lisp/progmodes/hideif.el
+++ b/lisp/progmodes/hideif.el
@@ -760,7 +760,7 @@ Point is left unchanged."
       (cond ((hif-looking-at-else)
 	     (setq else (point)))
 	    (t
-	     (setq end (point)))) ; (save-excursion (end-of-line) (point))
+	     (setq end (point)))) ; (line-end-position)
       ;; If found #else, look for #endif.
       (when else
 	(while (progn
@@ -769,7 +769,7 @@ Point is left unchanged."
 	  (hif-ifdef-to-endif))
 	(if (hif-looking-at-else)
 	    (error "Found two elses in a row?  Broken!"))
-	(setq end (point)))	       ; (save-excursion (end-of-line) (point))
+	(setq end (point)))	       ; (line-end-position)
       (hif-make-range start end else))))
 
 
@@ -1025,5 +1025,4 @@ Return as (TOP . BOTTOM) the extent of ifdef block."
 
 (provide 'hideif)
 
-;; arch-tag: c6381d17-a59a-483a-b945-658f22277981
 ;;; hideif.el ends here
diff --git a/lisp/progmodes/icon.el b/lisp/progmodes/icon.el
index 9182b319b5..f0287c9018 100644
--- a/lisp/progmodes/icon.el
+++ b/lisp/progmodes/icon.el
@@ -1,7 +1,7 @@
 ;;; icon.el --- mode for editing Icon code
 
-;; Copyright (C) 1989, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1989, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+;;   2009, 2010  Free Software Foundation, Inc.
 
 ;; Author: Chris Smith <csmith@convex.com>
 ;; Created: 15 Feb 89
@@ -601,7 +601,7 @@ Returns nil if line starts inside a string, t if in a comment."
 		  (indent-to this-indent)))
 	    ;; Indent any comment following the text.
 	    (or (looking-at comment-start-skip)
-		(if (re-search-forward comment-start-skip (save-excursion (end-of-line) (point)) t)
+		(if (re-search-forward comment-start-skip (line-end-position) t)
 		    (progn (indent-for-comment) (beginning-of-line))))))))))
 
 (defconst icon-font-lock-keywords-1
@@ -687,5 +687,4 @@ Returns nil if line starts inside a string, t if in a comment."
 
 (provide 'icon)
 
-;; arch-tag: 8abf8c99-e7df-44af-a58f-ef5ed2ee52cb
 ;;; icon.el ends here
diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el
index 1bc9a397bc..97de1b3562 100644
--- a/lisp/progmodes/perl-mode.el
+++ b/lisp/progmodes/perl-mode.el
@@ -920,9 +920,7 @@ Optional argument PARSE-START should be the position of `beginning-of-defun'."
 			   (cond ((looking-at ";?#")
 				  (forward-line 1) t)
 				 ((looking-at "\\(\\w\\|\\s_\\)+:[^:]")
-				  (save-excursion
-				    (end-of-line)
-				    (setq colon-line-end (point)))
+				  (setq colon-line-end (line-end-position))
 				  (search-forward ":")))))
 		  ;; The first following code counts
 		  ;; if it is before the line we want to indent.
@@ -982,7 +980,7 @@ Optional argument PARSE-START should be the position of `beginning-of-defun'."
     (if (= (char-after (marker-position bof-mark)) ?=)
 	(message "Can't indent a format statement")
       (message "Indenting Perl expression...")
-      (save-excursion (end-of-line) (setq eol (point)))
+      (setq eol (line-end-position))
       (save-excursion			; locate matching close paren
 	(while (and (not (eobp)) (<= (point) eol))
 	  (parse-partial-sexp (point) (point-max) 0))
@@ -1080,5 +1078,4 @@ With argument, repeat that many times; negative args move backward."
 
 (provide 'perl-mode)
 
-;; arch-tag: 8c7ff68d-15f3-46a2-ade2-b7c41f176826
 ;;; perl-mode.el ends here
diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el
index 3e388dac56..dd17c4b608 100644
--- a/lisp/progmodes/prolog.el
+++ b/lisp/progmodes/prolog.el
@@ -242,7 +242,7 @@ if that value is non-nil."
 (defun end-of-prolog-clause ()
   "Go to end of clause in this line."
   (beginning-of-line 1)
-  (let* ((eolpos (save-excursion (end-of-line) (point))))
+  (let* ((eolpos (line-end-position)))
     (if (re-search-forward comment-start-skip eolpos 'move)
 	(goto-char (match-beginning 0)))
     (skip-chars-backward " \t")))
@@ -434,5 +434,4 @@ If COMPILE (prefix arg) is not nil, use compile mode rather than consult mode."
 
 (provide 'prolog)
 
-;; arch-tag: f3ec6748-1272-4ab6-8826-c50cb1607636
 ;;; prolog.el ends here
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 10e852223c..e72b18afd6 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -2605,7 +2605,7 @@ This function is appropriate for `comint-output-filter-functions'."
               overlay-arrow-string "=>"
               python-pdbtrack-is-tracking-p t)
         (set-marker overlay-arrow-position
-                    (save-excursion (beginning-of-line) (point))
+                    (line-beginning-position)
                     (current-buffer)))
     (setq overlay-arrow-position nil
           python-pdbtrack-is-tracking-p nil)))
@@ -2891,5 +2891,4 @@ filter."
 (provide 'python)
 (provide 'python-21)
 
-;; arch-tag: 6fce1d99-a704-4de9-ba19-c6e4912b0554
 ;;; python.el ends here
diff --git a/lisp/progmodes/simula.el b/lisp/progmodes/simula.el
index 34c50b6cfe..bfa921841e 100644
--- a/lisp/progmodes/simula.el
+++ b/lisp/progmodes/simula.el
@@ -964,7 +964,7 @@ If COUNT is negative, move backward instead."
 	      (simula-previous-statement 1)
 	      (simula-skip-comment-backward)))
 	(setq start-line
-	      (save-excursion (beginning-of-line) (point))
+	      (line-beginning-position)
 	      ;; - perhaps this is a continued statement
 	      continued
 	      (save-excursion
@@ -1023,7 +1023,7 @@ If COUNT is negative, move backward instead."
 				 (car simula-continued-statement-offset)
 			       simula-continued-statement-offset))))
 		(setq start-line
-		      (save-excursion (beginning-of-line) (point))
+		      (line-beginning-position)
 		      continued nil))
 	    ;; search failed .. point is at beginning of line
 	    ;; determine if we should continue searching
@@ -1064,7 +1064,7 @@ If COUNT is negative, move backward instead."
 			   simula-continued-statement-offset))))
 	    ;; while ends if point is at beginning of line at loop test
 	    (if (not temp)
-		(setq start-line (save-excursion (beginning-of-line) (point)))
+		(setq start-line (line-beginning-position))
 	      (beginning-of-line))))
         ;;
 	;; return indentation
@@ -1659,5 +1659,4 @@ If not nil and not t, move to limit of search and return nil."
 
 (provide 'simula)
 
-;; arch-tag: 488c1bb0-eebf-4f06-93df-1df603f06255
 ;;; simula.el ends here
diff --git a/lisp/progmodes/vera-mode.el b/lisp/progmodes/vera-mode.el
index 96877a000a..0d119503f3 100644
--- a/lisp/progmodes/vera-mode.el
+++ b/lisp/progmodes/vera-mode.el
@@ -770,7 +770,7 @@ the offset is simply returned."
 	      relpos 0)
       (setq offset (vera-evaluate-offset offset langelem symbol)))
     (+ (if (and relpos
-		(< relpos (save-excursion (beginning-of-line) (point))))
+		(< relpos (line-beginning-position)))
 	   (save-excursion
 	     (goto-char relpos)
 	     (current-column))
@@ -1482,5 +1482,4 @@ If `vera-intelligent-tab' is nil, always indent line."
 
 (provide 'vera-mode)
 
-;; arch-tag: 22eae722-7ac5-47ac-a713-c4db1cf623a9
 ;;; vera-mode.el ends here
diff --git a/lisp/reposition.el b/lisp/reposition.el
index 9bc00795fe..f6699f8c08 100644
--- a/lisp/reposition.el
+++ b/lisp/reposition.el
@@ -1,7 +1,7 @@
 ;;; reposition.el --- center a Lisp function or comment on the screen
 
-;; Copyright (C) 1991, 1994, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1991, 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+;;   2008, 2009, 2010  Free Software Foundation, Inc.
 
 ;; Author: Michael D. Ernst <mernst@theory.lcs.mit.edu>
 ;; Created: Jan 1991
@@ -58,7 +58,7 @@ visible (if point is in code and it could not be made so, or if only
 comments, including the first comment line, are visible), or to make the
 first comment line visible (if point is in a comment)."
   (interactive "P")
-  (let* (;; (here (save-excursion (beginning-of-line) (point)))
+  (let* (;; (here (line-beginning-position))
 	 (here (point))
 	 ;; change this name once I've gotten rid of references to ht.
 	 ;; this is actually the number of the last screen line
@@ -193,5 +193,4 @@ first comment line visible (if point is in a comment)."
 
 (provide 'reposition)
 
-;; arch-tag: 79487039-3bd7-4ab5-a3e8-ecf3b4919010
 ;;; reposition.el ends here
diff --git a/lisp/shell.el b/lisp/shell.el
index b7f62efdb8..7504030552 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -1,7 +1,8 @@
 ;;; shell.el --- specialized comint.el for running the shell
 
-;; Copyright (C) 1988, 1993, 1994, 1995, 1996, 1997, 2000, 2001,
-;;   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1988, 1993, 1994, 1995, 1996, 1997, 2000, 2001, 2002,
+;;   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+;;   Free Software Foundation, Inc.
 
 ;; Author: Olin Shivers <shivers@cs.cmu.edu>
 ;;	Simon Marshall <simon@gnu.org>
@@ -928,7 +929,7 @@ Copy Shell environment variable to Emacs: ")))
   "Move forward across ARG shell command(s).  Does not cross lines.
 See `shell-command-regexp'."
   (interactive "p")
-  (let ((limit (save-excursion (end-of-line nil) (point))))
+  (let ((limit (line-end-position)))
     (if (re-search-forward (concat shell-command-regexp "\\([;&|][\t ]*\\)+")
 			   limit 'move arg)
 	(skip-syntax-backward " "))))
@@ -1111,5 +1112,4 @@ Returns t if successful."
 
 (provide 'shell)
 
-;; arch-tag: bcb5f12a-c1f4-4aea-a809-2504bd5bd797
 ;;; shell.el ends here
diff --git a/lisp/simple.el b/lisp/simple.el
index 4d6d42f55a..a68fd92324 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -4474,7 +4474,7 @@ into account variable-width characters and line continuation."
 
       (let (new
 	    (old (point))
-	    (line-beg (save-excursion (beginning-of-line) (point)))
+	    (line-beg (line-beginning-position))
 	    (line-end
 	     ;; Compute the end of the line
 	     ;; ignoring effectively invisible newlines.
@@ -4582,7 +4582,7 @@ and `current-column' to be able to ignore invisible text."
 	;; that will get us to the same place on the screen
 	;; but with a more reasonable buffer position.
 	(goto-char normal-location)
-	(let ((line-beg (save-excursion (beginning-of-line) (point))))
+	(let ((line-beg (line-beginning-position)))
 	  (while (and (not (bolp)) (invisible-p (1- (point))))
 	    (goto-char (previous-char-property-change (point) line-beg))))))))
 
diff --git a/lisp/skeleton.el b/lisp/skeleton.el
index 28798b1a3b..1888b41c80 100644
--- a/lisp/skeleton.el
+++ b/lisp/skeleton.el
@@ -1,7 +1,7 @@
 ;;; skeleton.el --- Lisp language extension for writing statement skeletons -*- coding: utf-8 -*-
 
-;; Copyright (C) 1993, 1994, 1995, 1996, 2001, 2002, 2003,
-;;   2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1994, 1995, 1996, 2001, 2002, 2003, 2004, 2005,
+;;   2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 
 ;; Author: Daniel Pfeiffer <occitan@esperanto.org>
 ;; Maintainer: FSF
@@ -318,7 +318,7 @@ automatically, and you are prompted to fill in the variable parts.")))
     prompt))
 
 (defun skeleton-internal-list (skeleton &optional str recursive)
-  (let* ((start (save-excursion (beginning-of-line) (point)))
+  (let* ((start (line-beginning-position))
 	 (column (current-column))
 	 (line (buffer-substring start (line-end-position)))
 	 opoint)
@@ -562,5 +562,4 @@ symmetrical ones, and the same character twice for the others."
 
 (provide 'skeleton)
 
-;; arch-tag: ccad7bd5-eb5d-40de-9ded-900197215c3e
 ;;; skeleton.el ends here
diff --git a/lisp/sort.el b/lisp/sort.el
index a858ad1f8f..d4bbf6df05 100644
--- a/lisp/sort.el
+++ b/lisp/sort.el
@@ -1,7 +1,7 @@
 ;;; sort.el --- commands to sort text in an Emacs buffer
 
-;; Copyright (C) 1986, 1987, 1994, 1995, 2001, 2002, 2003,
-;;   2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1986, 1987, 1994, 1995, 2001, 2002, 2003, 2004, 2005,
+;;   2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 
 ;; Author: Howie Kaye
 ;; Maintainer: FSF
@@ -361,8 +361,8 @@ the sort order."
 	(if (eolp)
 	    (error "Line has too few fields: %s"
 		   (buffer-substring
-		    (save-excursion (beginning-of-line) (point))
-		    (save-excursion (end-of-line) (point))))))
+		    (line-beginning-position)
+		    (line-end-position)))))
     (end-of-line)
     ;; Skip back across - N - 1 fields.
     (let ((i (1- (- n))))
@@ -374,8 +374,8 @@ the sort order."
     (if (bolp)
 	(error "Line has too few fields: %s"
 	       (buffer-substring
-		(save-excursion (beginning-of-line) (point))
-		(save-excursion (end-of-line) (point)))))
+		(line-beginning-position)
+		(line-end-position))))
     ;; Position at the front of the field
     ;; even if moving backwards.
     (skip-chars-backward "^ \t\n")))
@@ -559,5 +559,4 @@ From a program takes two point or marker arguments, BEG and END."
 
 (provide 'sort)
 
-;; arch-tag: fbac12be-2a7b-4c8a-9665-264d61f70bd9
 ;;; sort.el ends here
diff --git a/lisp/speedbar.el b/lisp/speedbar.el
index 0719f895fa..3c05734489 100644
--- a/lisp/speedbar.el
+++ b/lisp/speedbar.el
@@ -3249,7 +3249,7 @@ directory with these items."
 	;; If this fails, then it is a non-standard click, and as such,
 	;; perfectly allowed.
 	(if (re-search-forward "[]>?}] [^ ]"
-			       (save-excursion (end-of-line) (point))
+			       (line-end-position)
 			       t)
 	    (progn
 	      (forward-char -1)
@@ -3267,7 +3267,7 @@ With universal argument ARG, flush cached data."
     (condition-case nil
 	(progn
 	  (re-search-forward ":\\s-*.\\+. "
-			     (save-excursion (end-of-line) (point)))
+			     (line-end-position))
 	  (forward-char -2)
 	  (speedbar-do-function-pointer))
       (error (speedbar-position-cursor-on-line)))))
@@ -3284,7 +3284,7 @@ With universal argument ARG, flush cached data."
   (condition-case nil
       (progn
 	(re-search-forward ":\\s-*.-. "
-			   (save-excursion (end-of-line) (point)))
+			   (line-end-position))
 	(forward-char -2)
 	(speedbar-do-function-pointer))
     (error (speedbar-position-cursor-on-line))))
@@ -3296,7 +3296,7 @@ With universal argument ARG, flush cached data."
   (condition-case nil
       (progn
 	(re-search-forward ":\\s-*.[-+]. "
-			   (save-excursion (end-of-line) (point)))
+			   (line-end-position))
 	(forward-char -2)
 	(speedbar-do-function-pointer))
     (error (speedbar-position-cursor-on-line))))
@@ -3787,7 +3787,7 @@ regular expression EXPR."
 (defun speedbar-parse-c-or-c++tag ()
   "Parse a C or C++ tag, which tends to be a little complex."
   (save-excursion
-    (let ((bound (save-excursion (end-of-line) (point))))
+    (let ((bound (line-end-position)))
       (cond ((re-search-forward "\C-?\\([^\C-a]+\\)\C-a" bound t)
 	     (buffer-substring-no-properties (match-beginning 1)
 					     (match-end 1)))
@@ -3803,7 +3803,7 @@ regular expression EXPR."
 (defun speedbar-parse-tex-string ()
   "Parse a Tex string.  Only find data which is relevant."
   (save-excursion
-    (let ((bound (save-excursion (end-of-line) (point))))
+    (let ((bound (line-end-position)))
       (cond ((re-search-forward "\\(\\(sub\\)*section\\|chapter\\|cite\\)\\s-*{[^\C-?}]*}?" bound t)
 	     (buffer-substring-no-properties (match-beginning 0)
 					     (match-end 0)))
@@ -3983,7 +3983,7 @@ TEXT is the buffer's name, TOKEN and INDENT are unused."
     ;; If this fails, then it is a non-standard click, and as such,
     ;; perfectly allowed
     (if (re-search-forward "[]>?}] [^ ]"
-			   (save-excursion (end-of-line) (point))
+			   (line-end-position)
 			   t)
 	(let ((text (progn
 		      (forward-char -1)
@@ -4005,7 +4005,7 @@ TEXT is the buffer's name, TOKEN and INDENT are unused."
   "Highlight the current line, unhighlighting a previously jumped to line."
   (speedbar-unhighlight-one-tag-line)
   (setq speedbar-highlight-one-tag-line
-	(speedbar-make-overlay (save-excursion (beginning-of-line) (point))
+	(speedbar-make-overlay (line-beginning-position)
 			       (save-excursion (end-of-line)
 					       (forward-char 1)
 					       (point))))
diff --git a/lisp/term.el b/lisp/term.el
index 80f5dcdc01..6d92235623 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -1,7 +1,8 @@
 ;;; term.el --- general command interpreter in a window stuff
 
-;; Copyright (C) 1988, 1990, 1992, 1994, 1995, 2001, 2002, 2003,
-;;   2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1988, 1990, 1992, 1994, 1995, 2001, 2002, 2003, 2004,
+;;   2005, 2006, 2007, 2008, 2009, 2010
+;;   Free Software Foundation, Inc.
 
 ;; Author: Per Bothner <per@bothner.com>
 ;; Maintainer: Dan Nicolaescu <dann@ics.uci.edu>, Per Bothner <per@bothner.com>
@@ -1798,15 +1799,11 @@ Returns t if successful."
   "Expand directory stack reference before point.
 See `term-replace-by-expanded-history'.  Returns t if successful."
   (save-excursion
-    (let ((toend (- (save-excursion (end-of-line nil) (point)) (point)))
+    (let ((toend (- (line-end-position) (point)))
 	  (start (progn (term-bol nil) (point))))
       (while (progn
-	       (skip-chars-forward "^!^"
-				   (save-excursion
-				     (end-of-line nil) (- (point) toend)))
-	       (< (point)
-		  (save-excursion
-		    (end-of-line nil) (- (point) toend))))
+	       (skip-chars-forward "^!^" (- (line-end-position) toend))
+	       (< (point) (- (line-end-position) toend)))
 	;; This seems a bit complex.  We look for references such as !!, !-num,
 	;; !foo, !?foo, !{bar}, !?{bar}, ^oh, ^my^, ^god^it, ^never^ends^.
 	;; If that wasn't enough, the plings can be suffixed with argument
@@ -2112,7 +2109,7 @@ Calls `term-get-old-input' to get old input."
 (defun term-skip-prompt ()
   "Skip past the text matching regexp `term-prompt-regexp'.
 If this takes us past the end of the current line, don't skip at all."
-  (let ((eol (save-excursion (end-of-line) (point))))
+  (let ((eol (line-end-position)))
     (when (and (looking-at term-prompt-regexp)
 	       (<= (match-end 0) eol))
       (goto-char (match-end 0)))))
@@ -2471,11 +2468,10 @@ See `term-prompt-regexp'."
   "Return string around `point' that starts the current line or nil."
   (save-excursion
     (let* ((point (point))
-	   (bol (progn (beginning-of-line) (point)))
-	   (eol (progn (end-of-line) (point)))
-	   (start (progn (goto-char point)
-			 (and (search-backward "\"" bol t)
-			      (1+ (point)))))
+	   (bol (line-beginning-position))
+	   (eol (line-end-position))
+	   (start (and (search-backward "\"" bol t)
+                       (1+ (point))))
 	   (end (progn (goto-char point)
 		       (and (search-forward "\"" eol t)
 			    (1- (point))))))
@@ -4534,5 +4530,4 @@ The return value may be nil for a special serial port."
 
 (provide 'term)
 
-;; arch-tag: eee16bc8-2cd7-4147-9534-a5694752f716
 ;;; term.el ends here
diff --git a/lisp/textmodes/page-ext.el b/lisp/textmodes/page-ext.el
index 05065cd442..548223e4f2 100644
--- a/lisp/textmodes/page-ext.el
+++ b/lisp/textmodes/page-ext.el
@@ -671,7 +671,7 @@ Used by `pages-directory' function."
       (setq position (make-marker))
       (set-marker position (point))
       (let ((start (point))
-            (end (save-excursion (end-of-line) (point)))
+            (end (line-end-position))
 	    inserted-at)
         ;; change to directory buffer
         (set-buffer standard-output)
@@ -783,7 +783,7 @@ directory."
             (delete-other-windows))
         (save-excursion
           (goto-char (point-min))
-          (delete-region (point) (save-excursion (end-of-line) (point)))
+          (delete-region (point) (line-end-position))
           (insert
            "=== Address List Directory: use `C-c C-c' to go to page under cursor. ===")
           (set-buffer-modified-p nil)
@@ -801,5 +801,4 @@ to the same line in the pages buffer."
 
 (provide 'page-ext)
 
-;; arch-tag: 2f311550-c6e0-4458-9c12-7f039c058bdb
 ;;; page-ext.el ends here
diff --git a/lisp/textmodes/picture.el b/lisp/textmodes/picture.el
index 89e1020db9..961be29cc8 100644
--- a/lisp/textmodes/picture.el
+++ b/lisp/textmodes/picture.el
@@ -438,7 +438,7 @@ If no such character is found, move to beginning of line."
 	  (move-to-column target))
       (if (re-search-forward
 	   (concat "[ \t]+[" (regexp-quote picture-tab-chars) "]")
-	   (save-excursion (end-of-line) (point))
+	   (line-end-position)
 	   'move)
 	  (setq target (1- (current-column)))
 	(setq target nil)))
@@ -775,5 +775,4 @@ Runs `picture-mode-exit-hook' at the end."
 
 (provide 'picture)
 
-;; arch-tag: e452d08d-a470-4fbf-896e-ea276698d1ca
 ;;; picture.el ends here
diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el
index 136c5dc466..eb2d4849a3 100644
--- a/lisp/textmodes/table.el
+++ b/lisp/textmodes/table.el
@@ -5057,7 +5057,7 @@ Focus only on the corner pattern.  Further cell validity check is required."
 	  (intersection-str (regexp-quote (char-to-string table-cell-intersection-char)))
 	  (v-border (format "[%c%c]" table-cell-vertical-char table-cell-intersection-char))
 	  (h-border (format "[%s%c]" table-cell-horizontal-chars table-cell-intersection-char))
-	  (limit (save-excursion (beginning-of-line) (point))))
+	  (limit (line-beginning-position)))
       (catch 'end
 	(while t
 	  (catch 'retry-horizontal
@@ -5095,7 +5095,7 @@ Focus only on the corner pattern.  Further cell validity check is required."
 	  (intersection-str (regexp-quote (char-to-string table-cell-intersection-char)))
 	  (v-border (format "[%c%c]" table-cell-vertical-char table-cell-intersection-char))
 	  (h-border (format "[%s%c]" table-cell-horizontal-chars table-cell-intersection-char))
-	  (limit (save-excursion (end-of-line) (point))))
+	  (limit (line-end-position)))
       (catch 'end
 	(while t
 	  (catch 'retry-horizontal
@@ -5589,5 +5589,4 @@ It returns COLUMN unless STR contains some wide characters."
 
 (provide 'table)
 
-;; arch-tag: 0d69b03e-aa5f-4e72-8806-5727217617e0
 ;;; table.el ends here
diff --git a/lisp/textmodes/texnfo-upd.el b/lisp/textmodes/texnfo-upd.el
index f4fcc95908..a5b4937f24 100644
--- a/lisp/textmodes/texnfo-upd.el
+++ b/lisp/textmodes/texnfo-upd.el
@@ -719,21 +719,21 @@ complements the node name rather than repeats it as a title does."
   (let (beginning end node-name title)
     (save-excursion
       (beginning-of-line)
-      (if (search-forward "* " (save-excursion (end-of-line) (point)) t)
+      (if (search-forward "* " (line-end-position) t)
 	  (progn (skip-chars-forward " \t")
 		 (setq beginning (point)))
 	(error "This is not a line in a menu"))
 
       (cond
        ;; "Double colon" entry line; menu entry and node name are the same,
-       ((search-forward "::" (save-excursion (end-of-line) (point)) t)
+       ((search-forward "::" (line-end-position) t)
 	(if (looking-at "[ \t]*[^ \t\n]+")
 	    (error "Descriptive text already exists"))
 	(skip-chars-backward ": \t")
 	(setq node-name (buffer-substring beginning (point))))
 
        ;; "Single colon" entry line; menu entry and node name are different.
-       ((search-forward ":" (save-excursion (end-of-line) (point)) t)
+       ((search-forward ":" (line-end-position) t)
 	(skip-chars-forward " \t")
 	(setq beginning (point))
 	;; Menu entry line ends in a period, comma, or tab.
@@ -1154,8 +1154,7 @@ Only argument is a string of the general type of section."
       (save-excursion
 	(goto-char (point-min))
 	(re-search-forward "^@node [ \t]*top[ \t]*\\(,\\|$\\)" nil t)
-	(beginning-of-line)
-	(point)))
+	(line-beginning-position)))
      (t
       (save-excursion
 	(re-search-backward
@@ -1206,13 +1205,11 @@ The menu will be located just before this position.
 First argument is the position of the beginning of the section in
 which the menu will be located; second argument is the position of the
 end of that region; it limits the search."
-
   (save-excursion
     (goto-char beginning)
     (forward-line 1)
     (re-search-forward "^@node" end t)
-    (beginning-of-line)
-    (point)))
+    (line-beginning-position)))
 
 
 ;;; Updating a node
@@ -1331,7 +1328,7 @@ Point must be at beginning of node line.  Does not move point."
 Starts from the current position of the cursor, and searches forward
 on the line for a comma and if one is found, deletes the rest of the
 line, including the comma.  Leaves point at beginning of line."
-  (let ((eol-point (save-excursion (end-of-line) (point))))
+  (let ((eol-point (line-end-position)))
     (if (search-forward "," eol-point t)
 	(delete-region (1- (point)) eol-point)))
   (beginning-of-line))
@@ -1437,8 +1434,7 @@ will be at some level higher in the Texinfo file.  The fourth argument
 		 "\\)")
 		(save-excursion
 		  (goto-char beginning)
-		  (beginning-of-line)
-		  (point))
+		  (line-beginning-position))
 		t)
 	       'normal
 	     'no-pointer))
@@ -1483,7 +1479,7 @@ towards which the pointer is directed, one of `next', `previous', or `up'."
   "Remove extra commas, if any, at end of node line."
   (end-of-line)
   (skip-chars-backward ", ")
-  (delete-region (point) (save-excursion (end-of-line) (point))))
+  (delete-region (point) (line-end-position)))
 
 
 ;;; Updating nodes sequentially
@@ -1647,7 +1643,7 @@ node names in pre-existing `@node' lines that lack names."
 	    (skip-chars-forward " \t")
 	    (setq title (buffer-substring
 			 (point)
-			 (save-excursion (end-of-line) (point))))))
+			 (line-end-position)))))
       ;; Insert node line if necessary.
       (if (re-search-backward
 	   "^@node"
@@ -1993,9 +1989,7 @@ chapter."
 	 (point-min)
 	 (save-excursion
 	   (re-search-forward "^@include")
-	   (beginning-of-line)
-	   (point)))
-
+	   (line-beginning-position)))
 	;; If found, leave point after word `menu' on the `@menu' line.
 	(progn
 	  (texinfo-incorporate-descriptions main-menu-list)
@@ -2057,5 +2051,4 @@ chapter."
 ;; Place `provide' at end of file.
 (provide 'texnfo-upd)
 
-;; arch-tag: d21613a5-c32f-43f4-8af4-bfb1e7455842
 ;;; texnfo-upd.el ends here
diff --git a/lisp/type-break.el b/lisp/type-break.el
index 641215be8c..83278cbc6c 100644
--- a/lisp/type-break.el
+++ b/lisp/type-break.el
@@ -1,7 +1,7 @@
 ;;; type-break.el --- encourage rests from typing at appropriate intervals
 
-;; Copyright (C) 1994, 1995, 1997, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1995, 1997, 2000, 2001, 2002, 2003, 2004, 2005,
+;;   2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 
 ;; Author: Noah Friedman
 ;; Maintainer: Noah Friedman <friedman@splode.com>
@@ -495,7 +495,7 @@ variable of the same name."
 	    (let ((inhibit-read-only t))
 	      (goto-char (point-min))
 	      (forward-line)
-	      (delete-region (point) (save-excursion (end-of-line) (point)))
+	      (delete-region (point) (line-end-position))
 	      (insert (format "%s" type-break-keystroke-count))
 	      ;; file saving is left to auto-save
 	      ))))))
@@ -1243,5 +1243,4 @@ With optional non-nil ALL, force redisplay of all mode-lines."
 (if type-break-mode
     (type-break-mode 1))
 
-;; arch-tag: 943a2eb3-07e6-420b-993f-96e4796f5fd0
 ;;; type-break.el ends here
diff --git a/lisp/woman.el b/lisp/woman.el
index 265b20bb2d..25113419de 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -3543,8 +3543,8 @@ The expression may be an argument in quotes."
 ;      (WoMan-warn "Unimplemented numerical operator `%c' in %s"
 ;		  (following-char)
 ;		  (buffer-substring
-;		   (save-excursion (beginning-of-line) (point))
-;		   (save-excursion (end-of-line) (point))))
+;		   (line-beginning-position)
+;		   (line-end-position)))
 ;      (skip-syntax-forward "^ "))
     value
     ))
@@ -3613,7 +3613,7 @@ expression in parentheses.  Leaves point after the value."
 	    (WoMan-warn "Numeric/register argument error: %s"
 			(buffer-substring
 			 (point)
-			 (save-excursion (end-of-line) (point))))
+			 (line-end-position)))
 	    (skip-syntax-forward "^ ")
 	    0)
 	(goto-char (match-end 0))
@@ -3763,8 +3763,7 @@ v alters page foot left; m alters page head center.
 			(buffer-substring start here))
 	  (delete-region here (point)))))
   ;; Embolden heading (point is at end of heading):
-  (woman-set-face
-   (save-excursion (beginning-of-line) (point)) (point) 'woman-bold)
+  (woman-set-face (line-beginning-position) (point) 'woman-bold)
   (forward-line)
   (delete-blank-lines)
   (setq woman-left-margin woman-default-indent)
@@ -3783,8 +3782,7 @@ Format paragraphs upto TO.  Set prevailing indent to 5."
   (setq woman-leave-blank-lines nil)
   ;; Optionally embolden heading (point is at beginning of heading):
   (if woman-bold-headings
-      (woman-set-face
-       (point) (save-excursion (end-of-line) (point)) 'woman-bold))
+      (woman-set-face (point) (line-end-position) 'woman-bold))
   (forward-line)
   (setq woman-left-margin woman-default-indent
 	woman-nofill nil)		; fill output lines
@@ -4376,7 +4374,7 @@ tab stop columns or pairs (COLUMN . TYPE) where TYPE is R or C."
 	       eol n)
 	  (if type
 	      (setq tab (woman-get-tab-stop tab)
-		    eol (save-excursion (end-of-line) (point))
+		    eol (line-end-position)
 		    n (save-excursion
 			(search-forward "\t" eol t))
 		    n (- (if n (1- n) eol) (point))
@@ -4507,7 +4505,7 @@ Format paragraphs upto TO."
 IGNORED is a string appended to the log message."
   (let ((tail
 	 (buffer-substring (point)
-			   (save-excursion (end-of-line) (point)))))
+			   (line-end-position))))
     (if (and (> (length tail) 0)
 	     (/= (string-to-char tail) ?\ ))
 	(setq tail (concat " " tail)))