# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 980500967 0
# Node ID e334380bbb2c053b0f95a4ea74b84c6c3dd7043b
# Parent  31904bdf4350ce831ffda2c3f27af90fb8521ba3
(next-line): Don't let `newline' expand abbrevs.
Simplify slightly.
(open-line): Don't let `newline' expand abbrevs.

diff -r 31904bdf4350 -r e334380bbb2c lisp/simple.el
--- a/lisp/simple.el	Fri Jan 26 06:19:25 2001 +0000
+++ b/lisp/simple.el	Fri Jan 26 09:22:47 2001 +0000
@@ -141,7 +141,9 @@
   (interactive "*p")
   (let* ((do-fill-prefix (and fill-prefix (bolp)))
 	 (do-left-margin (and (bolp) (> (current-left-margin) 0)))
-	 (loc (point)))
+	 (loc (point))
+	 ;; Don't expand an abbrev before point.
+	 (abbrev-mode nil))
     (newline arg)
     (goto-char loc)
     (while (> arg 0)
@@ -2391,12 +2393,11 @@
 and more reliable (no dependence on goal column, etc.)."
   (interactive "p")
   (if (and next-line-add-newlines (= arg 1))
-      (let ((opoint (point)))
-	(end-of-line)
-	(if (eobp)
-	    (newline 1)
-	  (goto-char opoint)
-	  (line-move arg)))
+      (if (save-excursion (end-of-line) (eobp))
+	  ;; When adding a newline, don't expand an abbrev.
+	  (let ((abbrev-mode nil))
+	    (newline 1))
+	(line-move arg))
     (if (interactive-p)
 	(condition-case nil
 	    (line-move arg)