procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from trunk.

Browse source
This commit is contained in:
Paul Eggert 2011-07-16 18:33:46 -07:00
commit c2216f8e3a
4 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2011-07-17 Lars Magne Ingebrigtsen <larsi@gnus.org>
* mail/smtpmail.el (smtpmail-via-smtp): Query the user for
password if we get errors 550 to 554.
2011-07-16 Lars Magne Ingebrigtsen <larsi@gnus.org>
* net/gnutls.el (gnutls-log-level): Removed.

9
lisp/mail/smtpmail.el
View file

@ -788,10 +788,11 @@ The list is in preference order.")
nil)
((and auth-mechanisms
(not ask-for-password)
(= (car result) 550))
;; We got a "550 relay not permitted", and the server
;; accepts credentials, so we try again, but ask for a
;; password first.
(>= (car result) 550)
(<= (car result) 554))
;; We got a "550 relay not permitted" (or the like),
;; and the server accepts credentials, so we try
;; again, but ask for a password first.
(smtpmail-send-command process "QUIT")
(smtpmail-read-response process)
(delete-process process)

8
src/ChangeLog
View file

@ -197,6 +197,14 @@
Use EMACS_INT, not EMACS_UINT, for sizes. The code works equally
well either way, and we prefer signed to unsigned.
2011-07-17 Paul Eggert <eggert@cs.ucla.edu>
* fileio.c (Fcopy_file): Pacify gcc re fchown. (Bug#9002)
This works around a problem with the previous change to Fcopy_file.
Recent glibc declares fchown with __attribute__((warn_unused_result)),
and without this change, GCC might complain about discarding
fchown's return value.
2011-07-16 Juanma Barranquero <lekktu@gmail.com>
* makefile.w32-in (GLOBAL_SOURCES): Add gnutls.c (followup to bug#9059).

4
src/fileio.c
View file

@ -38,6 +38,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include <selinux/context.h>
#endif
#include <ignore-value.h>
#include "lisp.h"
#include "intervals.h"
#include "buffer.h"
@ -1960,7 +1962,7 @@ on the system, we copy the SELinux context of FILE to NEWNAME. */)
if (input_file_statable_p)
{
if (!NILP (preserve_uid_gid))
fchown (ofd, st.st_uid, st.st_gid);
ignore_value (fchown (ofd, st.st_uid, st.st_gid));
if (fchmod (ofd, st.st_mode & 07777) != 0)
report_file_error ("Doing chmod", Fcons (newname, Qnil));
}