From: Xue Fuqiao Date: Tue, 30 Jul 2013 00:29:09 +0000 (+0800) Subject: Merge from mainline. X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1698 X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/d2067333246b676fcf98567d34eec79ed4648d5f Merge from mainline. --- d2067333246b676fcf98567d34eec79ed4648d5f diff --cc lisp/ChangeLog index 29cd88a918,6f30ef90ba..f27a6fa194 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,23 -1,168 +1,188 @@@ + 2013-07-29 Eli Zaretskii + + * frame.el (frame-notice-user-settings): Avoid inflooping when the + initial frame is minibuffer-less. (Bug#14841) + + 2013-07-29 Michael Albinus + + * net/tramp.el (tramp-use-ssh-controlmaster-options): New customer + option. + + * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band) + (tramp-maybe-open-connection): Use it. + + 2013-07-28 Juanma Barranquero + + * desktop.el (desktop--make-frame): Include `minibuffer' in the + minimal set of parameters passed when creating a frame, because + the minibuffer status of a frame cannot be changed later. + + 2013-07-28 Stephen Berman + + * calendar/todo-mode.el (todo-rename-file): Fix incorrect use of + replace-regexp-in-string and inadvertent omissions in previous change. + (todo-filter-items): Ensure only file names are comma-separated in + name of filtered items buffer. + + 2013-07-28 Juanma Barranquero + + * desktop.el: Optionally force offscreen frames back onscreen. + (desktop-restoring-reuses-frames): New option. + (desktop--compute-pos, desktop--move-onscreen): New functions. + (desktop--make-frame): Use desktop--move-onscreen. + + 2013-07-27 Alan Mackenzie + + Fontify a Java generic method as a function. + * progmodes/cc-langs.el (c-recognize-<>-arglists): Set the Java + value to t. + + 2013-07-27 Stephen Berman + + * calendar/todo-mode.el: Add command to rename todo files. + (todo-rename-file): New command. + (todo-key-bindings-t): Add key binding for it. Change the + bindings of todo-filter-regexp-items(-multifile) to use `x' + instead of `r', since the latter is better suited to the new + renaming command. + + 2013-07-27 Alan Mackenzie + + Make Java try-with-resources statement parse properly. + * progmodes/cc-langs.el (c-block-stmt-1-2-kwds) + (c-block-stmt-1-2-key): New language constants/variables. + * progmodes/cc-engine.el (c-beginning-of-statement-1) + (c-after-conditional): Adapt to deal with c-block-stmt-1-2-key. + * progmodes/cc-fonts.el (c-font-lock-declarations): Adapt to deal + with c-block-stmet-1-2-key. + + 2013-07-27 Juanma Barranquero + + * desktop.el (desktop--make-frame): Apply most frame parameters after + creating the frame to force (partially or totally) offscreen frames to + be restored as such. + + 2013-07-26 Xue Fuqiao + + * vc/vc-dir.el (vc-dir-mode-map): Add binding for vc-root-diff. + (Bug#14948) + + 2013-07-26 Stefan Monnier + + * emacs-lisp/nadvice.el (advice--called-interactively-skip): Use the new + `base' arg of backtrace-frame. + + 2013-07-26 Eli Zaretskii + + * simple.el (list-processes): Doc fix. + + 2013-07-26 Juanma Barranquero + + * desktop.el (desktop--select-frame): + Try harder to reuse existing frames. + + 2013-07-26 Stefan Monnier + + * emacs-lisp/edebug.el: Use backtrace-eval to handle lexical variables. + (edebug-eval): Use backtrace-eval. + (edebug--display, edebug--recursive-edit): Don't let-bind the + edebug-outer-* vars that keep track of variables we locally let-bind. + (edebug-outside-excursion): Don't restore outside values of locally + let-bound vars. + (edebug--display): Use user-error. + (cl-lexical-debug, cl-debug-env): Remove. + + 2013-07-26 Juanma Barranquero + + * desktop.el (desktop-restore-frames): Call `sit-for' once all frames + are restored to be sure that they are visible before deleting any + remaining ones. + + 2013-07-26 Matthias Meulien + + * vc/vc-dir.el (vc-dir-mode-map): Add binding for + vc-print-root-log. (Bug#14948) + + 2013-07-26 Richard Stallman + + Add aliases for encrypting mail. + * epa.el (epa-mail-aliases): New option. + * epa-mail.el (epa-mail-encrypt): Rewrite to be callable from programs. + Bind inhibit-read-only so read-only text doesn't ruin everything. + (epa-mail-default-recipients): New subroutine broken out. + Handle epa-mail-aliases. + + 2013-07-26 Stefan Monnier + + Add support for lexical variables to the debugger's `e' command. + * emacs-lisp/debug.el (debug): Don't let-bind the debugger-outer-* + vars, except for debugger-outer-match-data. + (debugger-frame-number): Move check for "on a function call" from + callers into it. Add `skip-base' argument. + (debugger-frame, debugger-frame-clear): Simplify accordingly. + (debugger-env-macro): Only reset the state stored in non-variables, + i.e. current-buffer and match-data. + (debugger-eval-expression): Rewrite using backtrace-eval. + * subr.el (internal--called-interactively-p--get-frame): Remove. + (called-interactively-p): + * emacs-lisp/edebug.el (edebug--called-interactively-skip): Use the new + `base' arg of backtrace-frame instead. + + 2013-07-26 Glenn Morris + + * align.el (align-regexp): Doc fix. (Bug#14857) + (align-region): Explicit error if subexpression missing/does not match. + + * simple.el (global-visual-line-mode): + Do not duplicate the mode lighter. (Bug#14858) + + 2013-07-25 Martin Rudalics + + * window.el (display-buffer): In display-buffer bind + split-window-keep-point to t, bug#14829. + + 2013-07-25 Juanma Barranquero + + * desktop.el: Rename internal "desktop-X" frame params to "desktop--X". + (desktop-filter-parameters-alist, desktop--filter-restore-desktop-parm) + (desktop--filter-save-desktop-parm, desktop--process-minibuffer-frames) + (desktop--select-frame, desktop--sort-states, desktop-restore-frames): + Change accordingly. + (desktop--select-frame, desktop--sort-states, desktop-restore-frames): + Use pcase-let, pcase-let* to deobfuscate access to desktop--mini values. + + 2013-07-25 Glenn Morris + + * dired-x.el (dired-mark-extension): Convert comment to doc string. + + 2013-07-25 Juanma Barranquero + + * desktop.el (desktop--make-frame): Do not pass the `fullscreen' + parameter to modify-frame-parameters if the value has not changed; + this is a workaround for bug#14949. + (desktop--make-frame): On cl-delete-if call, check parameter name, + not full parameter. + +2013-07-30 Xue Fuqiao + + * vc/vc.el (vc-ignore): New function. + + * vc/vc-svn.el (vc-svn-ignore): New function. + + * vc/vc-hg.el (vc-hg-ignore): New function. + + * vc/vc-git.el (vc-git-ignore): New function. + + * vc/vc-dir.el (vc-dir-mode-map): Add key binding for vc-dir-ignore + (vc-dir-ignore): New function. + + * vc/vc-cvs.el (vc-cvs-ignore): New function. + (cvs-append-to-ignore): Moved from pcvs.el. + + * vc/vc-bzr.el (vc-bzr-ignore): New function. + + * vc/pcvs.el (vc-cvs): Require 'vc-cvs. + 2013-07-24 Juanma Barranquero * desktop.el (desktop-restoring-frames-p): Return a true boolean.