Merge from emacs-24; up to 2014-07-17T10:18:19Z!dmantipov@yandex.ru

diff --cc lisp/ChangeLog
index 20a2d76c751d9d045cdf93f090e1fe9555434180,736bc591c2a45d2e8ff7f580dfa90e7b1894cb91..73693ed78e49365a0a366f3ed563e1779a96cb7b
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -11,46 -11,10 +11,46 @@@
  2014-10-03  Stefan Monnier  <monnier@iro.umontreal.ca>
  
        * 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  <rgm@gnu.org>
 +2014-10-03  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      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  <rayners@gmail.com>  (tiny change)
 +
 +      * term/ns-win.el: Add functions to ns frame, not x frame (bug#18614).
 +
 +2014-10-02  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * 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  <rgm@gnu.org>
  
        * emacs-lisp/package.el (package-import-keyring):
        Create gnupg directory private.  (Bug#17625#155)

diff --cc lisp/org/ChangeLog
index 036bf8251682974db7c987330b9bd001d7ca4034,0639ddf3a91fa56aae6a2dca681f398fd3f13143..5a8a9b250a112f41e3c1da89775016d4bccd8761
--- 1/lisp/org/ChangeLog
--- 2/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  <marcowahlsoft@gmail.com>  (tiny change)
 -2014-10-02  Marco Wahl  <marcowahlsoft@gmail.com>  (tiny change)
++2014-10-03  Marco Wahl  <marcowahlsoft@gmail.com>  (tiny change)
  
        * org-agenda.el (org-agenda-bulk-mark)
        (org-agenda-bulk-mark-regexp, org-agenda-bulk-toggle-all): Fix