(next-line): Don't let `newline' expand abbrevs.

Simplify slightly.
(open-line): Don't let `newline' expand abbrevs.

2 files changed, 14 insertions, 7 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 86bcf14b8e9..3da7892efb0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2001-01-26  Richard M. Stallman  <rms@caffeine.ai.mit.edu>
+
+	* simple.el (next-line): Don't let `newline' expand abbrevs.
+	Simplify slightly.
+	(open-line): Don't let `newline' expand abbrevs.
+
 2001-01-25  John Wiegley  <johnw@gnu.org>
 
 	* eshell/esh-util.el (eshell-ange-ls-uids): Changed use of `alist'
diff --git a/lisp/simple.el b/lisp/simple.el
index 9053b565276..36780f1a0b2 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -141,7 +141,9 @@ With arg N, insert N newlines."
   (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 @@ using `forward-line' instead.  It is usually easier to use
 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)