conflict resolve

4 files changed, 60 insertions, 11 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index fcc339c17cd..8b71b065056 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,18 @@
+2013-03-18  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * notes/unicode: Mention some more iso-2022-7bit files (Bug#13936).
+
+        Automate the build of ja-dic.el (Bug#13984).
+        * notes/unicode: ja-dic.el is now UTF-8.
+
+2013-03-16  Glenn Morris  <rgm@gnu.org>
+
+        * admin.el (manual-pdf, manual-dvi): Pass -I to texi2pdf, texi2dvi.
+
+2013-03-16  Glenn Morris  <rgm@gnu.org>
+
+        * admin.el (manual-html-mono, manual-html-node): Add -DWWW_GNU_ORG.
+
 2013-03-13  Paul Eggert  <eggert@cs.ucla.edu>
 
         File synchronization fixes (Bug#13944).
diff --git a/admin/admin.el b/admin/admin.el
index 8b6bb472b7d..cb7eaead27f 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -285,6 +285,7 @@ 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
+                "-D" "WWW_GNU_ORG"
                 "-I" (expand-file-name "../emacs"
                                        (file-name-directory texi-file))
                 "-I" (expand-file-name "../misc"
@@ -310,6 +311,7 @@ the @import directive."
   (unless (file-exists-p texi-file)
     (error "Manual file %s not found" texi-file))
   (call-process "makeinfo" nil nil nil
+                "-D" "WWW_GNU_ORG"
                 "-I" (expand-file-name "../emacs"
                                        (file-name-directory texi-file))
                 "-I" (expand-file-name "../misc"
@@ -354,12 +356,22 @@ the @import directive."
 
 (defun manual-pdf (texi-file dest)
   "Run texi2pdf on TEXI-FILE, emitting plaintext output to DEST."
-  (call-process "texi2pdf" nil nil nil texi-file "-o" dest))
+  (call-process "texi2pdf" nil nil nil
+                "-I" (expand-file-name "../emacs"
+                                       (file-name-directory texi-file))
+                "-I" (expand-file-name "../misc"
+                                       (file-name-directory texi-file))
+                texi-file "-o" dest))
 
 (defun manual-dvi (texi-file dest ps-dest)
   "Run texi2dvi on TEXI-FILE, emitting dvi output to DEST.
 Also generate PostScript output in PS-DEST."
-  (call-process "texi2dvi" nil nil nil texi-file "-o" dest)
+  (call-process "texi2dvi" nil nil nil
+                "-I" (expand-file-name "../emacs"
+                                       (file-name-directory texi-file))
+                "-I" (expand-file-name "../misc"
+                                       (file-name-directory texi-file))
+                texi-file "-o" dest)
   (call-process "dvips" nil nil nil dest "-o" ps-dest)
   (call-process "gzip" nil nil nil dest)
   (call-process "gzip" nil nil nil ps-dest))
diff --git a/admin/bzrmerge.el b/admin/bzrmerge.el
index 4fa328b9d6d..42d39d3071a 100644
--- a/admin/bzrmerge.el
+++ b/admin/bzrmerge.el
@@ -50,7 +50,7 @@ The list returned is sorted by oldest-first."
     (call-process "bzr" nil t nil "status" "-v")
     (goto-char (point-min))
     (when (re-search-forward "^conflicts:\n" nil t)
-      (error "You still have unresolved conflicts"))
+      (user-error "You still have unresolved conflicts"))
     (let ((merges ())
           found)
       (if (not (re-search-forward "^pending merges:\n" nil t))
@@ -62,7 +62,7 @@ The list returned is sorted by oldest-first."
                            (setq found
                                  (not (equal "unknown" (match-string 1)))))))
                   found)
-            (error "You still have uncommitted changes"))
+            (user-error "You still have uncommitted changes"))
         ;; This is really stupid, but it seems there's no easy way to figure
         ;; out which revisions have been merged already.  The only info I can
         ;; find is the "pending merges" from "bzr status -v", which is not
@@ -171,7 +171,7 @@ Type `y' to skip this revision,
                                  (enable-local-eval nil))
                              (find-file-noselect file))
         (if (buffer-modified-p)
-            (error "Unsaved changes in %s" (current-buffer)))
+            (user-error "Unsaved changes in %s" (current-buffer)))
         (save-excursion
           (cond
            ((derived-mode-p 'change-log-mode)
@@ -323,7 +323,7 @@ Does not make other difference."
 BEWARE!  Important metadata is kept in this Emacs session!
 Do not commit without re-running `M-x bzrmerge' first!"
                                    :warning bzrmerge-warning-buffer))
-              (error "Resolve conflicts manually")))))
+              (user-error "Resolve conflicts manually")))))
         (cons merge skip)))))
 
 (defun bzrmerge (from)
diff --git a/admin/notes/unicode b/admin/notes/unicode
index 7b5e21c864b..53d568dd628 100644
--- a/admin/notes/unicode
+++ b/admin/notes/unicode
@@ -170,11 +170,9 @@ nontrivial changes to the build process.
  * 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.
+     It hasn't been converted to UTF-8.
 
         leim/SKK-DIC/SKK-JISYO.L
-        leim/ja-dic/ja-dic.el
 
  * japanese-shift-jis
 
@@ -192,11 +190,35 @@ nontrivial changes to the build process.
 
  * iso-2022-7bit
 
-     This file contains significant charset information, which is not
-     encoded in UTF-8.
+     This file switches between CJK charsets, which is not encoded in UTF-8.
 
         etc/HELLO
 
+     Each of these files contains just one CJK charset, but Emacs
+     currently has no easy way to specify set-charset-priority on a
+     per-file basis, so converting any of these files to UTF-8 might
+     change the file's appearance when viewed by an Emacs that is
+     operating in some other language environment.
+
+        etc/tutorials/TUTORIAL.ja
+        etc/tutorials/TUTORIAL.ko
+        leim/quail/cyril-jis.el
+        leim/quail/hanja-jis.el
+        leim/quail/hanja.el
+        leim/quail/hanja3.el
+        leim/quail/japanese.el
+        leim/quail/py-punct.el
+        leim/quail/pypunct-b5.el
+        leim/quail/symbol-ksc.el
+        lisp/international/ja-dic-cnv.el
+        lisp/international/ja-dic-utl.el
+        lisp/international/kinsoku.el
+        lisp/international/kkc.el
+        lisp/international/titdic-cnv.el
+        lisp/language/japan-util.el
+        lisp/language/japanese.el
+        lisp/term/x-win.el
+
      These files contain characters that cannot be encoded in UTF-8.
 
         leim/quail/tibetan.el