aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/simple.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8caa87a5204..46eacc2de31 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12010-11-12 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * simple.el (open-line): `newline' may strip trailing space.
4
12010-11-12 Kevin Ryde <user42@zip.com.au> 52010-11-12 Kevin Ryde <user42@zip.com.au>
2 6
3 * international/mule-cmds.el (princ-list): Use mapc. 7 * international/mule-cmds.el (princ-list): Use mapc.
diff --git a/lisp/simple.el b/lisp/simple.el
index 329284807d2..510fb4a3b23 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -512,7 +512,7 @@ With arg N, insert N newlines."
512 (interactive "*p") 512 (interactive "*p")
513 (let* ((do-fill-prefix (and fill-prefix (bolp))) 513 (let* ((do-fill-prefix (and fill-prefix (bolp)))
514 (do-left-margin (and (bolp) (> (current-left-margin) 0))) 514 (do-left-margin (and (bolp) (> (current-left-margin) 0)))
515 (loc (point)) 515 (loc (point-marker))
516 ;; Don't expand an abbrev before point. 516 ;; Don't expand an abbrev before point.
517 (abbrev-mode nil)) 517 (abbrev-mode nil))
518 (newline n) 518 (newline n)