comparison lisp/sort.el @ 111429:249a1455856a

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.
author Glenn Morris <rgm@gnu.org>
date Sat, 06 Nov 2010 13:23:42 -0700
parents 1d1d5d9bd884
children 417b1e4d63cd
comparison
equal deleted inserted replaced
111428:043aac1cda3c 111429:249a1455856a
1 ;;; sort.el --- commands to sort text in an Emacs buffer 1 ;;; sort.el --- commands to sort text in an Emacs buffer
2 2
3 ;; Copyright (C) 1986, 1987, 1994, 1995, 2001, 2002, 2003, 3 ;; Copyright (C) 1986, 1987, 1994, 1995, 2001, 2002, 2003, 2004, 2005,
4 ;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. 4 ;; 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
5 5
6 ;; Author: Howie Kaye 6 ;; Author: Howie Kaye
7 ;; Maintainer: FSF 7 ;; Maintainer: FSF
8 ;; Keywords: unix 8 ;; Keywords: unix
9 9
359 (setq i (1- i))) 359 (setq i (1- i)))
360 (skip-chars-forward " \t") 360 (skip-chars-forward " \t")
361 (if (eolp) 361 (if (eolp)
362 (error "Line has too few fields: %s" 362 (error "Line has too few fields: %s"
363 (buffer-substring 363 (buffer-substring
364 (save-excursion (beginning-of-line) (point)) 364 (line-beginning-position)
365 (save-excursion (end-of-line) (point)))))) 365 (line-end-position)))))
366 (end-of-line) 366 (end-of-line)
367 ;; Skip back across - N - 1 fields. 367 ;; Skip back across - N - 1 fields.
368 (let ((i (1- (- n)))) 368 (let ((i (1- (- n))))
369 (while (> i 0) 369 (while (> i 0)
370 (skip-chars-backward " \t") 370 (skip-chars-backward " \t")
372 (setq i (1- i))) 372 (setq i (1- i)))
373 (skip-chars-backward " \t")) 373 (skip-chars-backward " \t"))
374 (if (bolp) 374 (if (bolp)
375 (error "Line has too few fields: %s" 375 (error "Line has too few fields: %s"
376 (buffer-substring 376 (buffer-substring
377 (save-excursion (beginning-of-line) (point)) 377 (line-beginning-position)
378 (save-excursion (end-of-line) (point))))) 378 (line-end-position))))
379 ;; Position at the front of the field 379 ;; Position at the front of the field
380 ;; even if moving backwards. 380 ;; even if moving backwards.
381 (skip-chars-backward "^ \t\n"))) 381 (skip-chars-backward "^ \t\n")))
382 382
383 (defvar sort-regexp-fields-regexp) 383 (defvar sort-regexp-fields-regexp)
557 (setq ll (cdr ll))) 557 (setq ll (cdr ll)))
558 (insert (car ll))))) 558 (insert (car ll)))))
559 559
560 (provide 'sort) 560 (provide 'sort)
561 561
562 ;; arch-tag: fbac12be-2a7b-4c8a-9665-264d61f70bd9
563 ;;; sort.el ends here 562 ;;; sort.el ends here