diff options
author | Glenn Morris <rgm@gnu.org> | 2010-11-06 13:23:42 -0700 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2010-11-06 13:23:42 -0700 |
commit | 5ed619e0a309c8ce539f0fbc2d19a068139f099d (patch) | |
tree | 9fff5acd78b23128c671511932338347e0d06f3f /lisp/term.el | |
parent | e2a9c0bca0dc06975181556767a3b6db8de4e486 (diff) | |
download | emacs-5ed619e0a309c8ce539f0fbc2d19a068139f099d.tar.gz |
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.
Diffstat (limited to 'lisp/term.el')
-rw-r--r-- | lisp/term.el | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/lisp/term.el b/lisp/term.el index 80f5dcdc01a..6d922356236 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 |