From: Glenn Morris <rgm@gnu.org>
Date: Fri, 10 Aug 2012 07:07:07 +0000 (-0700)
Subject: Comments
X-Git-Tag: emacs-24.2.90~745
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0aa8781fc089f32f11bf28a6f0130678618d82ac;p=emacs.git

Comments
---

diff --git a/configure.ac b/configure.ac
index 54ce94fef7a..408413f2c07 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2709,9 +2709,6 @@ case "$opsys" in
     ;;
 esac
 
-dnl FIXME?  If using FLOCK, also define MAIL_USE_SYSTEM_LOCK?
-dnl Only win32 seems to use that.
-dnl See comments in lib-src/movemail.c.
 BLESSMAIL_TARGET=
 case "$mail_lock" in
   flock) AC_DEFINE(MAIL_USE_FLOCK, 1, [Define if the mailer uses flock to interlock the mail spool.]) ;;
diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index 3ea4f4521c1..32d32e69abf 100644
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -22,7 +22,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Important notice: defining MAIL_USE_FLOCK or MAIL_USE_LOCKF *will
    cause loss of mail* if you do it on a system that does not normally
-   use flock as its way of interlocking access to inbox files.  The
+   use flock/lockf as its way of interlocking access to inbox files.  The
    setting of MAIL_USE_FLOCK and MAIL_USE_LOCKF *must agree* with the
    system's own conventions.  It is not a choice that is up to you.
 
@@ -109,6 +109,11 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <sys/locking.h>
 #endif
 
+/* If your system uses the `flock' or `lockf' system call for mail locking,
+   define MAIL_USE_SYSTEM_LOCK.  If your system type should always define
+   MAIL_USE_LOCKF or MAIL_USE_FLOCK but configure does not do this,
+   please make a bug report.  */
+
 #ifdef MAIL_USE_LOCKF
 #define MAIL_USE_SYSTEM_LOCK
 #endif
@@ -289,13 +294,7 @@ main (int argc, char **argv)
 	 so it can create lock files properly.
 
 	 You might also wish to verify that your system is one which
-	 uses lock files for this purpose.  Some systems use other methods.
-
-	 If your system uses the `flock' system call for mail locking,
-	 define MAIL_USE_SYSTEM_LOCK in config.h and recompile movemail.
-	 If your system type should always define MAIL_USE_SYSTEM_LOCK
-	 but does not, send a bug report to bug-gnu-emacs@gnu.org so we
-	 can change the default in configure.  */
+	 uses lock files for this purpose.  Some systems use other methods.  */
 
       inname_len = strlen (inname);
       lockname = xmalloc (inname_len + sizeof ".lock");