merge from trunk; clean up some issues

8 files changed, 291 insertions, 172 deletions

diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index c11c3c3b489..a89d1764f7b 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -377,7 +377,6 @@ HAVE_WS2TCPIP_H
 HAVE_XAW3D
 HAVE_XFT
 HAVE_XIM
-HAVE_XKBGETKEYBOARD
 HAVE_XPM
 HAVE_XRMSETDATABASE
 HAVE_XSCREENNUMBEROFSCREEN
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 25ce7c0f9e4..ac6031fa205 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,76 @@
+2013-06-02  Eric Ludlam <zappo@gnu.org>
+
+        * grammars/srecode-template.wy (variable): Accept a single number
+        as a variable value.  Allows the 'priority' to be set to a number.
+        (wisent-srecode-template-lexer): Move number up so it can be
+        created.
+
+2013-05-16  Glenn Morris  <rgm@gnu.org>
+
+        * cus-test.el (cus-test-cus-load-groups): New function.
+        (cus-test-get-options): Add option to return groups.
+        (cus-test-noloads): Also check custom groups.
+
+2013-05-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * quick-install-emacs: Don't prune DOC-* files a any more.
+
+2013-05-14  Glenn Morris  <rgm@gnu.org>
+
+        * cus-test.el (cus-test-get-lisp-files): Ignore obsolete/.
+        (cus-test-libs): Fix let-binding of default-directory.
+        (cus-test-noloads): Load all libs for the comparison.
+
+2013-05-11  Glenn Morris  <rgm@gnu.org>
+
+        * cus-test.el (cus-test-libs-noloads): Add a few more files.
+        (cus-test-load-libs, cus-test-opts):
+        Add option to load more/all Lisp files.
+        (cus-test-get-lisp-files): Ignore .*.el files.
+
+2013-05-10  Glenn Morris  <rgm@gnu.org>
+
+        * cus-test.el (cus-test-libs-noloads): Add some files.
+        (cus-test-get-lisp-files): New function.
+        (cus-test-libs): Add option to load more/all Lisp files.
+
+2013-05-09  Glenn Morris  <rgm@gnu.org>
+
+        * cus-test.el: No need to provide bbdb, bbdb-com any more.
+        (cus-test-libs-noloads): Add dunnet in the defvar.
+        (dunnet): Don't always load it.
+        (viper-mode): Only set if interactive.
+        (cus-test-load-custom-loads): Load dunnet if necessary.
+        (cus-test-load-1): New macro, with common code from cus-test-load-libs
+        and cus-test-libs.
+        (cus-test-load-libs, cus-test-libs): Use cus-test-load-1 macro.
+        Update for cus-test-get-autoload-deps changed result.
+        (cus-test-get-autoload-deps): Simplify.  Return file names as they
+        appear in loaddefs.el (directory parts are needed now that not all
+        lisp subdirs are in load-path).
+        (cus-test-deps): Explicitly skip dunnet.
+
+2013-05-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Use Gnulib ACL implementation, for benefit of Solaris etc. (Bug#14295)
+        * merge-gnulib (GNULIB_MODULES): Add qacl.
+        (GNULIB_TOOL_FLAGS): Do not avoid errno.
+
+2013-04-01  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Use UTF-8 for most files with non-ASCII characters (Bug#13936).
+        * notes/unicode (etc/tutorials/TUTORIAL.ko, leim/quail/hanja.el)
+        (leim/quail/hanja3.el, leim/quail/symbol-ksc.el):
+        Now utf-8, not iso-2022-7bit.  Also, files that contain non-UTF-8
+        characters are now encoded in utf-8-emacs, not iso-2022-7bit.
+
+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.
diff --git a/admin/cus-test.el b/admin/cus-test.el
index c93a14297f8..6b8ec9abe02 100644
--- a/admin/cus-test.el
+++ b/admin/cus-test.el
@@ -30,11 +30,11 @@
 ;;
 ;; The basic tests can be run in batch mode.  Invoke them with
 ;;
-;;   src/emacs -batch -l admin/cus-test.el -f cus-test-opts
+;;   src/emacs -batch -l admin/cus-test.el -f cus-test-opts [all]
 ;;
 ;;   src/emacs -batch -l admin/cus-test.el -f cus-test-deps
 ;;
-;;   src/emacs -batch -l admin/cus-test.el -f cus-test-libs
+;;   src/emacs -batch -l admin/cus-test.el -f cus-test-libs [all]
 ;;
 ;;   src/emacs -batch -l admin/cus-test.el -f cus-test-noloads
 ;;
@@ -87,43 +87,6 @@
 ;; The command `cus-test-noloads' returns a list of variables which
 ;; are somewhere declared as custom options, but not loaded by
 ;; `custom-load-symbol'.
-;;
-;; Some results from October 2002:
-;;
-;; 4523 options tested
-;; The following variables might have problems:
-;; ps-mule-font-info-database-default
-;; grep-tree-command
-;; grep-find-command
-;;
-;; 288 features required
-;; 10 files loaded
-;; The following load problems appeared:
-;; (killing x-win (file-error Cannot open load file x-win))
-;; Symbol faces has loaddefs as custom dependency
-;; (reftex-index-support reftex-vars (void-function reftex-set-dirty))
-;; (eshell-script em-script (void-variable eshell-directory-name))
-;; (pcomplete em-cmpl (void-function eshell-under-windows-p))
-;; (eshell-ext esh-ext (void-function eshell-under-windows-p))
-;; ...
-;;
-;; 422 libraries had no load errors
-;; The following load problems appeared:
-;; (eudc-export error 255)
-;; (ada-xref error 255)
-;; (ada-stmt error 255)
-;;
-;; The following options were not loaded by custom-load-symbol:
-;; edt-bottom-scroll-margin
-;; edt-keep-current-page-delimiter
-;; edt-top-scroll-margin
-;; edt-use-EDT-control-key-bindings
-;; edt-word-entities
-;; grep-find-use-xargs
-;; master-mode-hook
-;; outline-level
-;; outline-minor-mode-hook
-;; refill-mode-hook
 
 
 ;;; Code:
@@ -136,24 +99,23 @@
 (defvar cus-test-skip-list nil
   "List of variables to disregard by `cus-test-apropos'.")
 
-(defvar cus-test-libs-noloads nil
-  "List of libraries not to load by `cus-test-load-libs'.")
-
-;; The file eudc-export.el loads libraries "bbdb" and "bbdb-com" which
-;; are not part of GNU Emacs:  (locate-library "bbdb") => nil
-;; We avoid the resulting errors from loading eudc-export.el:
-(provide 'bbdb)
-(provide 'bbdb-com)
+(defvar cus-test-libs-noloads
+  ;; Loading dunnet in batch mode leads to a Dead end.
+  ;; blessmail writes a file.
+  ;; characters cannot be loaded twice ("Category `a' is already defined").
+  '("play/dunnet.el" "emulation/edt-mapper.el"
+    "loadup.el" "mail/blessmail.el" "international/characters.el"
+    "cedet/ede/loaddefs.el" "cedet/semantic/loaddefs.el"
+    "net/tramp-loaddefs.el")
+  "List of files not to load by `cus-test-load-libs'.
+Names should be as they appear in loaddefs.el.")
 
 ;; This avoids a hang of `cus-test-apropos' in 21.2.
 ;; (add-to-list 'cus-test-skip-list 'sh-alias-alist)
 
-;; Loading dunnet in batch mode leads to a Dead end.
-(let (noninteractive) (load "dunnet"))
-(add-to-list 'cus-test-libs-noloads "dunnet")
-
-;; Never Viperize.
-(setq viper-mode nil)
+(or noninteractive
+    ;; Never Viperize.
+    (setq viper-mode nil))
 
 ;; Don't create a file `save-place-file'.
 (eval-after-load "saveplace"
@@ -270,17 +232,38 @@ The detected problematic options are stored in `cus-test-errors'."
            (length cus-test-tested-variables))
   (cus-test-errors-display))
 
-(defun cus-test-get-options (regexp)
-  "Return a list of custom options matching REGEXP."
-  (let (found)
+(defun cus-test-cus-load-groups (&optional cus-load)
+  "Return a list of current custom groups.
+If CUS-LOAD is non-nil, include groups from cus-load.el."
+  (append (mapcar 'cdr custom-current-group-alist)
+          (if cus-load
+              (with-temp-buffer
+                (insert-file-contents (locate-library "cus-load.el"))
+                (search-forward "(put '")
+                (beginning-of-line)
+                (let (res)
+                  (while (and (looking-at "^(put '\\(\\S-+\\)")
+                              (zerop (forward-line 1)))
+                    (push (intern (match-string 1)) res))
+                  res)))))
+
+(defun cus-test-get-options (regexp &optional group)
+  "Return a list of custom options matching REGEXP.
+If GROUP is non-nil, return groups rather than options.
+If GROUP is `cus-load', include groups listed in cus-loads as well as
+currently defined groups."
+  (let ((groups (if group (cus-test-cus-load-groups (eq group 'cus-load))))
+        found)
     (mapatoms
      (lambda (symbol)
        (and
-        (or
-         ;; (user-variable-p symbol)
-         (get symbol 'standard-value)
-         ;; (get symbol 'saved-value)
-         (get symbol 'custom-type))
+        (if group
+            (memq symbol groups)
+          (or
+           ;; (user-variable-p symbol)
+           (get symbol 'standard-value)
+           ;; (get symbol 'saved-value)
+           (get symbol 'custom-type)))
         (string-match regexp (symbol-name symbol))
         (not (member symbol cus-test-skip-list))
         (push symbol found))))
@@ -302,49 +285,71 @@ The detected problematic options are stored in `cus-test-errors'."
 (defun cus-test-load-custom-loads ()
   "Call `custom-load-symbol' on all atoms."
   (interactive)
+  (if noninteractive (let (noninteractive) (require 'dunnet)))
   (mapatoms 'custom-load-symbol)
   (run-hooks 'cus-test-after-load-libs-hook))
 
-(defun cus-test-load-libs ()
+(defmacro cus-test-load-1 (&rest body)
+  `(progn
+     (setq cus-test-libs-errors nil
+           cus-test-libs-loaded nil)
+     ,@body
+     (message "%s libraries loaded successfully"
+              (length cus-test-libs-loaded))
+     (if (not cus-test-libs-errors)
+         (message "No load problems encountered")
+       (message "The following load problems appeared:")
+       (cus-test-message cus-test-libs-errors))
+     (run-hooks 'cus-test-after-load-libs-hook)))
+
+;; This is just cus-test-libs, but loading in the current Emacs process.
+(defun cus-test-load-libs (&optional more)
   "Load the libraries with autoloads.
-Don't load libraries in `cus-test-libs-noloads'."
+Don't load libraries in `cus-test-libs-noloads'.
+If optional argument MORE is \"defcustom\", load all files with defcustoms.
+If it is \"all\", load all Lisp files."
   (interactive)
-  (setq cus-test-libs-errors nil)
-  (setq cus-test-libs-loaded nil)
-  (mapc
-   (lambda (file)
-     (condition-case alpha
-         (unless (member file cus-test-libs-noloads)
-           (load file)
-           (push file cus-test-libs-loaded))
-       (error
-        (push (cons file alpha) cus-test-libs-errors)
-        (message "Error for %s: %s" file alpha))))
-   (cus-test-get-autoload-deps))
-  (message "%s libraries loaded successfully"
-           (length cus-test-libs-loaded))
-  (if (not cus-test-libs-errors)
-      (message "No load problems encountered")
-    (message "The following load problems appeared:")
-    (cus-test-message cus-test-libs-errors))
-  (run-hooks 'cus-test-after-load-libs-hook))
+  (cus-test-load-1
+   (let ((lispdir (file-name-directory (locate-library "loaddefs"))))
+     (mapc
+      (lambda (file)
+        (condition-case alpha
+            (unless (member file cus-test-libs-noloads)
+              (load (file-name-sans-extension (expand-file-name file lispdir)))
+              (push file cus-test-libs-loaded))
+          (error
+           (push (cons file alpha) cus-test-libs-errors)
+           (message "Error for %s: %s" file alpha))))
+      (if more
+          (cus-test-get-lisp-files (equal more "all"))
+        (cus-test-get-autoload-deps))))))
 
 (defun cus-test-get-autoload-deps ()
-  "Return the list of libraries with autoloads."
+  "Return the list of files with autoloads."
   (with-temp-buffer
     (insert-file-contents (locate-library "loaddefs"))
-    ;; This is from `customize-option'.
-    (let (deps file)
-      (while
-          (search-forward "\n;;; Generated autoloads from " nil t)
-        (goto-char (match-end 0))
-        (setq file (buffer-substring (point)
-                                     (progn (end-of-line) (point))))
-        (setq file (file-name-nondirectory file))
-        (string-match "\\.el\\'" file)
-        (setq file (substring file 0 (match-beginning 0)))
-        (setq deps (nconc deps (list file))))
-      deps)))
+    (let (files)
+      (while (search-forward "\n;;; Generated autoloads from " nil t)
+        (push (buffer-substring (match-end 0) (line-end-position)) files))
+      files)))
+
+(defun cus-test-get-lisp-files (&optional all)
+  "Return list of all Lisp files with defcustoms.
+Optional argument ALL non-nil means list all (non-obsolete) Lisp files."
+  (let ((default-directory (expand-file-name "lisp/" source-directory))
+        (msg "Finding files..."))
+    (message "%s" msg)
+    (prog1
+        ;; Hack to remove leading "./".
+        (mapcar (lambda (e) (substring e 2))
+                (apply 'process-lines find-program
+                       "-name" "obsolete" "-prune" "-o"
+                       "-name" "[^.]*.el" ; ignore .dir-locals.el
+                       (if all
+                           '("-print")
+                         (list "-exec" grep-program
+                               "-l" "^[ \t]*(defcustom" "{}" "+"))))
+      (message "%sdone" msg))))
 
 (defun cus-test-message (list)
   "Print the members of LIST line by line."
@@ -353,16 +358,21 @@ Don't load libraries in `cus-test-libs-noloads'."
 
 ;;; The routines for batch mode:
 
-(defun cus-test-opts ()
+(defun cus-test-opts (&optional all)
   "Test custom options.
 This function is suitable for batch mode.  E.g., invoke
 
   src/emacs -batch -l admin/cus-test.el -f cus-test-opts
 
-in the Emacs source directory."
+in the Emacs source directory.
+Normally only tests options belonging to files in loaddefs.el.
+If optional argument ALL is non-nil, test all files with defcustoms."
   (interactive)
+  (and noninteractive
+       command-line-args-left
+       (setq all (pop command-line-args-left)))
   (message "Running %s" 'cus-test-load-libs)
-  (cus-test-load-libs)
+  (cus-test-load-libs (if all "defcustom"))
   (message "Running %s" 'cus-test-load-custom-loads)
   (cus-test-load-custom-loads)
   (message "Running %s" 'cus-test-apropos)
@@ -392,7 +402,8 @@ in the Emacs source directory."
           ((symbolp load)
            ;; (condition-case nil (require load) (error nil))
            (condition-case alpha
-               (unless (featurep load)
+               (unless (or (featurep load)
+                           (and noninteractive (eq load 'dunnet)))
                  (require load)
                  (push (list symbol load) cus-test-deps-required))
              (error
@@ -444,47 +455,54 @@ in the Emacs source directory."
     (cus-test-message cus-test-deps-errors))
   (run-hooks 'cus-test-after-load-libs-hook))
 
-(defun cus-test-libs ()
+(defun cus-test-libs (&optional more)
   "Load the libraries with autoloads in separate processes.
 This function is useful to detect load problems of libraries.
 It is suitable for batch mode.  E.g., invoke
 
-  src/emacs -batch -l admin/cus-test.el -f cus-test-libs
+  ./src/emacs -batch -l admin/cus-test.el -f cus-test-libs
 
-in the Emacs source directory."
+in the Emacs source directory.
+
+If optional argument MORE is \"defcustom\", load all files with defcustoms.
+If it is \"all\", load all Lisp files."
   (interactive)
-  (with-temp-buffer
-    (setq cus-test-libs-errors nil)
-    (setq cus-test-libs-loaded nil)
-    (cd source-directory)
-    (if (not (file-executable-p "src/emacs"))
-        (error "No Emacs executable in %ssrc" default-directory))
-    (mapc
-     (lambda (file)
-       (condition-case alpha
-           (let (fn cmd status)
-             (setq fn (locate-library file))
-             (if (not fn)
-                 (error "Library %s not found" file))
-             (setq cmd (concat "src/emacs -batch -l " fn))
-             (setq status (call-process shell-file-name nil nil nil
-                                        shell-command-switch cmd))
-             (if (equal status 0)
-                 (message "%s" file)
-               (error "%s" status))
-             (push file cus-test-libs-loaded))
-         (error
-          (push (cons file alpha) cus-test-libs-errors)
-          (message "Error for %s: %s" file alpha))))
-     (cus-test-get-autoload-deps))
-    (message "Default Directory: %s" default-directory)
-    (message "%s libraries had no load errors"
-             (length cus-test-libs-loaded))
-    (if (not cus-test-libs-errors)
-        (message "No load problems encountered")
-      (message "The following load problems appeared:")
-      (cus-test-message cus-test-libs-errors))
-    (run-hooks 'cus-test-after-load-libs-hook)))
+  (and noninteractive
+       command-line-args-left
+       (setq more (pop command-line-args-left)))
+  (cus-test-load-1
+   (let* ((default-directory source-directory)
+          (emacs (expand-file-name "src/emacs"))
+          skipped)
+     (or (file-executable-p emacs)
+         (error "No such executable `%s'" emacs))
+     (mapc
+      (lambda (file)
+        (if (member file cus-test-libs-noloads)
+            (push file skipped)
+          (condition-case alpha
+              (let* ((fn (expand-file-name file "lisp/"))
+                     (elc (concat fn "c"))
+                     status)
+                (if (file-readable-p elc) ; load compiled if present (faster)
+                    (setq fn elc)
+                  (or (file-readable-p fn)
+                      (error "Library %s not found" file)))
+                (if (equal 0 (setq status (call-process emacs nil nil nil
+                                                        "-batch" "-l" fn)))
+                    (message "%s" file)
+                  (error "%s" status))
+                (push file cus-test-libs-loaded))
+            (error
+             (push (cons file alpha) cus-test-libs-errors)
+             (message "Error for %s: %s" file alpha)))))
+      (if more
+          (cus-test-get-lisp-files (equal more "all"))
+        (cus-test-get-autoload-deps)))
+     (message "Default directory: %s" default-directory)
+     (when skipped
+       (message "The following libraries were skipped:")
+       (cus-test-message skipped)))))
 
 (defun cus-test-noloads ()
   "Find custom options not loaded by `custom-load-symbol'.
@@ -495,17 +513,17 @@ It is suitable for batch mode.  E.g., invoke
 
 in the Emacs source directory."
   (interactive)
-  (let (cus-loaded)
+  (let ((groups-loaded (cus-test-get-options "" 'cus-load))
+        cus-loaded groups-not-loaded)
 
     (message "Running %s" 'cus-test-load-custom-loads)
     (cus-test-load-custom-loads)
-    (setq cus-loaded
-          (cus-test-get-options ""))
+    (setq cus-loaded (cus-test-get-options ""))
 
     (message "Running %s" 'cus-test-load-libs)
-    (cus-test-load-libs)
-    (setq cus-test-vars-not-cus-loaded
-          (cus-test-get-options ""))
+    (cus-test-load-libs "all")
+    (setq cus-test-vars-not-cus-loaded (cus-test-get-options "")
+          groups-not-loaded (cus-test-get-options "" t))
 
     (dolist (o cus-loaded)
       (setq cus-test-vars-not-cus-loaded
@@ -515,12 +533,15 @@ in the Emacs source directory."
         (message "No options not loaded by custom-load-symbol found")
       (message "The following options were not loaded by custom-load-symbol:")
       (cus-test-message
-       (sort cus-test-vars-not-cus-loaded 'string<)))))
+       (sort cus-test-vars-not-cus-loaded 'string<)))
 
-;; And last but not least a quiz:
-;;
-;; Evaluation of the form (customize-option 'debug-on-error) yields a
-;; *Customize* buffer with a mismatch mess.  Why?
+    (dolist (o groups-loaded)
+      (setq groups-not-loaded (delete o groups-not-loaded)))
+
+    (if (not groups-not-loaded)
+        (message "No groups not in cus-load.el found")
+      (message "The following groups are not in cus-load.el:")
+      (cus-test-message (sort groups-not-loaded 'string<)))))
 
 (provide 'cus-test)
 
diff --git a/admin/grammars/srecode-template.wy b/admin/grammars/srecode-template.wy
index de9bf351ac6..fd3f61905d3 100644
--- a/admin/grammars/srecode-template.wy
+++ b/admin/grammars/srecode-template.wy
@@ -125,6 +125,10 @@ opt-read-fcn
 variable
   : SET symbol insertable-string-list newline
     (VARIABLE-TAG $2 nil $3)
+  | SET symbol number newline
+    ;; This so a common error w/ priority works.
+    ;; Note that "number" still has a string value in the lexer.
+    (VARIABLE-TAG $2 nil (list $3))
   | SHOW symbol newline
     (VARIABLE-TAG $2 nil t)
   ;
@@ -260,8 +264,8 @@ It ignores whitespace, newlines and comments."
   srecode-template-separator-block
   srecode-template-wy--<keyword>-keyword-analyzer
   srecode-template-property-analyzer
-  srecode-template-wy--<symbol>-regexp-analyzer
   srecode-template-wy--<number>-regexp-analyzer
+  srecode-template-wy--<symbol>-regexp-analyzer
   srecode-template-wy--<string>-sexp-analyzer
   srecode-template-wy--<punctuation>-string-analyzer
   semantic-lex-default-action
diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index 100749191f0..c8bfe0dacc3 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -33,7 +33,7 @@ GNULIB_MODULES='
   getloadavg getopt-gnu gettime gettimeofday
   ignore-value intprops largefile lstat
   manywarnings memrchr mktime
-  pselect pthread_sigmask putenv readlink readlinkat
+  pselect pthread_sigmask putenv qacl readlink readlinkat
   sig2str socklen stat-time stdalign stdarg stdbool stdio
   strftime strtoimax strtoumax symlink sys_stat
   sys_time time timer-time timespec-add timespec-sub unsetenv utimens
@@ -42,7 +42,7 @@ GNULIB_MODULES='
 
 GNULIB_TOOL_FLAGS='
   --avoid=dup
-  --avoid=errno --avoid=fchdir --avoid=fcntl --avoid=fstat
+  --avoid=fchdir --avoid=fcntl --avoid=fstat
   --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow
   --avoid=open --avoid=openat-die --avoid=opendir
   --avoid=raise
diff --git a/admin/notes/bugtracker b/admin/notes/bugtracker
index ee385f4dd75..7947b17973b 100644
--- a/admin/notes/bugtracker
+++ b/admin/notes/bugtracker
@@ -8,7 +8,8 @@ This is 95% of all you will ever need to know.
 
 ** How do I report a bug?
 Use M-x report-emacs-bug, or send mail to bug-gnu-emacs@gnu.org.
-If you want to Cc someone, use an "X-Debbugs-CC" header instead.
+If you want to Cc someone, use an "X-Debbugs-CC" header (or
+pseudo-header, see below) instead.
 
 ** How do I comment on a bug?
 Reply to a mail on the bug-gnu-emacs list in the normal way.
@@ -52,8 +53,8 @@ i) Your report will be assigned a number and generate an automatic reply.
 ii) Optionally, you can set some database parameters when you first
 report a bug (see "Setting bug parameters" below).
 
-iii) If you want to CC: someone, use X-Debbugs-CC: (this is important;
-see below).
+iii) If you want to CC: someone, use X-Debbugs-CC: (note this only
+applies to _new_ reports, not followups).
 
 Once your report is filed and assigned a number, it is sent out to the
 bug mailing list.  In some cases, it may be appropriate to just file a
@@ -92,18 +93,21 @@ but create duplicates and errors.  (It is possible, but unlikely, that
 you might want to have a dialog with the owner address, outside of
 normal bug reporting.)
 
-** When reporting a bug, to send a Cc to another address
+** When reporting a new bug, to send a Cc to another address
 (e.g. bug-cc-mode@gnu.org), do NOT just use a Cc: header.
 Instead, use "X-Debbugs-CC:".  This ensures the Cc address will get a
 mail with the bug report number in.  If you do not do this, each reply
-in the subsequent discussion will end up creating a new bug.
-This is annoying.
+in the subsequent discussion might end up creating a new bug.
+This is annoying.  (So annoying that a form of message-id tracking has
+been implemented to hopefully stop this happening, but it is still
+better to use X-Debbugs-CC.)
 
-(So annoying that a form of message-id tracking has been implemented
-to hopefully stop this happening, but it is still better to use X-Debbugs-CC.)
+Like any X-Debbugs- header, this one can also be specified in the
+pseudo-header (see below), if your mail client does not let you add
+"X-" headers.
 
 If a new report contains X-Debbugs-CC in the input, this is
-converted to a real Cc header in the output.  (See Bug#1720).
+converted to a real Cc header in the output.  (See Bug#1780,5384)
 It is also merged into the Resent-CC header (see below).
 
 ** How does Debbugs send out mails?
@@ -218,8 +222,8 @@ Package: emacs
 Version: 23.0.60
 Severity: minor
 
-This can also include tags.  Some things (e.g. submitter) don't seem to
-work here.
+This can also include tags, or any X-Debbugs- setting.
+Some things (e.g. submitter) don't seem to work here.
 
 Otherwise, send mail to the control server, control@debbugs.gnu.org.
 At the start of the message body, supply the desired commands, one per
@@ -627,7 +631,9 @@ following headers:
 
 1) The leading envelope From line.
 2) Message-ID (get it from /var/log/mailman/vette).
-3) X-Debbugs-Envelope-To: submit
+3) X-Debbugs-Envelope-To: xxx
+For a new report, xxx = submit; for a control message, xxx = control;
+for a reply to bug#123, xxx = 123
 
 Then pipe it to receive as above.
 
diff --git a/admin/notes/unicode b/admin/notes/unicode
index 7b5e21c864b..6db5bb7d05c 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,33 @@ 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
+        leim/quail/cyril-jis.el
+        leim/quail/hanja-jis.el
+        leim/quail/japanese.el
+        leim/quail/py-punct.el
+        leim/quail/pypunct-b5.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
+
+ * utf-8-emacs
+
      These files contain characters that cannot be encoded in UTF-8.
 
         leim/quail/tibetan.el
diff --git a/admin/quick-install-emacs b/admin/quick-install-emacs
index e74a2a5af49..98bd61f839d 100755
--- a/admin/quick-install-emacs
+++ b/admin/quick-install-emacs
@@ -105,8 +105,8 @@ and build directories reside.
 
 Optionally, $me can also remove old versions of
 automatically generated files that are version-specific (such as the
-versioned emacs executables in the \`src' directory, and the DOC-* files
-in the \`etc' directory).  The latter action is called \`pruning,' and
+versioned emacs executables in the \`src' directory).
+The latter action is called \`pruning,' and
 can be enabled using the \`-p' or \`--prune' options.
 EOF
       exit 0
@@ -209,10 +209,6 @@ maybe_mkdir "$DST_INFO"
 
 PRUNED=""
 if test x"$PRUNE" != xno; then
-  for D in `ls -1t $BUILD/etc/DOC-* | sed 1d`; do
-    echo $REMOVE_CMD $D
-    PRUNED="$PRUNED $D"
-  done
   for D in `ls -1t $BUILD/src/emacs-$VERSION.* | sed 1d`; do
     echo $REMOVE_CMD $D
     PRUNED="$PRUNED $D"