aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLute Kamstra2008-11-22 17:33:06 +0000
committerLute Kamstra2008-11-22 17:33:06 +0000
commit9af967bd65ff0071d9a06313b7f274b87b591ce9 (patch)
treeaf2d56e6efa45fd366422f0e1b4500e7395863a2
parent0b8e2d21df603d0d74c7f4163fda2ac1354d39d7 (diff)
downloademacs-9af967bd65ff0071d9a06313b7f274b87b591ce9.tar.gz
emacs-9af967bd65ff0071d9a06313b7f274b87b591ce9.zip
(goto-line): Rename argument.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/simple.el23
2 files changed, 16 insertions, 11 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ae4300ae15c..9eb1ac93df2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12008-11-22 Lute Kamstra <lute@gnu.org>
2
3 * simple.el (goto-line): Rename argument.
4
12008-11-22 Eli Zaretskii <eliz@gnu.org> 52008-11-22 Eli Zaretskii <eliz@gnu.org>
2 6
3 * makefile.w32-in (compile-first): New target. 7 * makefile.w32-in (compile-first): New target.
diff --git a/lisp/simple.el b/lisp/simple.el
index d8470cab4a3..ef06ace695a 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -837,15 +837,16 @@ that uses or sets the mark."
837 837
838;; Counting lines, one way or another. 838;; Counting lines, one way or another.
839 839
840(defun goto-line (arg &optional buffer) 840(defun goto-line (line &optional buffer)
841 "Goto line ARG, counting from line 1 at beginning of buffer. 841 "Goto LINE, counting from line 1 at beginning of buffer.
842Normally, move point in the current buffer, and leave mark at previous 842Normally, move point in the current buffer, and leave mark at the
843position. With just \\[universal-argument] as argument, move point 843previous position. With just \\[universal-argument] as argument,
844in the most recently displayed other buffer, and switch to it. 844move point in the most recently selected other buffer, and switch
845When called from Lisp code, the optional argument BUFFER specifies 845to it. When called from Lisp code, the optional argument BUFFER
846a buffer to switch to. 846specifies a buffer to switch to.
847 847
848If there's a number in the buffer at point, it is the default for ARG." 848If there's a number in the buffer at point, it is the default for
849LINE."
849 (interactive 850 (interactive
850 (if (and current-prefix-arg (not (consp current-prefix-arg))) 851 (if (and current-prefix-arg (not (consp current-prefix-arg)))
851 (list (prefix-numeric-value current-prefix-arg)) 852 (list (prefix-numeric-value current-prefix-arg))
@@ -887,8 +888,8 @@ If there's a number in the buffer at point, it is the default for ARG."
887 (widen) 888 (widen)
888 (goto-char 1) 889 (goto-char 1)
889 (if (eq selective-display t) 890 (if (eq selective-display t)
890 (re-search-forward "[\n\C-m]" nil 'end (1- arg)) 891 (re-search-forward "[\n\C-m]" nil 'end (1- line))
891 (forward-line (1- arg))))) 892 (forward-line (1- line)))))
892 893
893(defun count-lines-region (start end) 894(defun count-lines-region (start end)
894 "Print number of lines and characters in the region." 895 "Print number of lines and characters in the region."