* emacs-lisp/ert.el: Fix paren typo.
* lisp/emacs-lisp/timer.el (timer-event-handler): Don't retrigger a canceled
timer.
* lisp/emacs-lisp/edebug.el (edebug-mode): Fix typo.
* src/window.c (select_window): Don't record_buffer while the invariant is
temporarily broken.
* src/fns.c (Fdelq): Don't assume !NILP => CONSP.
Fix icon for the cygw32 build on 64-bit Cygwin.  (Bug#12993)

* nt/emacs.rc: Use 64-bit manifest for 64-bit Cygwin build.

* configure.ac (W32_RES_LINK): Remove unnecessary linker directive
`-Wl,-bpe-i386', which is confusing in the 64-bit case.
* simple.el (choose-completion-string): Fix docstring (bug#14163).
Auto-commit of generated files.
* lisp/progmodes/sh-script.el: Implement `sh-mode' own
`add-log-current-defun-function'.
(sh-current-defun-name): New function.
(sh-mode): Use the function.
* test/automated/add-log-tests.el: New file.
* etc/NEWS: Mention `sh-mode' own `add-log-current-defun-function'.
* themes/tsdh-dark-theme.el (tsdh-dark): Add some more faces.
* src/minibuf.c (Ftest_completion): Ignore non-string/symbol keys in hash
tables.
Fix typos
Standardize license text
* lisp/mpc.el (mpc-proc): Add `restart' argument.
(mpc-proc-cmd): Use it.
(mpc--status-timer-run): Also catch signals from `mpc-proc'.
(mpc-status-buffer-show, mpc-tagbrowser-dir-toggle): Call `mpc-proc'
less often.
* src/keyboard.c (timer_start_idle): Call internal-timer-start-idle instead
of marking the idle timers directly.
* lisp/emacs-lisp/timer.el (timer--check): New function.
(timer--time, timer-set-function, timer-event-handler): Use it.
(timer-set-idle-time): Simplify.
(timer--activate): CSE.
(timer-event-handler): Give more info in error message.
(internal-timer-start-idle): New function, moved from C.
* textmodes/reftex-cite.el (reftex-parse-bibtex-entry): Don't cut
off leading { and trailing } from field values.
Fix bug #13864 with flickering of TTY frames in an emacslient session.

 src/frame.c (do_switch_frame): Mark the TTY frame we switch to as
 garbaged only if it is not already the top frame on its TTY.  This
 prevents flickering due to constant redrawing of TTY frames when
 there are GUI frames open in the same session.
lisp/gnus/nnir.el: Improve marks handling
lisp/gnus/nnir.el: Small optimizations. Use 'gnus-group-guess-full-name-from-command-method