diff options
| author | Glenn Morris | 2008-11-28 03:31:30 +0000 |
|---|---|---|
| committer | Glenn Morris | 2008-11-28 03:31:30 +0000 |
| commit | 08d55d13a771dba40cbecd1d75e60db98bed9a72 (patch) | |
| tree | 47118448544a967a25ffc7e2e9afbd411d7e988c | |
| parent | 32247e3db3669d8845a62abfe9436ec4e2284de0 (diff) | |
| download | emacs-08d55d13a771dba40cbecd1d75e60db98bed9a72.tar.gz emacs-08d55d13a771dba40cbecd1d75e60db98bed9a72.zip | |
(format-write-file): Improve previous doc fix.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/format.el | 12 |
2 files changed, 11 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 76de1401c9a..b85f3ffbc70 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2008-11-28 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * format.el (format-write-file): Improve previous doc fix. | ||
| 4 | |||
| 1 | 2008-11-27 Chong Yidong <cyd@stupidchicken.com> | 5 | 2008-11-27 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 6 | ||
| 3 | * simple.el (use-empty-active-region, use-region-p) | 7 | * simple.el (use-empty-active-region, use-region-p) |
diff --git a/lisp/format.el b/lisp/format.el index 8e114c83b5b..77ab5e952b0 100644 --- a/lisp/format.el +++ b/lisp/format.el | |||
| @@ -361,16 +361,18 @@ one of the formats defined in `format-alist', or a list of such symbols." | |||
| 361 | (defun format-write-file (filename format &optional confirm) | 361 | (defun format-write-file (filename format &optional confirm) |
| 362 | "Write current buffer into file FILENAME using some FORMAT. | 362 | "Write current buffer into file FILENAME using some FORMAT. |
| 363 | Make buffer visit that file and set the format as the default for future | 363 | Make buffer visit that file and set the format as the default for future |
| 364 | saves. If the buffer is already visiting a file, you can specify a directory | 364 | saves (see below). If the buffer is already visiting a file, you can |
| 365 | name as FILENAME, to write a file of the same old name in that directory. | 365 | specify a directory name as FILENAME, to write a file of the same old name |
| 366 | in that directory. | ||
| 366 | 367 | ||
| 367 | If optional third arg CONFIRM is non-nil, ask for confirmation before | 368 | If optional third arg CONFIRM is non-nil, ask for confirmation before |
| 368 | overwriting an existing file. Interactively, confirmation is required | 369 | overwriting an existing file. Interactively, confirmation is required |
| 369 | unless you supply a prefix argument. | 370 | unless you supply a prefix argument. |
| 370 | 371 | ||
| 371 | The buffer-local value of `buffer-file-format' is set to FORMAT, | 372 | This function sets the buffer-local value of `buffer-file-format' |
| 372 | and any original elements (except those with a non-nil `preserve' flag; | 373 | to FORMAT, then appends any elements from the previous value with |
| 373 | see the documentation of `format-alist') are replaced." | 374 | a non-nil `preserve' flag (see the documentation of `format-alist'), |
| 375 | if they are not already present in the new value." | ||
| 374 | (interactive | 376 | (interactive |
| 375 | ;; Same interactive spec as write-file, plus format question. | 377 | ;; Same interactive spec as write-file, plus format question. |
| 376 | (let* ((file (if buffer-file-name | 378 | (let* ((file (if buffer-file-name |