From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 10 Oct 2016 14:35:33 +0000 (-0700)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~1490
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=be589ea0dc71063d26595378df303a2a1c25ee4e;p=emacs.git

; Merge from origin/emacs-25

The following commits were skipped:

a6e0a67 gitmerge: Add cherry pick to gitmerge-skip-regexp
fb12af2 ; Merge: some backports from master
6234012 Don't require isearch-update before isearch-done
5e50114 Avoid error in icalendar--read-element
ace9d22 Make a menu less ambiguous
e683495 Doc fix for url-http
---

be589ea0dc71063d26595378df303a2a1c25ee4e