From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 19 Mar 2017 19:27:55 +0000 (-0700)
Subject: Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~540
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=59ced4521ebdadaf48b9c22b7cda46407a8b942b;p=emacs.git

Merge from origin/emacs-25

5569e64 ; Spelling fixes
24a5f57 * lisp/net/eww.el (eww-tag-meta): Handle single quoted URLs (...
9b89896 * lisp/progmodes/sql.el (sql-product-alist): Doc tweak
69b50f5 * lisp/progmodes/sql.el (sql-product-alist): Doc fix.  (Bug#2...
42eae54 Improve documentation of dabbrevs
b0ade0d Clarify that easy-menu-add is a nop (Bug#25382)
3c69f2c * lisp/textmodes/rst.el (rst-package-emacs-version-alist): Fi...

# Conflicts:
#	lisp/textmodes/rst.el
---

59ced4521ebdadaf48b9c22b7cda46407a8b942b
diff --cc lisp/textmodes/rst.el
index 261e98eabce,7fbacbe358c..9143f97dce0
--- a/lisp/textmodes/rst.el
+++ b/lisp/textmodes/rst.el
@@@ -293,12 -267,7 +293,12 @@@ in parentheses follows the development 
      ("1.3.0" . "24.3")
      ("1.3.1" . "24.3")
      ("1.4.0" . "24.3")
-     ("1.4.1" . "24.5")
+     ("1.4.1" . "25.1")
 +    ("1.4.2" . "24.5")
 +    ("1.5.0" . "26.1")
 +    ("1.5.1" . "26.2")
 +    ("1.5.2" . "26.2")
 +    ;; Whatever the Emacs version is this rst.el version ends up in.
      ))
  
  (unless (assoc rst-official-version rst-package-emacs-version-alist)