From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 26 Sep 2016 20:39:17 +0000 (-0700)
Subject: Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~1541
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a2513667af6c1cfc58e971b9a5476cd5edfaef1c;p=emacs.git

Merge from origin/emacs-25

9fc9988 Improve documentation of 'expand-abbrev' and wrapper hooks
c14a1d4 Minor copyedits of MS-Windows installation instructions
f281924 Fix display of cursor when 'blink-cursor-delay' has small value

# Conflicts:
#	lisp/minibuffer.el
---

a2513667af6c1cfc58e971b9a5476cd5edfaef1c
diff --cc lisp/abbrev.el
index 163dc8e5727,8c4f6eb01b2..b6d202c1807
--- a/lisp/abbrev.el
+++ b/lisp/abbrev.el
@@@ -846,9 -846,10 +846,10 @@@ be the abbrev symbol if expansion occur
  
  (defun abbrev--default-expand ()
    "Default function to use for `abbrev-expand-function'.
- This respects the wrapper hook `abbrev-expand-functions'.
+ This also respects the obsolete wrapper hook `abbrev-expand-functions'.
+ \(See `with-wrapper-hook' for details about wrapper hooks.)
  Calls `abbrev-insert' to insert any expansion, and returns what it does."
 -  (with-wrapper-hook abbrev-expand-functions ()
 +  (subr--with-wrapper-hook-no-warnings abbrev-expand-functions ()
      (pcase-let ((`(,sym ,name ,wordstart ,wordend) (abbrev--before-point)))
        (when sym
          (let ((startpos (copy-marker (point) t))
diff --cc lisp/minibuffer.el
index 9190c1fb203,c7f7c4122c3..3d63ca8bd5f
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@@ -1969,8 -1970,9 +1970,9 @@@ if there was no valid completion, else 
  (defun completion--in-region (start end collection &optional predicate)
    "Default function to use for `completion-in-region-function'.
  Its arguments and return value are as specified for `completion-in-region'.
- This respects the wrapper hook `completion-in-region-functions'."
+ Also respects the obsolete wrapper hook `completion-in-region-functions'.
+ \(See `with-wrapper-hook' for details about wrapper hooks.)"
 -  (with-wrapper-hook
 +  (subr--with-wrapper-hook-no-warnings
        ;; FIXME: Maybe we should use this hook to provide a "display
        ;; completions" operation as well.
        completion-in-region-functions (start end collection predicate)
diff --cc lisp/simple.el
index 7e68baa02f8,c7d3b2e6b0b..dd253aec7d5
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@@ -4162,11 -4051,11 +4163,12 @@@ that are special to a buffer, and shoul
  (defun buffer-substring--filter (beg end &optional delete)
    "Default function to use for `filter-buffer-substring-function'.
  Its arguments and return value are as specified for `filter-buffer-substring'.
- This respects the wrapper hook `filter-buffer-substring-functions',
+ Also respects the obsolete wrapper hook `filter-buffer-substring-functions'
+ \(see `with-wrapper-hook' for details about wrapper hooks),
  and the abnormal hook `buffer-substring-filters'.
  No filtering is done unless a hook says to."
 -  (with-wrapper-hook filter-buffer-substring-functions (beg end delete)
 +  (subr--with-wrapper-hook-no-warnings
 +    filter-buffer-substring-functions (beg end delete)
      (cond
       ((or delete buffer-substring-filters)
        (save-excursion