From: Xue Fuqiao Date: Wed, 24 Jul 2013 08:04:39 +0000 (+0800) Subject: Merge from mainline. X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1710 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a61dba1c5a5f32827eeda649c9421fc92d742a3d;p=emacs.git Merge from mainline. --- a61dba1c5a5f32827eeda649c9421fc92d742a3d diff --cc lisp/ChangeLog index 2ff5a50e171,97cf47f27e8..886c3075653 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,11 -1,41 +1,47 @@@ + 2013-07-24 Glenn Morris + + * printing.el: Replace all uses of deleted ps-windows-system, + ps-lp-system, ps-flatten-list with lpr- versions. + + 2013-07-24 Stefan Monnier + + * 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 + + * 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 + * 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