diff options
| -rw-r--r-- | lisp/mail/sendmail.el | 13 | ||||
| -rw-r--r-- | src/eval.c | 8 | ||||
| -rw-r--r-- | src/indent.c | 11 |
3 files changed, 24 insertions, 8 deletions
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el index 709f4d880a..c22d7d85c0 100644 --- a/lisp/mail/sendmail.el +++ b/lisp/mail/sendmail.el @@ -1,5 +1,5 @@ ;; Mail sending commands for Emacs. -;; Copyright (C) 1985, 1986 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1986, 1992 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. @@ -173,6 +173,7 @@ C-c C-v mail-sent-via (add a sent-via field for each To or CC)." (define-key mail-mode-map "\C-c?" 'describe-mode) (define-key mail-mode-map "\C-c\C-f\C-t" 'mail-to) (define-key mail-mode-map "\C-c\C-f\C-b" 'mail-bcc) + (define-key mail-mode-map "\C-c\C-f\C-f" 'mail-fcc) (define-key mail-mode-map "\C-c\C-f\C-c" 'mail-cc) (define-key mail-mode-map "\C-c\C-f\C-s" 'mail-subject) (define-key mail-mode-map "\C-c\C-t" 'mail-text) @@ -436,11 +437,19 @@ the user from the mailer." (progn (mail-position-on-field "to") (insert "\nBCC: ")))) +(defun mail-fcc () + "Add a new FCC field, with file name completion." + (interactive) + (expand-abbrev) + (or (mail-position-on-field "fcc" t) ;Put new field after exiting FCC. + (mail-position-on-field "to")) + (insert "\nFCC: " (read-file-name "Folder carbon copy: "))) + (defun mail-position-on-field (field &optional soft) (let (end (case-fold-search t)) (goto-char (point-min)) - (search-forward (concat "\n" mail-header-separator "\n")) + (search-forward (concat "^" mail-header-separator "\n")) (setq end (match-beginning 0)) (goto-char (point-min)) (if (re-search-forward (concat "^" (regexp-quote field) ":") end t) diff --git a/src/eval.c b/src/eval.c index e82fba1559..a030ff8b70 100644 --- a/src/eval.c +++ b/src/eval.c @@ -1,5 +1,5 @@ /* Evaluator for GNU Emacs Lisp interpreter. - Copyright (C) 1985, 1986, 1987 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1987, 1992 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -1837,7 +1837,11 @@ Thus, (funcall 'cons 'x 'y) returns (x . y).") goto done; default: - error ("funcall: this number of args not handled."); + + /* If a subr takes more than 6 arguments without using MANY + or UNEVALLED, we need to extend this function to support it. + Until this is done, there is no way to call the function. */ + abort (); } } if (XTYPE (fun) == Lisp_Compiled) diff --git a/src/indent.c b/src/indent.c index f87ca13192..977383d3b4 100644 --- a/src/indent.c +++ b/src/indent.c @@ -1,5 +1,5 @@ /* Indentation functions. - Copyright (C) 1985, 1986, 1987, 1988 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1987, 1988, 1992 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -344,10 +344,13 @@ and if COLUMN is in the middle of a tab character, change it to spaces.") and scan through it again. */ if (!NILP (force) && col > goal && c == '\t' && prev_col < goal) { + int old_point; + del_range (point - 1, point); - Findent_to (make_number (col - 1)); - insert_char (' '); - goto retry; + Findent_to (make_number (goal), Qnil); + old_point = point; + Findent_to (make_number (col), Qnil); + SET_PT (old_point); } /* If line ends prematurely, add space to the end. */ |