7 files changed, 44 insertions, 83 deletions

diff --git a/ChangeLog b/ChangeLog
index 7d3f17f8207..dfa5d2ac96d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-2014-04-03  Ken Brown  <kbrown@cornell.edu>
+2014-04-07  Ken Brown  <kbrown@cornell.edu>
 
         * configure.ac (EMACS_MANIFEST, UPDATE_MANIFEST): Leave these
         variables empty on Cygwin.  (Bug#17176)
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index f8cb233bb19..89a26a6b38a 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,9 +1,7 @@
-2014-04-05  Glenn Morris  <rgm@gnu.org>
+2014-04-07  Glenn Morris  <rgm@gnu.org>
 
         * trouble.texi (Checklist): Dribble files may contain passwords.
 
-2014-04-04  Glenn Morris  <rgm@gnu.org>
-
         * files.texi (Backup Names):
         * arevert-xtra.texi (Supporting additional buffers):
         Update for default values of some -function vars no longer being nil.
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index cb274474973..80427fd0984 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,9 +1,7 @@
-2014-04-05  Glenn Morris  <rgm@gnu.org>
+2014-04-07  Glenn Morris  <rgm@gnu.org>
 
         * os.texi (Recording Input): Dribble files may contain passwords.
 
-2014-04-04  Glenn Morris  <rgm@gnu.org>
-
         * backups.texi (Making Backups, Reverting):
         Update for default values of some -function vars no longer being nil.
         (Reverting): Update for buffer-stale-function
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e4df943c1bf..6fd5c99dc92 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,8 +1,7 @@
 2014-04-07  João Távora  <joaotavora@gmail.com>
 
-        * elec-pair.el:
-        (electric-pair--syntax-ppss): When inside comments parse from
-        comment beginning.
+        * elec-pair.el (electric-pair--syntax-ppss):
+        When inside comments parse from comment beginning.
         (electric-pair--balance-info): Fix typo in comment.
         (electric-pair--in-unterminated-string-p): Delete.
         (electric-pair--unbalanced-strings-p): New function.
@@ -10,12 +9,9 @@
         (electric-pair-inhibit-if-helps-balance): Decide quote pairing
         according to `electric-pair--in-unterminated-string-p'
 
-2014-04-07  João Távora  <joaotavora@gmail.com>
-
-        * elec-pair.el (electric-pair-inhibit-if-helps-balance): Inhibit
-        quote pairing if point-max is inside an unterminated string.
-        (electric-pair--looking-at-unterminated-string-p):
-        Delete.
+        * elec-pair.el (electric-pair-inhibit-if-helps-balance):
+        Inhibit quote pairing if point-max is inside an unterminated string.
+        (electric-pair--looking-at-unterminated-string-p): Delete.
         (electric-pair--in-unterminated-string-p): New function.
 
 2014-04-07  Glenn Morris  <rgm@gnu.org>
@@ -23,7 +19,7 @@
         * shell.el (shell-directory-tracker):
         Go back to just ignoring failures.  (Bug#17159)
 
-2014-04-06  João Távora  <joaotavora@gmail.com>
+2014-04-07  João Távora  <joaotavora@gmail.com>
 
         Fix `electric-pair-delete-adjacent-pairs' in modes binding
         backspace. (bug#16981)
@@ -33,33 +29,29 @@
         a new `electric-pair-delete-pair' command.
         (electric-pair-delete-pair): New command.
 
-2014-04-06  João Távora  <joaotavora@gmail.com>
-
-        * progmodes/python.el (python-electric-pair-string-delimiter): Fix
-        triple-quoting electricity.  (Bug#17192)
-
-2014-04-06  João Távora  <joaotavora@gmail.com>
+        * progmodes/python.el (python-electric-pair-string-delimiter):
+        Fix triple-quoting electricity.  (Bug#17192)
 
-        * elec-pair.el (electric-pair-post-self-insert-function): Don't
-        skip whitespace when `electric-pair-text-pairs' and
+        * elec-pair.el (electric-pair-post-self-insert-function):
+        Don't skip whitespace when `electric-pair-text-pairs' and
         `electric-pair-pairs' were used. syntax to
         electric-pair--skip-whitespace.  (Bug#17183)
 
-2014-04-06  Eli Zaretskii  <eliz@gnu.org>
+2014-04-07  Eli Zaretskii  <eliz@gnu.org>
 
         * leim/quail/ipa.el (ipa-x-sampa): Fix the character produced for
         "<F>".  (Bug#17199)
 
-2014-04-06  Stefan Monnier  <monnier@iro.umontreal.ca>
+2014-04-07  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * mpc.el (mpc--status-timer-run): Disable timer if not displayed.
         (mpc--status-idle-timer-run): Use mpc--status-timer-run.
 
-2014-04-05  Glenn Morris  <rgm@gnu.org>
+2014-04-07  Glenn Morris  <rgm@gnu.org>
 
         * help.el (view-lossage): Doc tweak.
 
-2014-04-05  Matthias Dahl  <ml_emacs-lists@binary-island.eu>
+2014-04-07  Matthias Dahl  <ml_emacs-lists@binary-island.eu>
 
         * faces.el (face-spec-recalc): Call make-face-x-resource-internal
         only when inhibit-x-resources is nil, and do that earlier in the
@@ -74,30 +66,30 @@
         (face-set-after-frame-default): Don't call
         make-face-x-resource-internal here.  (Bug#16434)
 
-2014-04-04  Tassilo Horn  <tsdh@gnu.org>
+2014-04-07  Tassilo Horn  <tsdh@gnu.org>
 
         * doc-view.el (doc-view-bookmark-jump):
         Use `bookmark-after-jump-hook' to jump to the right page after the
         buffer is shown in a window.  (bug#16090)
 
-2014-04-04  Eli Zaretskii  <eliz@gnu.org>
+2014-04-07  Eli Zaretskii  <eliz@gnu.org>
 
         * international/characters.el (mirroring): Fix last change:
         instead of loading uni-mirrored.el explicitly, do that implicitly
         by creating the 'mirroring' uniprop table.  This avoids announcing
         the loading of uni-mirrored.el.
 
-2014-04-04  Glenn Morris  <rgm@gnu.org>
+2014-04-07  Glenn Morris  <rgm@gnu.org>
 
         * files.el (buffer-stale--default-function)
         (buffer-stale-function, revert-buffer--default):
         * autorevert.el (auto-revert-buffers): Doc tweaks.
 
-2014-04-03  Eli Zaretskii  <eliz@gnu.org>
+2014-04-07  Eli Zaretskii  <eliz@gnu.org>
 
         * international/characters.el: Preload uni-mirrored.el.  (Bug#17169)
 
-2014-04-03  Glenn Morris  <rgm@gnu.org>
+2014-04-07  Glenn Morris  <rgm@gnu.org>
 
         * files.el (make-backup-file-name-function)
         (make-backup-file-name, make-backup-file-name--default-function)
@@ -111,12 +103,10 @@
         (make-backup-file-name-function): Bump :version.
         Restore nil as a valid but deprecated custom type.
 
-2014-04-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+2014-04-07  Stefan Monnier  <monnier@iro.umontreal.ca>
 
-        * progmodes/perl-mode.el (perl-syntax-propertize-function): Handle $'
-        used as a variable (bug#17174).
-
-2014-04-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+        * progmodes/perl-mode.el (perl-syntax-propertize-function):
+        Handle $' used as a variable (bug#17174).
 
         * progmodes/perl-mode.el (perl-indent-new-calculate):
         Handle forward-sexp failure (bug#16985).
@@ -613,19 +603,6 @@
         (tty-color-approximate, tty-color-by-index, tty-color-values)
         (tty-color-desc): Remove superfluous backslashes.
 
-2014-03-20  Stefan Monnier  <monnier@iro.umontreal.ca>
-
-        * electric.el (electric-newline-and-maybe-indent): New command.
-        Bind it globally to C-j.
-        (electric-indent-mode): Don't mess with the global map any more.
-        Don't drop the post-self-insert-hook is some buffer is still using it
-        (bug#16770).
-
-        * bindings.el (global-map): Remove C-j binding.
-
-        * emacs-lisp/nadvice.el (advice--make-docstring): Try harder to find
-        the docstring of functions advised before dumping (bug#16993).
-
 2014-03-21  Glenn Morris  <rgm@gnu.org>
 
         * cus-start.el (history-length): Bump :version.
@@ -654,6 +631,19 @@
 
         * skeleton.el (skeleton-autowrap): Mark as obsolete.  Doc fix.
 
+2014-03-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * electric.el (electric-newline-and-maybe-indent): New command.
+        Bind it globally to C-j.
+        (electric-indent-mode): Don't mess with the global map any more.
+        Don't drop the post-self-insert-hook is some buffer is still using it
+        (bug#16770).
+
+        * bindings.el (global-map): Remove C-j binding.
+
+        * emacs-lisp/nadvice.el (advice--make-docstring): Try harder to find
+        the docstring of functions advised before dumping (bug#16993).
+
 2014-03-19  Stefan-W. Hahn  <stefan.hahn@s-hahn.de>  (tiny change)
 
         * ps-print.el (ps-generate-postscript-with-faces):
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 8e2875805dd..215eaae15e7 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,4 +1,4 @@
-2014-04-03  Ken Brown  <kbrown@cornell.edu>
+2014-04-07  Ken Brown  <kbrown@cornell.edu>
 
         * emacs.rc: Don't use manifest on Cygwin.  (Bug#17176)
 
diff --git a/src/ChangeLog b/src/ChangeLog
index d0d133c4989..bbdff0c79b5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -13,22 +13,11 @@
         (Fgarbage_collect): Use it.
         (gc_sweep): Remove hack made unnecessary.
 
-2014-04-05  Glenn Morris  <rgm@gnu.org>
+2014-04-07  Glenn Morris  <rgm@gnu.org>
 
         * keyboard.c (Fopen_dribble_file): Doc tweak.
 
-2014-04-04  Jan Djärv  <jan.h.d@swipnet.se>
-
-        Backport from trunk.
-        * nsterm.m (updateFrameSize:): If waiting for the tool bar and tool
-        bar is zero height, just return (Bug#16976).
-        (initFrameFromEmacs:): Initialize wait_for_tool_bar.
-        * nsterm.h (EmacsView): Add wait_for_tool_bar.
-        * nsmenu.m (update_frame_tool_bar): Return early if view or toolbar
-        is nil.  If waiting for toolbar to complete, force a redraw.
-        (free_frame_tool_bar): Set wait_for_tool_bar = NO (Bug#16976).
-
-2014-04-03  Ken Brown  <kbrown@cornell.edu>
+2014-04-07  Ken Brown  <kbrown@cornell.edu>
 
         * Makefile.in (EMACS_MANIFEST): Update comment.  (Bug#17176)
 
diff --git a/test/ChangeLog b/test/ChangeLog
index 2ef22c9a4c6..fb969069c6c 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,32 +1,18 @@
 2014-04-07  João Távora  <joaotavora@gmail.com>
 
-        * automated/electric-tests.el (define-electric-pair-test): Don't
-        overtest..
-        (inhibit-in-mismatched-string-inside-ruby-comments): New test.
-        (inhibit-in-mismatched-string-inside-c-comments): New test.
-
-2014-04-07  João Távora  <joaotavora@gmail.com>
-
-        * automated/electric-tests.el (inhibit-if-strings-mismatched):
-        New test, change from `inhibit-only-of-next-is-mismatched'.
-
-2014-04-06  João Távora  <joaotavora@gmail.com>
-
         * automated/python-tests.el (python-triple-quote-pairing): New test.
         (python-syntax-after-python-backspace): New test.
 
-2014-04-06  João Távora  <joaotavora@gmail.com>
-
         * automated/electric-tests.el (electric-pair-define-test-form):
         More readable test docstrings.
         (whitespace-skipping-for-quotes-not-ouside)
         (whitespace-skipping-for-quotes-only-inside)
-        (whitespace-skipping-for-quotes-in-text-mode): New tests.
+        (whitespace-skipping-quotes-not-without-proper-syntax): New tests.
 
 2014-04-04  João Távora  <joaotavora@gmail.com>
 
-        * automated/electric-tests.el (define-electric-pair-test): Don't
-        overtest..
+        * automated/electric-tests.el (define-electric-pair-test):
+        Don't overtest.
         (inhibit-in-mismatched-string-inside-ruby-comments): New test.
         (inhibit-in-mismatched-string-inside-c-comments): New test.