Merge from trunk

[gnu-emacs] / lisp / array.el

diff --git a/lisp/array.el b/lisp/array.el
index d22d58ca059b6158d4d6c2ce79481d114736acb1..1f04e8ef724eba03c5be1e173a94cda7f91d5df0 100644 (file)
--- a/lisp/array.el
+++ b/lisp/array.el
@@ -1,7 +1,7 @@
 ;;; array.el --- array editing commands for GNU Emacs
 
 ;; Copyright (C) 1987, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;;   2008, 2009, 2010 Free Software Foundation, Inc.
+;;   2008, 2009, 2010  Free Software Foundation, Inc.
 
 ;; Author: David M. Brown
 ;; Maintainer: FSF
@@ -748,9 +748,7 @@ of `array-rows-numbered'."
 
 (defun current-line ()
   "Return the current buffer line at point.  The first line is 0."
-  (save-excursion
-    (beginning-of-line)
-    (count-lines (point-min) (point))))
+  (count-lines (point-min) (line-beginning-position)))
 
 (defun move-to-column-untabify (column)
   "Move to COLUMN on the current line, untabifying if necessary.
@@ -903,5 +901,4 @@ Entering array mode calls the function `array-mode-hook'."
 
 (provide 'array)
 
-;; arch-tag: 0086605d-79fe-4a1a-992a-456417261f80
 ;;; array.el ends here