* src/w32proc.c (Fw32_get_locale_info): Decode long form of locale name.
* lisp/w32-fns.el (w32-list-locales): Revert part of 2008-10-17 change;
decoding of long locale info is now done in `w32-get-locale-info'.
(pmail-parse-file-inboxes): Function deleted.
(pmail-get-new-mail-1): Function merged into pmail-get-new-mail.
(pmail-get-new-mail-2): Renamed to pmail-get-new-mail-1.
(pmail-get-new-mail-filter-spam): Call rmail-spam-filter, not
pmail-spam-filter.
(pmail-convert-to-babyl-format): Function deleted.
(pmail-nuke-pinhead-header): Function deleted.
(pmail-reply): Parsing headers in mbox format. Call
rmail-dont-reply-to instead of pmail-dont-reply-to.
(pmail-parse-file-inboxes): Function deleted.
(pmail-get-new-mail-1): Function merged into pmail-get-new-mail.
(pmail-get-new-mail-2): Renamed to pmail-get-new-mail-1.
(pmail-get-new-mail-filter-spam): Call rmail-spam-filter, not
pmail-spam-filter.
(pmail-convert-to-babyl-format): Function deleted.
(pmail-nuke-pinhead-header): Function deleted.
(pmail-reply): Parsing headers in mbox format. Call
rmail-dont-reply-to instead of pmail-dont-reply-to.
(decode_options): Do not allow an empty alternate_editor on
WINDOWSNT.
(print_help_and_exit): Replace EMACS_DAEMON with WINDOWSNT.
(start_daemon_and_retry_set_socket): Likewise.
`allow-override' which says whether to use `mm-charset-override-alist'.
(rfc2047-decode-encoded-words): Use it.
* mm-util.el (mm-charset-override-alist): Fix custom type;
add `(gb2312 . gbk)' to choices.
Changes when EMACS_DAEMON is not defined:
(print_help_and_exit): Don't add daemon information to help.
(start_daemon_and_retry_set_socket): Make a no-op.
(main): Don't set `start_daemon_if_needed' (which is initialized to 0).
argument does for --alternate-editor.
* emacsclient.1: Describe what an empty string argument does for
--alternate-editor.
* emacsclient.c (print_help_and_exit): Describe what an empty
string argument does for --alternate-editor.
(set_socket): Make it possible to not exit in case of an error.
(start_daemon_and_retry_set_socket): New function.
(main): Use it. Restore the NULL value for socket_name and
server_file after the set_socket call.
buffer unmodified. (Bug#1509)
* epa-file.el (epa-file-insert-file-contents): Set buffer's
modification time if visiting a file and the content is
successfully decrypted.
