conflict resolve

6 files changed, 126 insertions, 16 deletions

diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index da8dec5a0f6..c11c3c3b489 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -9,7 +9,6 @@ documented in config.in, and this file would not be necessary.
 
 AIX
 _AIX
-BSD_SYSTEM
 CYGWIN          Compiling the Cygwin port.
 __CYGWIN__      Ditto
 GNU_LINUX
@@ -149,7 +148,6 @@ HAVE_FORK
 HAVE_FREEIFADDRS
 HAVE_FREETYPE
 HAVE_FSEEKO
-HAVE_FSYNC
 HAVE_FUTIMENS
 HAVE_FUTIMES
 HAVE_FUTIMESAT
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 2d09a749907..fcc339c17cd 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,24 @@
+2013-03-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+        File synchronization fixes (Bug#13944).
+        * CPP-DEFINES (BSD_SYSTEM, HAVE_FSYNC): Remove.
+        * merge-gnulib (GNULIB_MODULES): Add fsync, fdatasync.
+
+2013-03-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * notes/unicode: Improve notes about Emacs source file encoding.
+
+2013-03-11  Glenn Morris  <rgm@gnu.org>
+
+        * admin.el (make-manuals): Add emacs-lisp-intro and some more
+        doc/misc manuals.
+        (manual-html-mono, manual-html-node, manual-txt):
+        Pass -I to makeinfo.
+
+2013-03-10  Glenn Morris  <rgm@gnu.org>
+
+        * admin.el (add-release-logs): Use UTC for release date.
+
 2013-03-09  Glenn Morris  <rgm@gnu.org>
 
         * admin.el (add-release-logs): Provide interactive defaults.
diff --git a/admin/admin.el b/admin/admin.el
index fd9bde29f46..8b6bb472b7d 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -42,12 +42,14 @@ Optional argument DATE is the release date, default today."
                                           emacs-minor-version))
                      (read-string "Release date: "
                                   (progn (require 'add-log)
-                                         (funcall add-log-time-format)))))
+                                         (let ((add-log-time-zone-rule t))
+                                           (funcall add-log-time-format))))))
   (setq root (expand-file-name root))
   (unless (file-exists-p (expand-file-name "src/emacs.c" root))
     (error "%s doesn't seem to be the root of an Emacs source tree" root))
   (require 'add-log)
-  (or date (setq date (funcall add-log-time-format)))
+  (or date (setq date (let ((add-log-time-zone-rule t))
+                        (funcall add-log-time-format))))
   (let* ((logs (process-lines "find" root "-name" "ChangeLog"))
          (entry (format "%s  %s  <%s>\n\n\t* Version %s released.\n\n"
                         date
@@ -226,17 +228,33 @@ Root must be the root of an Emacs source tree."
       (manual-pdf texi (expand-file-name "elisp.pdf" dest))
       (manual-dvi texi (expand-file-name "elisp.dvi" dvi-dir)
                   (expand-file-name "elisp.ps" ps-dir)))
+    (let ((texi (expand-file-name "doc/lispintro/emacs-lisp-intro.texi" root))
+          (dest (expand-file-name "emacs-lisp-intro" dest))
+          dest2 dest3)
+      ;; Mimic the atypical directory layout used for emacs-lisp-intro.
+      (make-directory dest)
+      (make-directory (setq dest2 (expand-file-name "html_node" dest)))
+      (manual-html-node texi dest2)
+      (make-directory (setq dest2 (expand-file-name "html_mono" dest)))
+      (manual-html-mono texi (expand-file-name "emacs-lisp-intro.html" dest2))
+      (make-directory (setq dest2 (expand-file-name "txt" dest)))
+      (manual-txt texi (expand-file-name "emacs-lisp-intro.txt" dest2))
+      (manual-pdf texi (expand-file-name "emacs-lisp-intro.pdf" dest))
+      (make-directory (setq dest2 (expand-file-name "dvi" dest)))
+      (make-directory (setq dest3 (expand-file-name "ps" dest)))
+      (manual-dvi texi (expand-file-name "emacs-lisp-intro.dvi" dest2)
+                  (expand-file-name "emacs-lisp-intro.ps" dest3)))
     ;; Misc manuals
-    (let ((manuals '("ada-mode" "auth" "autotype" "calc" "cc-mode"
+    (let ((manuals '("ada-mode" "auth" "autotype" "bovine" "calc" "cc-mode"
                      "cl" "dbus" "dired-x" "ebrowse" "ede" "ediff"
-                     "edt" "eieio" "emacs-mime" "epa" "erc" "ert"
+                     "edt" "eieio" "emacs-gnutls" "emacs-mime" "epa" "erc" "ert"
                      "eshell" "eudc" "faq" "flymake" "forms"
-                     "gnus" "emacs-gnutls" "idlwave" "info"
+                     "gnus" "htmlfontify" "idlwave" "info"
                      "mairix-el" "message" "mh-e" "newsticker"
                      "nxml-mode" "org" "pcl-cvs" "pgg" "rcirc"
-                     "remember" "reftex" "sasl" "sc" "semantic"
-                     "ses" "sieve" "smtpmail" "speedbar" "tramp"
-                     "url" "vip" "viper" "widget" "woman")))
+                     "reftex" "remember" "sasl" "sc" "semantic"
+                     "ses" "sieve" "smtpmail" "speedbar" "srecode" "tramp"
+                     "url" "vip" "viper" "widget" "wisent" "woman")))
       (dolist (manual manuals)
         (manual-misc-html manual root html-node-dir html-mono-dir)))
     (message "Manuals created in %s" dest)))
@@ -267,6 +285,10 @@ This function also edits the HTML files so that they validate as
 HTML 4.01 Transitional, and pulls in the gnu.org stylesheet using
 the @import directive."
   (call-process "makeinfo" nil nil nil
+                "-I" (expand-file-name "../emacs"
+                                       (file-name-directory texi-file))
+                "-I" (expand-file-name "../misc"
+                                       (file-name-directory texi-file))
                 "--html" "--no-split" texi-file "-o" dest)
   (with-temp-buffer
     (insert-file-contents dest)
@@ -288,6 +310,10 @@ the @import directive."
   (unless (file-exists-p texi-file)
     (error "Manual file %s not found" texi-file))
   (call-process "makeinfo" nil nil nil
+                "-I" (expand-file-name "../emacs"
+                                       (file-name-directory texi-file))
+                "-I" (expand-file-name "../misc"
+                                       (file-name-directory texi-file))
                 "--html" texi-file "-o" dir)
   ;; Loop through the node files, fixing them up.
   (dolist (f (directory-files dir nil "\\.html\\'"))
@@ -319,6 +345,10 @@ the @import directive."
 (defun manual-txt (texi-file dest)
   "Run Makeinfo on TEXI-FILE, emitting plaintext output to DEST."
   (call-process "makeinfo" nil nil nil
+                "-I" (expand-file-name "../emacs"
+                                       (file-name-directory texi-file))
+                "-I" (expand-file-name "../misc"
+                                       (file-name-directory texi-file))
                 "--plaintext" "--no-split" texi-file "-o" dest)
   (shell-command (concat "gzip -c " dest " > " (concat dest ".gz"))))
 
diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt
index cfae61e092f..005c6694228 100644
--- a/admin/make-tarball.txt
+++ b/admin/make-tarball.txt
@@ -50,6 +50,14 @@ General steps (for each step, check for possible errors):
     For a pretest, start at version .90.  After .99, use .990 (so that
     it sorts).
 
+    The final pretest should be a release candidate.  Set the version
+    number to that of the actual release.  Pick a date about a week
+    from now when you intend to make the release.  Use M-x add-release-logs
+    to add the ChangeLog entries for that date to the tar file (but
+    not yet to the repository).  Name the tar file as
+    emacs-XX.Y-rc1.tar.  If all goes well in the following week, you
+    can simply rename the file and use it for the actual release.
+
 5.   autoreconf -i -I m4 --force
      make bootstrap
 
diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index b43f2bd9bb8..100749191f0 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -29,7 +29,8 @@ GNULIB_MODULES='
   alloca-opt c-ctype c-strcase
   careadlinkat close-stream crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512
   dtoastr dtotimespec dup2 environ execinfo faccessat
-  fcntl-h fdopendir filemode fstatat getloadavg getopt-gnu gettime gettimeofday
+  fcntl-h fdatasync fdopendir filemode fstatat fsync
+  getloadavg getopt-gnu gettime gettimeofday
   ignore-value intprops largefile lstat
   manywarnings memrchr mktime
   pselect pthread_sigmask putenv readlink readlinkat
diff --git a/admin/notes/unicode b/admin/notes/unicode
index 0654036d364..7b5e21c864b 100644
--- a/admin/notes/unicode
+++ b/admin/notes/unicode
@@ -104,12 +104,15 @@ Source file encoding
 
 Most Emacs source files are encoded in UTF-8 (or in ASCII, which is a
 subset), but there are a few exceptions, listed below.  Perhaps
-someday these files will be converted to UTF-8, for convenience when
-using tools like 'grep -r', but this might need nontrivial changes to
-the build process.
+someday many of these files will be converted to UTF-8, for
+convenience when using tools like 'grep -r', but this might need
+nontrivial changes to the build process.
 
  * chinese-big5
 
+     These are verbatim copies of files taken from external sources.
+     They haven't been converted to UTF-8.
+
         leim/CXTERM-DIC/4Corner.tit
         leim/CXTERM-DIC/ARRAY30.tit
         leim/CXTERM-DIC/ECDICT.tit
@@ -123,6 +126,9 @@ the build process.
 
  * chinese-iso-8bit
 
+     These are verbatim copies of files taken from external sources.
+     They haven't been converted to UTF-8.
+
         leim/CXTERM-DIC/CCDOSPY.tit
         leim/CXTERM-DIC/Punct.tit
         leim/CXTERM-DIC/QJ.tit
@@ -132,28 +138,74 @@ the build process.
         leim/MISC-DIC/CTLau.html
         leim/MISC-DIC/ziranma.cin
 
+ * cp850
+
+     This file contains non-ASCII characters in unibyte strings.  When
+     editing a keyboard layout it's more convenient to see 'é' than
+     '\202', and the MS-DOS compiler requires the single byte if a
+     backslash escape is not being used.
+
+        src/msdos.c
+
+ * iso-2022-cn-ext
+
+     This file is externally generated from leim/MISC-DIC/cangjie-table.b5
+     by Big5->CNS converter.  It hasn't been converted to UTF-8.
+
+        leim/MISC-DIC/cangjie-table.cns
+
  * iso-latin-2
 
+     These files are processed by csplain, a program that requires
+     Latin-2 input.  In 2012 the csplain maintainers started
+     recommending UTF-8, but these files haven't been converted yet.
+
+        etc/refcards/cs-dired-ref.tex
         etc/refcards/cs-refcard.tex
-        etc/refcards/sk-survival.tex
         etc/refcards/cs-survival.tex
-        etc/refcards/cs-dired-ref.tex
         etc/refcards/sk-dired-ref.tex
         etc/refcards/sk-refcard.tex
+        etc/refcards/sk-survival.tex
 
  * japanese-iso-8bit
 
+     SKK-JISYO.L is a verbatim copy of a file taken from an external source.
+     ja-dic.el is generated automatically by skkdic-convert; this process
+     hasn't been converted to use UTF-8.
+
         leim/SKK-DIC/SKK-JISYO.L
         leim/ja-dic/ja-dic.el
 
  * japanese-shift-jis
 
+     This is a verbatim copy of a file taken from an external source.
+     It hasn't been converted to UTF-8.
+
         admin/charsets/mapfiles/cns2ucsdkw.txt
 
  * no-conversion
 
+     This file purposely contains arbitrary bytes interspersed within text,
+     to test whether the Emacs distribution is corrupted.
+
         lib-src/testfile
 
+ * iso-2022-7bit
+
+     This file contains significant charset information, which is not
+     encoded in UTF-8.
+
+        etc/HELLO
+
+     These files contain characters that cannot be encoded in UTF-8.
+
+        leim/quail/tibetan.el
+        leim/quail/ethiopic.el
+        lisp/international/titdic-cnv.el
+        lisp/language/tibetan.el
+        lisp/language/tibet-util.el
+        lisp/language/ind-util.el
+
 
 This file is part of GNU Emacs.