From: Glenn Morris Date: Fri, 3 Oct 2014 16:07:31 +0000 (-0700) Subject: Merge from emacs-24; up to 2014-07-17T10:18:19Z!dmantipov@yandex.ru X-Git-Tag: emacs-25.0.90~2635^2~679^2~142 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=259a0b6d3bc6ffe0d5d24368e415fa46f439a844;p=emacs.git Merge from emacs-24; up to 2014-07-17T10:18:19Z!dmantipov@yandex.ru --- 259a0b6d3bc6ffe0d5d24368e415fa46f439a844 diff --cc lisp/ChangeLog index 20a2d76c751,736bc591c2a..73693ed78e4 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -11,46 -11,10 +11,46 @@@ 2014-10-03 Stefan Monnier * vc/vc-svn.el (vc-svn-after-dir-status): Fix the non-remote regexp, - similarly to Roger's 2010-06-12 change for the remote change + similarly to Rogers's 2010-06-16 change for the remote case (bug#18605). -2014-10-01 Glenn Morris +2014-10-03 Stefan Monnier + + New gui-selection-value consolidating x-selection-value. + * select.el (gui-selection-value-alist): New method. + (gui-selection-value): New function. + (x-selection-value): Make it an obsolete alias. + * simple.el (interprogram-paste-function): Default to + gui-selection-value. + * w32-common-fns.el (w32-get-selection-value): Simplify. + (x-selection-value): Remove alias. + (interprogram-paste-function): Don't set. + (gui-selection-value): Define for w32. + * term/x-win.el (gui-selection-value): Define for x. + (x--selection-value): Rename from x--selection-value. + (interprogram-paste-function): Don't set. + * term/pc-win.el (w16-get-selection-value): Simplify. + (msdos-initialize-window-system): Don't set + interprogram-paste-function. + (gui-selection-value): Define for pc. + * term/ns-win.el (x-selection-value): Remove. + (gui-selection-value): Define for ns, instead. + * term/common-win.el (x-setup-function-keys): Don't set + interprogram-paste-function. + * obsolete/mouse-sel.el (mouse-sel-get-selection-function): + Use gui-selection-value. + +2014-10-02 David Raynes (tiny change) + + * term/ns-win.el: Add functions to ns frame, not x frame (bug#18614). + +2014-10-02 Stefan Monnier + + * obsolete/lucid.el (read-number): Remove, redundant. + * obsolete/cl-compat.el (cl-floor, cl-ceiling, cl-round, cl-truncate): + Remove, broken. + +2014-10-02 Glenn Morris * emacs-lisp/package.el (package-import-keyring): Create gnupg directory private. (Bug#17625#155) diff --cc lisp/org/ChangeLog index 036bf825168,0639ddf3a91..5a8a9b250a1 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@@ -587,7 -587,7 +587,7 @@@ * ox-ascii.el (org-ascii--box-string): Choose more universal Unicode characters for boxquote corners. - 2014-10-03 marcowahlsoft@gmail.com (tiny change) -2014-10-02 Marco Wahl (tiny change) ++2014-10-03 Marco Wahl (tiny change) * org-agenda.el (org-agenda-bulk-mark) (org-agenda-bulk-mark-regexp, org-agenda-bulk-toggle-all): Fix