Merge from mainline.

diff --cc lisp/ChangeLog
index 2ff5a50,97cf47f..886c307
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,11 -1,41 +1,47 @@@
+ 2013-07-24  Glenn Morris  <rgm@gnu.org>
+ 
+       * printing.el: Replace all uses of deleted ps-windows-system,
+       ps-lp-system, ps-flatten-list with lpr- versions.
+ 
+ 2013-07-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * emacs-lisp/pcase.el (pcase--u1): Verify if self-quoting values can be
+       checked with memq (bug#14935).
+ 
+       * 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.
+ 
+ 2013-07-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * 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.
+       * 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.
+       * dos-w32.el (direct-print-region-helper): Use proper regexp operators.
+       (print-region-function, ps-print-region-function): Don't set them here.
+ 
  2013-07-24  Xue Fuqiao  <xfq.free@gmail.com>
  
 +      * 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.
 +
        * ansi-color.el: Fix old URL.
  
  2013-07-23  Michael R. Mauger  <michael@mauger.com>