From: Glenn Morris <rgm@gnu.org>
Date: Wed, 10 Apr 2019 16:07:16 +0000 (-0700)
Subject: Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~3261^2~8
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7f88eecd7cd0054a83f5cad61ddde1830f3539a3;p=emacs.git

Merge from origin/emacs-26

a5da653 * src/editfns.c (Fnarrow_to_region): Doc fix.  (Bug#35163)
646d33d Fix doc strings of 'vc-version-diff' and 'vc-version-ediff'
a30a6c3 Improve documentation of set-window-start
92ce2dd Improve documentation of window parameters
6dc42c5 Improve commentary in frame.el
a8cffcf Fix typo in a doc string
9e79f19 (emacs-26) ; * src/fontset.c (set-fontset-font): Use uppercas...

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

7f88eecd7cd0054a83f5cad61ddde1830f3539a3
diff --cc src/editfns.c
index bfffadc733d,9b76ae23ffd..6fb43af4e9c
--- a/src/editfns.c
+++ b/src/editfns.c
@@@ -2686,14 -3840,15 +2686,15 @@@ but is not deleted; if you save the buf
  text is included in the file.  \\[widen] makes all visible again.
  See also `save-restriction'.
  
- When calling from a program, pass two arguments; positions (integers
- or markers) bounding the text that should remain visible.  */)
+ When calling from Lisp, pass two arguments START and END:
+ positions (integers or markers) bounding the text that should
+ remain visible.  */)
    (register Lisp_Object start, Lisp_Object end)
  {
 -  CHECK_NUMBER_COERCE_MARKER (start);
 -  CHECK_NUMBER_COERCE_MARKER (end);
 +  CHECK_FIXNUM_COERCE_MARKER (start);
 +  CHECK_FIXNUM_COERCE_MARKER (end);
  
 -  if (XINT (start) > XINT (end))
 +  if (XFIXNUM (start) > XFIXNUM (end))
      {
        Lisp_Object tem;
        tem = start; start = end; end = tem;