From: Glenn Morris Date: Fri, 15 Aug 2014 04:34:06 +0000 (-0700) Subject: Merge from emacs-24; up to 2014-06-29T18:32:35Z!michael.albinus@gmx.de X-Git-Tag: emacs-25.0.90~2635^2~679^2~465 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ed30c57cc9cdcf8ddc169f4b042146db9b3b7179;p=emacs.git Merge from emacs-24; up to 2014-06-29T18:32:35Z!michael.albinus@gmx.de --- ed30c57cc9cdcf8ddc169f4b042146db9b3b7179 diff --cc lisp/ChangeLog index 713a1aab838,0e4a59b8374..f96921d4329 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,66 -1,12 +1,75 @@@ -2014-08-13 Leo Liu ++2014-08-15 Leo Liu + + * speedbar.el (speedbar-generic-list-tag-p): Allow special + elements from imenu. + -2014-08-11 Glenn Morris ++2014-08-15 Glenn Morris + + * subr.el (with-output-to-temp-buffer): Doc fix; from elisp manual. + +2014-08-13 Jan Nieuwenhuizen + + * progmodes/compile.el (compilation-error-regexp-alist-alist): + Add Guile regexpses. + +2014-08-13 Jan Nieuwenhuizen + + * progmodes/gud.el (guiler): New function. Starts the Guile REPL; + add Guile debugger support for GUD. - ++ +2014-08-13 Stefan Monnier + + * obsolete/mouse-sel.el (mouse-sel-mode): Use add/remove-function. + (mouse-sel--ignore): New function. + (mouse-sel-has-been-enabled, mouse-sel-original-bindings) + (mouse-sel-original-interprogram-cut-function) + (mouse-sel-original-interprogram-paste-function): Remove. + +2014-08-13 Eric S. Raymond + + * vc/vc.git.el (vc-git-find-file-hook): New function. + Adds support for calling smerge on a conflicted file, and calling + "git add" when there are no longer conflict markers in a saved file. + This is a completed version of Rüdiger Sonderfeld's proposal. + (vc-git-conflicted-files): New function. + Integrate Rüdiger Sonderfeld's code for detecting conflicted files + using a status listing. Useful in itself and a step towards better + smerge support. + +2014-08-12 Stefan Monnier + + * mpc.el (mpc-reorder): Don't bother splitting the "active"s elements + to the first part if they're the same as the selection. + +2014-08-12 Lars Magne Ingebrigtsen + + * image-mode.el (image-transform-reset): New command and menu item. + (image-mode-map): Rearrange the menu items to put presumably more + obscure items at the end. + +2014-08-12 Juri Linkov + + * vc/vc-annotate.el (vc-annotate-background-mode): + Use `with-demoted-errors' instead of `ignore-errors'. (Bug#18189) + +2014-08-12 Stefan Monnier + + * files.el (out-of-memory-warning-percentage): Turn it off by default. + +2014-08-11 Sam Steingold + + * textmodes/sgml-mode.el (sgml-validate-command): Set depending on + the presence of known validators (tidy, (o)nsgmls). + +2014-08-11 Ulf Jasper + + Newsticker: introduce `newsticker-treeview-date-format'. (Bug#17227) + + * net/newst-treeview.el (newsticker-treeview-date-format): New. + (newsticker--treeview-list-add-item): Use `newsticker-treeview-date-format'. + +2014-08-11 Glenn Morris + * files.el (basic-save-buffer-2): Revert 2013-01-31 change, which chose coding system for writing before backing up, since it causes a more serious problem than the one it solves. (Closes Bug#18141, diff --cc src/ChangeLog index b3d38fa0310,628fa26d778..91b72e479d7 --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,14 -1,8 +1,19 @@@ -2014-08-11 Ken Brown ++2014-08-15 Ken Brown + + * gmalloc.c (_malloc_mutex, _aligned_blocks_mutex) [CYGWIN]: Use + ERRORCHECK mutexes. (Bug#18222) + +2014-08-12 Martin Rudalics + + * frame.c (set_menu_bar_lines_1): Remove. + (set_menu_bar_lines): Call change_frame_size instead of + set_menu_bar_lines_1. + +2014-08-11 Jan Djärv + + * nsfns.m (Fx_create_frame): Call adjust_frame_size, + set f->official. + 2014-08-11 Glenn Morris * fileio.c: Revert 2013-01-31 change, which chose coding system for