diff options
| author | Paul Eggert | 2011-02-12 12:00:35 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-02-12 12:00:35 -0800 |
| commit | 583dab51b0c1962c10d5b8baf9da7af7921e8775 (patch) | |
| tree | 69e6178b399ecfaed2e3b757e2d68e96b7b0334d /etc | |
| parent | 64640ce2d31c153698c501e9385e3d5397181de9 (diff) | |
| parent | 470d996db4b850a0c4676e03de805e53703b80e0 (diff) | |
| download | emacs-583dab51b0c1962c10d5b8baf9da7af7921e8775.tar.gz emacs-583dab51b0c1962c10d5b8baf9da7af7921e8775.zip | |
Merge from mainline.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/NEWS | 5 |
1 files changed, 5 insertions, 0 deletions
| @@ -633,6 +633,11 @@ Notifications API. It requires D-Bus for communication. | |||
| 633 | 633 | ||
| 634 | * Incompatible Lisp Changes in Emacs 24.1 | 634 | * Incompatible Lisp Changes in Emacs 24.1 |
| 635 | 635 | ||
| 636 | ** `copy-directory' now copies the source directory as a subdirectory | ||
| 637 | of the target directory, if the latter is an existing directory. The | ||
| 638 | new optional arg COPY-CONTENTS, if non-nil, makes the function copy | ||
| 639 | the contents directly into a pre-existing target directory. | ||
| 640 | |||
| 636 | ** `compose-mail' now accepts an optional 8th arg, RETURN-ACTION, and | 641 | ** `compose-mail' now accepts an optional 8th arg, RETURN-ACTION, and |
| 637 | passes it to the mail user agent function. This argument specifies an | 642 | passes it to the mail user agent function. This argument specifies an |
| 638 | action for returning to the caller after finishing with the mail. | 643 | action for returning to the caller after finishing with the mail. |