aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/simple.el2
2 files changed, 2 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 00b2f7046dd..4a41732e48e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,7 @@
12005-11-17 Chong Yidong <cyd@stupidchicken.com> 12005-11-17 Chong Yidong <cyd@stupidchicken.com>
2 2
3 * simple.el (hard-newline): New variable. 3 * simple.el (hard-newline): New variable.
4 (sendmail-user-agent-compose): Use it. 4 (sendmail-user-agent-compose, next-line): Use it.
5 5
6 * mail/sendmail.el (mail-setup, mail-send, mail-insert-from-field) 6 * mail/sendmail.el (mail-setup, mail-send, mail-insert-from-field)
7 (sendmail-send-it, mail-do-fcc, mail-cc, mail-bcc, mail-fcc) 7 (sendmail-send-it, mail-do-fcc, mail-cc, mail-bcc, mail-fcc)
diff --git a/lisp/simple.el b/lisp/simple.el
index 2474df6c333..c358be1810b 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3326,7 +3326,7 @@ and more reliable (no dependence on goal column, etc.)."
3326 ;; When adding a newline, don't expand an abbrev. 3326 ;; When adding a newline, don't expand an abbrev.
3327 (let ((abbrev-mode nil)) 3327 (let ((abbrev-mode nil))
3328 (end-of-line) 3328 (end-of-line)
3329 (insert "\n")) 3329 (insert hard-newline))
3330 (line-move arg nil nil try-vscroll)) 3330 (line-move arg nil nil try-vscroll))
3331 (if (interactive-p) 3331 (if (interactive-p)
3332 (condition-case nil 3332 (condition-case nil