Merge from trunk and resolve conflicts.

9 files changed, 224 insertions, 38 deletions

diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index 066347b3826..a98d1b9039e 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -368,7 +368,6 @@ HAVE___FPENDING
 INTERNAL_TERMINAL
 IS_ANY_SEP
 IS_DIRECTORY_SEP
-LOCALTIME_CACHE
 MAIL_USE_FLOCK
 MAIL_USE_LOCKF
 MAIL_USE_POP
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 6746bb253ec..f3d6d048e21 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,71 @@
+2014-10-13  Glenn Morris  <rgm@gnu.org>
+
+        * authors.el (authors-aliases, authors-fixed-case)
+        (authors-obsolete-files-regexps): Additions.
+        (authors-no-scan-regexps): New constant.
+        (authors-no-scan-file-p): New function.
+        (authors): Respect authors-no-scan-file-p.
+
+2014-10-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix putenv race conditions with undefined behavior (Bug#8705).
+        * merge-gnulib (GNULIB_MODULES): Add time_r, since Emacs now
+        calls localtime_r and gmtime_r directly.
+
+2014-10-07  Glenn Morris  <rgm@gnu.org>
+
+        * unidata/Makefile.in: Check for deleted uni- files.  (Bug#18489)
+        (all): Use unifiles rather than charprop.el.
+        (FORCE): New variable and phony rule.
+        (${unidir}/charprop.el): Respect FORCE.
+        (unifiles): New rule.
+
+        * unidata/Makefile.in (unidir): Rename from DSTDIR.  Change all uses.
+        (charprop.el, install): Remove rules.
+        (clean): Simplify.
+
+2014-10-04  Glenn Morris  <rgm@gnu.org>
+
+        * authors.el (authors-renamed-files-alist): Add package-x-test.el
+
+2014-10-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * unidata/unidata-gen.el (unidata-gen-table-word-list): Use alist-get
+        and cl-incf.
+
+2014-09-08  Eli Zaretskii  <eliz@gnu.org>
+
+        * unidata/unidata-gen.el (unidata-check): Bring this function up
+        to date with the currently supported methods of generating Unicode
+        property tables.  Add a comment with a description how to invoke
+        the check.  Update the copyright years in the reference to the
+        Unicode data files we use.
+
+2014-08-30  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Vector-sorting fixes (Bug#18361).
+        * merge-gnulib (GNULIB_MODULES): Add vla.
+
+2014-08-30  Eli Zaretskii  <eliz@gnu.org>
+
+        * authors.el (authors): Fix last change so it works for MS-Windows
+        as well.
+
+2014-08-29  Michael Albinus  <michael.albinus@gmx.de>
+
+        * authors.el (authors): Use LOCALE argument of `string-collate-lessp'.
+
+2014-08-28  Michael Albinus  <michael.albinus@gmx.de>
+
+        * authors.el (authors-aliases): Addition.
+
+2014-08-26  Glenn Morris  <rgm@gnu.org>
+
+        * authors.el (authors-ignored-files, authors-valid-file-names)
+        (authors-renamed-files-alist): Additions.
+        (authors-renamed-files-alist): Revert 2014-08-09 change.
+        (authors): Sort authors in utf-8 order.  (Bug#2263)
+
 2014-08-09  Reuben Thomas  <rrt@sc3d.org>
 
         * notes/copyright: Remove mention of msdos/is_exec.c and
diff --git a/admin/authors.el b/admin/authors.el
index 60e7fc39a74..aefd947e802 100644
--- a/admin/authors.el
+++ b/admin/authors.el
@@ -92,6 +92,7 @@ files.")
     ("Joseph Arceneaux" "Joe Arceneaux")
     ("Joseph M. Kelsey" "Joe Kelsey")   ; FIXME ?
     ("Juan León Lahoz García" "Juan-Leon Lahoz Garcia")
+    ("Jürgen Hötzel" "Juergen Hoetzel")
     ("K. Shane Hartman" "Shane Hartman")
     ("Kai Großjohann" "Kai Grossjohann")
     ("Karl Berry" "K. Berry")
@@ -120,6 +121,7 @@ files.")
     ("Mikio Nakajima" "Nakajima Mikio")
     ("Nelson Jose dos Santos Ferreira" "Nelson Ferreira")
     ("Noorul Islam" "Noorul Islam K M")
+;;;    ("Tetsurou Okazaki" "OKAZAKI Tetsurou") ; FIXME?
     ("Paul Eggert" "Paul R\\. Eggert")
     ("Pavel Janík" "Pavel Janík Ml." "Pavel Janik Ml." "Pavel Janik")
     ("Pavel Kobiakov" "Pavel Kobyakov")
@@ -142,6 +144,7 @@ files.")
     ("Sam Steingold" "Sam Shteingold")
     ("Satyaki Das" "Indexed search by Satyaki Das")
     ("Sébastien Vauban" "Sebastien Vauban")
+    ("Sergey Litvinov" "Litvinov Sergey")
     ;; There are other Stefans.
 ;;;    ("Stefan Monnier" "Stefan")
     ("Steven L. Baur" "SL Baur" "Steven L Baur")
@@ -177,11 +180,13 @@ If REALNAME is nil, ignore that author.")
 
 ;; FIXME seems it would be less fragile to check for O', Mc, etc.
 (defconst authors-fixed-case
-  '("Brian van den Broek"
+  '("Barry O'Reilly"
+    "Brian van den Broek"
     "Bryan O'Sullivan"
     "Christian von Roques"
     "Christophe de Dinechin"
     "Craig McDaniel"
+    "Daniel LaLiberte"
     "David J. MacKenzie"
     "David McCabe"
     "David O'Toole"
@@ -189,12 +194,16 @@ If REALNAME is nil, ignore that author.")
     "Dominique de Waleffe"
     "Edward O'Connor"
     "Exal de Jesus Garcia Carrillo"
+    "George McNinch"
     "Greg McGary"
     "Hans de Graaff"
+    "Ivan Vilata i Balaguer"
+    "Jae-hyeon Park"
     "James TD Smith"
     "Jay McCarthy"
     "Joel N. Weber II"
     "Matt McClure"
+    "Mike McLean"
     "Michael McNamara"
     "Mike McEwan"
     "Nelson Jose dos Santos Ferreira"
@@ -202,10 +211,13 @@ If REALNAME is nil, ignore that author.")
     "Peter O'Gorman"
     "Piet van Oostrum"
     "Roland McGrath"
+    "Santiago Payà i Miralta"
     "Sean O'Halpin"
     "Sean O'Rourke"
+    "Shun-ichi Goto"
     "Thomas DeWeese"
-    "Tijs van Bakel")
+    "Tijs van Bakel"
+    "Yu-ji Hosokawa")
   "List of authors whose names cannot be simply capitalized.")
 
 (defvar authors-public-domain-files
@@ -230,6 +242,7 @@ If REALNAME is nil, ignore that author.")
   '(".*loaddefs.el$"                    ; not obsolete, but auto-generated
     "\\.\\(cvs\\|git\\)ignore$"         ; obsolete or uninteresting
     "\\.arch-inventory$"
+    "automated/data/"              ; not interesting
     ;; TODO lib/? Matches other things?
     "build-aux/" "m4/" "Emacs.xcodeproj" "mapfiles" "\\.map\\'"
     "preferences\\.\\(nib\\|gorm\\)"
@@ -239,6 +252,11 @@ gnus-booklet\\|fr-drdref\\)\\.p\\(df\\|s\\)\\'")
   "List of regexps matching obsolete files.
 Changes to files matching one of the regexps in this list are not listed.")
 
+(defconst authors-no-scan-regexps
+  '("etc/nxml/"
+    "automated/data/")
+  "Lists of regexps matching files not to scan for authorship.")
+
 (defconst authors-ignored-files
   '("external-lisp"
     "lock" "share-lib" "local-lisp"
@@ -283,6 +301,7 @@ Changes to files matching one of the regexps in this list are not listed.")
     "images/icons/allout-widgets-dark-bg"
     "images/icons/allout-widgets-light-bg"
     ;; Never had any meaningful changes logged, now deleted:
+    "lib/stdarg.in.h" "lib/stdbool.in.h"
     "unidata/bidimirror.awk" "unidata/biditype.awk"
     "split-man" "Xkeymap.txt" "ms-7bkermit" "ulimit.hack"
     "gnu-hp300" "refcard.bit" "ledit.l" "forms.README" "forms-d2.dat"
@@ -575,9 +594,10 @@ Changes to files in this list are not listed.")
     "README"
     ;; There were a few of these, not just the generated top-level one.
     "configure" "config.h"
+    "is_exec.c" "sigaction.c"
     ;; nt/
     "ebuild.bat" "install.bat" "fast-install.bat"
-    "debug.bat.in" "emacs.bat.in"
+    "debug.bat.in" "emacs.bat.in" "addsection.c"
     "inc/sys/dir.h" "inc/gettext.h"
     ".gdbinit-union"
     "alloca.s"
@@ -631,6 +651,8 @@ Changes to files in this list are not listed.")
     "mh-exec.el" "mh-init.el" "mh-customize.el"
     "net/zone-mode.el" "xesam.el"
     "term/mac-win.el" "sup-mouse.el"
+    "term/vt102.el" "term/vt201.el" "term/vt220.el" "term/vt300.el"
+    "term/vt320.el" "term/vt400.el" "term/vt420.el"
     "url-https.el"
     "org-mac-message.el" "org-mew.el" "org-w3m.el" "org-vm.el" "org-wl.el"
     "org-mks.el" "org-remember.el" "org-xoxo.el" "org-docbook.el"
@@ -638,6 +660,7 @@ Changes to files in this list are not listed.")
     "org-exp-blocks.el"              ; maybe this is ob-exp now? dunno
     "org-lparse.el"
     "org-special-blocks.el" "org-taskjuggler.el"
+    "progmodes/cap-words.el"
     ;; gnus
     "nnwfm.el" "nnlistserv.el" "nnkiboze.el" "nndb.el" "nnsoup.el"
     "netrc.el" "password.el" "sasl-cram.el" "sasl-digest.el" "sasl-ntlm.el"
@@ -712,6 +735,7 @@ in the repository.")
     ("server.c" . "emacsserver.c")
     ("lib-src/etags.c" . "etags.c")
     ;; msdos/
+    ("is-exec.c" . "is_exec.c")
     ("enriched.doc" . "enriched.txt")
     ("GETTING.GNU.SOFTWARE" . "FTP")
     ("etc/MACHINES" . "MACHINES")
@@ -755,6 +779,13 @@ in the repository.")
     ;; Obsolete.
     ("emacs-lisp/assoc.el" . "assoc.el")
     ("emacs-lisp/cust-print.el" . "cust-print.el")
+    ("emacs-lisp/gulp.el" . "gulp.el")
+    ("emulation/crisp.el" . "crisp.el")
+    ("emulation/tpu-edt.el" . "tpu-edt.el")
+    ("emulation/tpu-extras.el" . "tpu-extras.el")
+    ("emulation/vi.el" . "vi.el")
+    ("emulation/vip.el" . "vip.el")
+    ("emulation/ws-mode.el" . "ws-mode.el")
     ("mail/mailpost.el" . "mailpost.el")
     ("play/bruce.el" . "bruce.el")
     ("play/yow.el" . "yow.el")
@@ -768,6 +799,7 @@ in the repository.")
     ;; The one in lisp is eshell/eshell.el.
     ("eshell.el" . "automated/eshell.el")
     ("eshell/esh-test.el" . "automated/eshell.el")
+    ("automated/package-x-test.el" . "automated/package-test.el")
     ;; INSTALL-CVS -> .CVS -> .BZR -> .REPO
     ("INSTALL-CVS" . "INSTALL.REPO")
     ("INSTALL.CVS" . "INSTALL.REPO")
@@ -786,6 +818,8 @@ in the repository.")
     ("emacs.tex" . "emacs.texi")
     ("faq.texi" . "efaq.texi")
     ("major.texi" . "modes.texi")
+    ("msdog-xtra.texi" . "msdos-xtra.texi")
+    ("msdog.texi" . "msdos.texi")
     ;; And from emacs/ to misc/ and back again.
     ("ns-emacs.texi" . "macos.texi")
     ("overrides.texi" . "gnus-overrides.texi")
@@ -824,6 +858,8 @@ in the repository.")
     ("autogen/update_autogen" . "update_autogen")
     ;; Moved from etc/ to admin/.
     ("grammars" . "grammars")
+    ;; Moved from lisp/emacs-lisp/ to admin/.
+    ("emacs-lisp/authors.el" . "authors.el")
     ;; From etc to lisp/cedet/semantic/.
     ("grammars/bovine-grammar.el" . "bovine/grammar.el")
     ("grammars/wisent-grammar.el" . "wisent/grammar.el")
@@ -1050,6 +1086,15 @@ from `authors-obsolete-files-regexps'."
             regexps (cdr regexps)))
     obsolete-p))
 
+(defun authors-no-scan-file-p (file)
+  "Return non-nil if FILE should not be scanned.
+FILE is not scanned if it matches any of `authors-no-scan-regexps'."
+  (let (no-scan-p
+        (regexps authors-no-scan-regexps))
+    (while (and regexps (not no-scan-p))
+      (setq no-scan-p (string-match-p (car regexps) file)
+            regexps (cdr regexps)))
+    no-scan-p))
 
 (defun authors-add (author file action table)
   "Record that AUTHOR worked on FILE.
@@ -1281,8 +1326,9 @@ buffer *Authors Errors* containing references to unknown files."
         (authors-scan-change-log log table)))
     (let ((els (process-lines find-program root "-name" "*.el")))
       (dolist (file els)
-        (message "Scanning %s..." file)
-        (authors-scan-el file table)))
+        (unless (authors-no-scan-file-p file)
+          (message "Scanning %s..." file)
+          (authors-scan-el file table))))
     (message "Generating buffer %s..." buffer-name)
     (set-buffer (get-buffer-create buffer-name))
     (erase-buffer)
@@ -1296,7 +1342,11 @@ list of their contributions.\n")
       (maphash #'authors-add-to-author-list table)
       (setq authors-author-list
             (sort authors-author-list
-                  (lambda (a b) (string-lessp (car a) (car b)))))
+                  (lambda (a b)
+                    (string-collate-lessp (car a) (car b)
+                                          (if (eq system-type 'windows-nt)
+                                              "enu_USA"
+                                            "en_US.UTF-8")))))
       (dolist (a authors-author-list)
         (let ((author (car a))
               (wrote (nth 1 a))
diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt
index a2e8a9e7da3..c15db52d472 100644
--- a/admin/make-tarball.txt
+++ b/admin/make-tarball.txt
@@ -149,13 +149,15 @@ General steps (for each step, check for possible errors):
 
 11. Send an announcement to: emacs-devel, and bcc: info-gnu-emacs@gnu.org.
     For a pretest, also bcc: platform-testers@gnu.org.
+    For a release, also bcc: info-gnu@gnu.org.
     (The reason for using bcc: is to make it less likely that people
     will followup on the wrong list.)
     See the info-gnu-emacs mailing list archives for the form
     of past announcements.  The first pretest announcement, and the
     release announcement, should have more detail.
 
-12. For a release, update the Emacs homepage in the web repository.
-    Also update history.html, and add the new NEWS file as NEWS.xx.y.
+12. For a release, update the Emacs homepage emacs.html in the web repository.
+    Also update history.html, and add the new NEWS file as news/NEWS.xx.y.
     Regenerate the html manuals (use make-manuals from admin.el).
     If there are new manuals, add appropriate index pages.
+    Delete any old manual pages that are no longer present.
diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index a11b6e06d27..dc3cd6cf541 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -37,9 +37,9 @@ GNULIB_MODULES='
   pipe2 pselect pthread_sigmask putenv qacl readlink readlinkat
   sig2str socklen stat-time stdalign stdio
   strftime strtoimax strtoumax symlink sys_stat
-  sys_time time timer-time timespec-add timespec-sub
+  sys_time time time_r timer-time timespec-add timespec-sub
   unsetenv update-copyright utimens
-  warnings
+  vla warnings
 '
 
 GNULIB_TOOL_FLAGS='
diff --git a/admin/notes/bzr b/admin/notes/bzr
index 13a3beb4ca8..b962b370221 100644
--- a/admin/notes/bzr
+++ b/admin/notes/bzr
@@ -307,6 +307,18 @@ When finished, use
 
 or simply delete the entire branch if you created it just for this.
 
+** Some tips for speeding up bisections:
+
+*** Use ./configure --without-all --cache-file=/tmp/config.cache
+(assuming the thing you are testing for does not need a feature that
+--without-all disables).
+
+*** Rather than `make', use `make -C lib && make -C src bootstrap-emacs
+&& make -C src emacs', to avoid compiling the non-essential lisp files
+(unless the thing you are testing for only shows up in compiled files;
+if so compile just the relevant ones).  Obviously use whatever make -j
+option is appropriate for your system.
+
 * Commit emails
 
 ** Old method: bzr-hookless-email
diff --git a/admin/unidata/Makefile.in b/admin/unidata/Makefile.in
index 8234de1dd70..05d3f929f18 100644
--- a/admin/unidata/Makefile.in
+++ b/admin/unidata/Makefile.in
@@ -28,12 +28,12 @@ top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
 
 EMACS = ${top_builddir}/src/emacs
-DSTDIR = ${top_srcdir}/lisp/international
+unidir = ${top_srcdir}/lisp/international
 emacs = "${EMACS}" -batch --no-site-file --no-site-lisp
 
-.PHONY: all compile install
+.PHONY: all unifiles
 
-all: ${top_srcdir}/src/macuvs.h ${DSTDIR}/charprop.el
+all: ${top_srcdir}/src/macuvs.h unifiles
 
 ## Specify .elc as an order-only prereq so as to not needlessly rebuild
 ## target just because the .elc is missing.
@@ -50,31 +50,33 @@ ${top_srcdir}/src/macuvs.h: ${srcdir}/uvs.el ${srcdir}/IVD_Sequences.txt | \
 unidata.txt: ${srcdir}/UnicodeData.txt
         sed -e 's/\([^;]*\);\(.*\)/(#x\1 "\2")/' -e 's/;/" "/g' < $< > $@
 
-${DSTDIR}/charprop.el: ${srcdir}/unidata-gen.el ${srcdir}/UnicodeData.txt \
-  ${srcdir}/BidiMirroring.txt ${srcdir}/BidiBrackets.txt | \
+FORCE =
+FORCE:
+.PHONY: FORCE
+
+${unidir}/charprop.el: ${FORCE} ${srcdir}/unidata-gen.el \
+  ${srcdir}/UnicodeData.txt ${srcdir}/BidiMirroring.txt \
+  ${srcdir}/BidiBrackets.txt | \
   ${srcdir}/unidata-gen.elc unidata.txt
         -if [ -f "$@" ]; then \
-          cd ${DSTDIR} && chmod +w charprop.el `sed -n 's/^;; FILE: //p' < charprop.el`; \
+          cd ${unidir} && chmod +w charprop.el `sed -n 's/^;; FILE: //p' < charprop.el`; \
         fi
         ${emacs} -L ${srcdir} -l unidata-gen -f unidata-gen-files \
-          ${srcdir} "${DSTDIR}"
+          ${srcdir} "${unidir}"
 
-## Like the above, but generate in PWD rather than lisp/international.
-charprop.el: ${srcdir}/unidata-gen.elc unidata.txt BidiMirroring.txt BidiBrackets.txt
-        ${emacs} -L ${srcdir} -l unidata-gen -f unidata-gen-files \
-          ${srcdir}
+## Check for deleted uni- files, and if any such, force a rebuild.
+## Perhaps a more elegant way would be for the previous rule
+## to generate a Makefile fragment explicitly listing the uni- files,
+## which this file could include.  If no fragment, rebuild everything.
+unifiles: ${unidir}/charprop.el
+        for f in `sed -n 's/^;; FILE: //p' < $<`; do \
+          [ -f ${unidir}/$$f ] || { ${MAKE} $< FORCE=FORCE || exit 1; break; };\
+        done
 
 .PHONY: clean bootstrap-clean distclean maintainer-clean extraclean
 
-install: charprop.el
-        cp charprop.el ${DSTDIR}
-        cp `sed -n 's/^;; FILE: //p' < charprop.el` ${DSTDIR}
-
 clean:
-        if test -f charprop.el; then \
-          rm -f `sed -n 's/^;; FILE: //p' < charprop.el`; \
-        fi
-        rm -f charprop.el ${srcdir}/*.elc unidata.txt
+        rm -f ${srcdir}/*.elc unidata.txt
 
 bootstrap-clean: clean
 
@@ -88,7 +90,7 @@ maintainer-clean: distclean
 ## Cf leim/ja-dic (which is much slower).
 extraclean:
         rm -f ${top_srcdir}/src/macuvs.h
-        if test -f ${DSTDIR}/charprop.el; then \
-          (cd ${DSTDIR} && rm -f `sed -n 's/^;; FILE: //p' < charprop.el`); \
-          rm -f ${DSTDIR}/charprop.el; \
+        if test -f ${unidir}/charprop.el; then \
+          (cd ${unidir} && rm -f `sed -n 's/^;; FILE: //p' < charprop.el`); \
+          rm -f ${unidir}/charprop.el; \
         fi
diff --git a/admin/unidata/unidata-gen.el b/admin/unidata/unidata-gen.el
index 0dc02c996ed..d10b260b470 100644
--- a/admin/unidata/unidata-gen.el
+++ b/admin/unidata/unidata-gen.el
@@ -88,6 +88,8 @@
 ;; CHAR-or-RANGE: a character code or a cons of character codes
 ;; PROPn: string representing the nth property value
 
+(eval-when-compile (require 'cl-lib))
+
 (defvar unidata-list nil)
 
 ;; Name of the directory containing files of Unicode Character Database.
@@ -943,11 +945,7 @@ Property value is a symbol `o' (Open), `c' (Close), or `n' (None)."
               (dotimes (i (length vec))
                 (dolist (elt (aref vec i))
                   (if (symbolp elt)
-                      (let ((slot (assq elt word-list)))
-                        (if slot
-                            (setcdr slot (1+ (cdr slot)))
-                          (setcdr word-list
-                                  (cons (cons elt 1) (cdr word-list))))))))
+                      (cl-incf (alist-get elt (cdr word-list) 0)))))
               (set-char-table-range table (cons start limit) vec))))))
     (setq word-list (sort (cdr word-list)
                           #'(lambda (x y) (> (cdr x) (cdr y)))))
@@ -1230,6 +1228,12 @@ Property value is a symbol `o' (Open), `c' (Close), or `n' (None)."
 
 ;; Verify if we can retrieve correct values from the generated
 ;; char-tables.
+;;
+;; Use like this:
+;;
+;; (let ((unidata-dir "/path/to/admin/unidata"))
+;;   (unidata-setup-list "unidata.txt")
+;;   (unidata-check))
 
 (defun unidata-check ()
   (dolist (elt unidata-prop-alist)
diff --git a/admin/versioning b/admin/versioning
new file mode 100644
index 00000000000..da547ee94ca
--- /dev/null
+++ b/admin/versioning
@@ -0,0 +1,49 @@
+GNU EMACS VERSIONING                                   -*- org -*-
+
+The version number scheme of Emacs, including how to determine when to
+bump various components of the version number, has evolved over the
+years.  This file defines the current method, explains why it was
+chosen, and lightly documents the previous schemes.  It was prompted
+by http://lists.gnu.org/archive/html/emacs-devel/2014-09/msg00872.html.
+
+Related info:
+- [[file:FOR-RELEASE][FOR-RELEASE]]
+- [[file:make-tarball.txt][make-tarball.txt]]
+
+* what: MAJOR.MINOR
+
+This has always been the case (see [[was]], below).  MINOR is 1 or more,
+usually, the exception being for pretest releases, where there is
+an additional trailing ".ALPHA" (e.g., 24.3.95 prior to 24.4).
+
+To determine any release's version, we follow this algorithm:
+
+- If MAJOR-CHANGES, increment MAJOR and set MINOR to 1.
+- Otherwise, increment MINOR.
+
+where MAJOR-CHANGES is defined roughly as the union of:
+
+- dropped support for IMPORTANT
+  - platforms (almost never happens)
+  - Emacs Lisp features
+  - non-programming features/packages
+- IMPORTANT additions and changes
+  - Emacs Lisp features
+  - non-programming features/packages
+
+and IMPORTANT is defined through discussion on the [[http://mail.gnu.org/archive/html/emacs-devel/][emacs-devel]]
+mailing list and/or private arm-twisting (although this latter
+method is somewhat discouraged :-D).
+
+* why
+
+People expect bumps in MINOR for "minor" changes.  This typically
+includes bugfixes, doc improvements, or fully-backward-compatible
+additions and changes, only.
+
+Anything else is actually IMPORTANT, to the user.  [Actually, who
+really knows what the user thinks?  I certainly don't. --ttn]
+
+* was
+
+TODO (be sure to include "ad-hoc" :-D)