lisp/desktop.el (desktop-list*): Fix previous change.
* net/tramp.el (tramp-handle-file-notify-add-watch): New defun.

* net/tramp-adb.el (tramp-adb-file-name-handler-alist):
* net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist):
* net/tramp-smb.el (tramp-smb-file-name-handler-alist): Use it.
* test/automated/subword-tests.el: Require subword.
* inotify-test.el (inotify-file-watch-simple): Delete temp-file when done.
Use a @configure_input@ comment at the start of generated Makefiles
Use a @configure_input@ comment at the start of generated Makefiles
No need for configure to create etc/ and lisp/ any more

* configure.ac (etc, lisp): No need to create specially.
Configure already creates lisp when generating lisp/Makefile;
src/Makefile now creates etc when needed.

* src/Makefile.in ($(etc)/DOC, temacs$(EXEEXT)): Ensure etc/ exists.
lisp/desktop.el (desktop-clear): Fix previous change.
* progmodes/sql.el Version 3.3
(sql-product-alist): Improve oracle :prompt-cont-regexp.
(sql-starts-with-prompt-re, sql-ends-with-prompt-re): New functions.
(sql-interactive-remove-continuation-prompt): Rewrite, use
functions above.  Fix continuation prompt and complete output line
handling.
(sql-redirect-one, sql-execute): Use `read-only-mode' on
redirected output buffer.
(sql-mode): Restore deleted code (Bug#13591).
* configure.ac: Use self-descriptive tags for AC_CONFIG_COMMANDS.
* lisp/ansi-color.el: Fix old URL.
* lisp/lpr.el: Signal print errors more prominently.
(print-region-function): Don't default to nil.
(lpr-print-region): New function, extracted from print-region-1.
Check lpr's return value and signal an error in case of problem.
(print-region-1): Use it.
* lisp/ps-print.el (ps-windows-system, ps-lp-system): Remove.  Use the lpr-*
versions instead.
(ps-printer-name): Default to nil.
(ps-printer-name-option): Default to lpr-printer-switch.
(ps-print-region-function): Don't default to nil.
(ps-postscript-code-directory): Simplify default.
(ps-do-despool): Use lpr-print-region to properly check the outcome.
(ps-string-list, ps-eval-switch, ps-flatten-list)
(ps-flatten-list-1): Remove.
(ps-multibyte-buffer): Avoid setq.
* lisp/dos-w32.el (direct-print-region-helper): Use proper regexp operators.
(print-region-function, ps-print-region-function): Don't set them here.
* lisp/files.el (revert-buffer-function): Use a non-nil default.
(revert-buffer-preserve-modes): Declare var to
provide access to the `preserve-modes' argument.
(revert-buffer): Let-bind it.
(revert-buffer--default): New function, extracted from revert-buffer.
* lisp/emacs-lisp/pcase.el (pcase--u1): Verify if self-quoting values can be
checked with memq.
* src/eval.c (Fprogn): Do not check that BODY is a proper list.

This undoes the previous change.  The check slows down the
interpreter, and is not needed to prevent a crash.  See
<http://lists.gnu.org/archive/html/emacs-devel/2013-07/msg00693.html>.
* doc/lispref/eval.texi (Special Forms): Mention 'lambda'.  Also, say that
non-well-formed expressions result in unspecified behavior, though
Emacs will not crash.
* printing.el: Replace all uses of deleted ps-windows-system, ps-lp-system
with lpr- versions.
* printing.el: Replace all uses of deleted ps-flatten-list with lpr- version.
* lisp/dired-x.el (dired-mark-extension): Convert comment to doc string.
* lisp/ido.el: Doc fix.

* lisp/ido.el (ido-fractionp):
(ido-cache-ftp-work-directory-time, ido-max-prospects, ido-mode)
(ido-max-file-prompt-width, ido-unc-hosts-cache)
(ido-max-directory-size, ido-max-dir-file-cache)
(ido-decorations): Doc fix.
Merge from mainline.