[Emacs-diffs] trunk r118029: Merge from emacs-24; up to r117546

[Glenn Morris]

------------------------------------------------------------
revno: 118029 [merge]
revision-id: address@hidden
parent: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2014-10-03 09:07:31 -0700
message:
  Merge from emacs-24; up to r117546
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/org/ChangeLog             changelog-20091113204419-o5vbwnq5f7feedwu-8688

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-10-03 15:44:46 +0000
+++ b/lisp/ChangeLog    2014-10-03 16:07:31 +0000
@@ -6,12 +6,12 @@
 2014-10-03  Martin Rudalics  <address@hidden>
 
        * frame.el (toggle-frame-maximized, toggle-frame-fullscreen):
-       In doc-string mention need of setting `frame-resize-pixelwise'.
+       In doc-string mention need to set `frame-resize-pixelwise'.
 
 2014-10-03  Stefan Monnier  <address@hidden>
 
        * 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-03  Stefan Monnier  <address@hidden>

=== modified file 'lisp/org/ChangeLog'
--- a/lisp/org/ChangeLog        2014-10-03 15:44:46 +0000
+++ b/lisp/org/ChangeLog        2014-10-03 16:07:31 +0000
@@ -587,7 +587,7 @@
        * ox-ascii.el (org-ascii--box-string): Choose more universal
        Unicode characters for boxquote corners.
 
-2014-10-03  address@hidden  <address@hidden>  (tiny change)
+2014-10-03  Marco Wahl  <address@hidden>  (tiny change)
 
        * org-agenda.el (org-agenda-bulk-mark)
        (org-agenda-bulk-mark-regexp, org-agenda-bulk-toggle-all): Fix