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

; Merge from origin/emacs-25

The following commits were skipped:

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
---

2923b3dd14b9a5a46df210e2fef7e65742e7f75d