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

6 files changed, 36 insertions, 23 deletions

diff --git a/doc/emacs/abbrevs.texi b/doc/emacs/abbrevs.texi
index 8cb7a4838e9..117d07e2814 100644
--- a/doc/emacs/abbrevs.texi
+++ b/doc/emacs/abbrevs.texi
@@ -388,6 +388,9 @@ words that follow the expansion in its original context.  Simply type
 @kbd{@key{SPC} M-/} for each additional word you want to copy.  The
 spacing and punctuation between words is copied along with the words.
 
+  You can control the way @kbd{M-/} determines the word to expand and
+how to expand it, see @ref{Dabbrev Customization}.
+
   The command @kbd{C-M-/} (@code{dabbrev-completion}) performs
 completion of a dynamic abbrev.  Instead of trying the possible
 expansions one by one, it finds all of them, then inserts the text
@@ -437,12 +440,17 @@ copies the expansion verbatim including its case pattern.
 
 @vindex dabbrev-abbrev-char-regexp
   The variable @code{dabbrev-abbrev-char-regexp}, if non-@code{nil},
-controls which characters are considered part of a word, for dynamic expansion
-purposes.  The regular expression must match just one character, never
-two or more.  The same regular expression also determines which
-characters are part of an expansion.  The (default) value @code{nil}
-has a special meaning: dynamic abbrevs are made of word characters,
-but expansions are made of word and symbol characters.
+controls which characters are considered part of a word, for dynamic
+expansion purposes.  The regular expression must match just one
+character, never two or more.  The same regular expression also
+determines which characters are part of an expansion.  The (default)
+value @code{nil} has a special meaning: dynamic abbrevs (i.e.@: the
+word at point) are made of word characters, but their expansions are
+looked for as sequences of word and symbol characters.  This is
+generally appropriate for expanding symbols in a program source and
+also for human-readable text in many languages, but may not be what
+you want in a text buffer that includes unusual punctuation characters;
+in that case, the value @code{"\\sw"} might produce better results.
 
 @vindex dabbrev-abbrev-skip-leading-regexp
   In shell scripts and makefiles, a variable name is sometimes prefixed
diff --git a/lisp/emacs-lisp/easymenu.el b/lisp/emacs-lisp/easymenu.el
index 603bbcd9426..4fc9a783a5e 100644
--- a/lisp/emacs-lisp/easymenu.el
+++ b/lisp/emacs-lisp/easymenu.el
@@ -489,7 +489,7 @@ To implement dynamic menus, either call this from
 
 ;; XEmacs needs the following two functions to add and remove menus.
 ;; In Emacs this is done automatically when switching keymaps, so
-;; here easy-menu-remove is a noop.
+;; here easy-menu-remove and easy-menu-add are a noops.
 (defalias 'easy-menu-remove 'ignore
   "Remove MENU from the current menu bar.
 Contrary to XEmacs, this is a nop on Emacs since menus are automatically
@@ -497,15 +497,16 @@ Contrary to XEmacs, this is a nop on Emacs since menus are automatically
 
 \(fn MENU)")
 
-(defun easy-menu-add (_menu &optional _map)
+(defalias 'easy-menu-add #'ignore
   "Add the menu to the menubar.
-On Emacs, menus are already automatically activated when the
-corresponding keymap is activated.  On XEmacs this is needed to
-actually add the menu to the current menubar.
+On Emacs this is a nop, because menus are already automatically
+activated when the corresponding keymap is activated.  On XEmacs
+this is needed to actually add the menu to the current menubar.
 
 You should call this once the menu and keybindings are set up
-completely and menu filter functions can be expected to work."
-  )
+completely and menu filter functions can be expected to work.
+
+\(fn MENU &optional MAP)")
 
 (defun add-submenu (menu-path submenu &optional before in-menu)
   "Add submenu SUBMENU in the menu at MENU-PATH.
diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index c9f4e61a6fe..617c7835021 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -514,6 +514,7 @@ Currently this means either text/html or application/xhtml+xml."
              (< eww-redirect-level 5))
     (when-let (refresh (dom-attr dom 'content))
       (when (or (string-match "^\\([0-9]+\\) *;.*url=\"\\([^\"]+\\)\"" refresh)
+                (string-match "^\\([0-9]+\\) *;.*url='\\([^']+\\)'" refresh)
                 (string-match "^\\([0-9]+\\) *;.*url=\\([^ ]+\\)" refresh))
         (let ((timeout (match-string 1 refresh))
               (url (match-string 2 refresh))
diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index 634c6b57bdc..68ca37207ef 100644
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -551,14 +551,17 @@ may be any one of the following:
                         database and server) needed to connect to
                         the database.
 
- :sqli-comint-func      name of a function which accepts no
-                        parameters that will use the values of
-                        `sql-user', `sql-password',
-                        `sql-database', `sql-server' and
-                        `sql-port' to open a comint buffer and
-                        connect to the database.  Do product
+ :sqli-comint-func      function of two arguments, PRODUCT
+                        and OPTIONS, that will open a comint buffer
+                        and connect to the database.  PRODUCT is the
+                        first argument to be passed to `sql-comint',
+                        and OPTIONS should be included in its second
+                        argument.  The function should use the values
+                        of `sql-user', `sql-password', `sql-database',
+                        `sql-server' and `sql-port' to .  Do product
                         specific configuration of comint in this
-                        function.
+                        function.  See `sql-comint-oracle' for an
+                        example of such a function.
 
  :list-all              Command string or function which produces
                         a listing of all objects in the database.
diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el
index 261e98eabce..9143f97dce0 100644
--- a/lisp/textmodes/rst.el
+++ b/lisp/textmodes/rst.el
@@ -293,7 +293,7 @@ in parentheses follows the development revision and the time stamp.")
     ("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")
diff --git a/src/buffer.c b/src/buffer.c
index c00cc40d6f2..ff4a500c8b7 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -870,7 +870,7 @@ drop_overlay (struct buffer *b, struct Lisp_Overlay *ov)
 
 }
 
-/* Delete all overlays of B and reset it's overlay lists.  */
+/* Delete all overlays of B and reset its overlay lists.  */
 
 void
 delete_all_overlays (struct buffer *b)
@@ -1698,7 +1698,7 @@ cleaning up all windows currently displaying the buffer to be killed. */)
   if (EQ (buffer, XWINDOW (minibuf_window)->contents))
     return Qnil;
 
-  /* When we kill an ordinary buffer which shares it's buffer text
+  /* When we kill an ordinary buffer which shares its buffer text
      with indirect buffer(s), we must kill indirect buffer(s) too.
      We do it at this stage so nothing terrible happens if they
      ask questions or their hooks get errors.  */