comparison lisp/simple.el @ 67213:818361523ce8

* longlines.el (longlines-mode): Add mail-setup-hook. * mail/mailheader.el, mail/sendmail.el: Revert 2005-11-17 changes. * simple.el (sendmail-user-agent-compose, next-line): Conditionally use hard-newline.
author Chong Yidong <cyd@stupidchicken.com>
date Tue, 29 Nov 2005 23:54:47 +0000
parents b3df9252e4e8
children 4f8e0edba613 1955a4462bf9
comparison
equal deleted inserted replaced
67212:51e8cdc7d8a8 67213:818361523ce8
3324 (if (and next-line-add-newlines (= arg 1)) 3324 (if (and next-line-add-newlines (= arg 1))
3325 (if (save-excursion (end-of-line) (eobp)) 3325 (if (save-excursion (end-of-line) (eobp))
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 hard-newline)) 3329 (insert (if use-hard-newlines hard-newline "\n")))
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
3333 (line-move arg nil nil try-vscroll) 3333 (line-move arg nil nil try-vscroll)
3334 ((beginning-of-buffer end-of-buffer) (ding))) 3334 ((beginning-of-buffer end-of-buffer) (ding)))
4513 (rfc822-goto-eoh) 4513 (rfc822-goto-eoh)
4514 (while other-headers 4514 (while other-headers
4515 (unless (member-ignore-case (car (car other-headers)) 4515 (unless (member-ignore-case (car (car other-headers))
4516 '("in-reply-to" "cc" "body")) 4516 '("in-reply-to" "cc" "body"))
4517 (insert (car (car other-headers)) ": " 4517 (insert (car (car other-headers)) ": "
4518 (cdr (car other-headers)) hard-newline)) 4518 (cdr (car other-headers))
4519 (if use-hard-newlines hard-newline "\n")))
4519 (setq other-headers (cdr other-headers))) 4520 (setq other-headers (cdr other-headers)))
4520 (when body 4521 (when body
4521 (forward-line 1) 4522 (forward-line 1)
4522 (insert body)) 4523 (insert body))
4523 t))) 4524 t)))