Merge changes from emacs-24 branch

[gnu-emacs] / src / fileio.c

diff --git a/src/fileio.c b/src/fileio.c
index 0d1a87b65b7ddf4def723d18241809435be0ca29..69b2c9cb0f21e69d9e8ef598663062fff63c63c0 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -5613,7 +5613,7 @@ syms_of_fileio (void)
   DEFSYM (Qexcl, "excl");
 
   DEFVAR_LISP ("file-name-coding-system", Vfile_name_coding_system,
-              doc: /* *Coding system for encoding file names.
+              doc: /* Coding system for encoding file names.
 If it is nil, `default-file-name-coding-system' (which see) is used.  */);
   Vfile_name_coding_system = Qnil;
 
@@ -5767,7 +5767,7 @@ file is usually more useful if it contains the deleted text.  */);
 
 #ifdef HAVE_FSYNC
   DEFVAR_BOOL ("write-region-inhibit-fsync", write_region_inhibit_fsync,
-              doc: /* *Non-nil means don't call fsync in `write-region'.
+              doc: /* Non-nil means don't call fsync in `write-region'.
 This variable affects calls to `write-region' as well as save commands.
 A non-nil value may result in data loss!  */);
   write_region_inhibit_fsync = 0;