From: Glenn Morris <rgm@gnu.org>
Date: Mon, 12 Nov 2018 17:38:27 +0000 (-0800)
Subject: Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~4179
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=23209e2c194f20deba26d8894a25f0ac4a607fe3;p=emacs.git

Merge from origin/emacs-26

913c001 * lisp/files.el (write-file): Clarify the doc string.  (Bug#3...
d614b84 Fix typos in midnight.el
8c2778a Improve documentation of 'move-file-to-trash'
c7b8a51 ; * doc/lispref/functions.texi (Anonymous Functions): Fix typo.
92296de * src/data.c (Ftype_of): xwidget objects are possible! (bug#3...
a3242cc Improve documentation of Diff mode
39e85a0 Note that lex bound lambda forms are not self-quoting (Bug#33...
fa605f2 Rewrite buffer display related doc-strings and doc
aa55659 Fix call to GlobalMemoryStatusEx in w32.c

# Conflicts:
#	doc/emacs/files.texi
#	src/data.c
---

23209e2c194f20deba26d8894a25f0ac4a607fe3
diff --cc doc/emacs/files.texi
index 6c68075ae4a,e4b97e58fca..649fa8bcb4d
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@@ -1435,15 -1440,17 +1440,17 @@@ has such a header before the first hun
  
  @vindex diff-update-on-the-fly
    You can edit a Diff mode buffer like any other buffer.  (If it is
- read-only, you need to make it writable first.  @xref{Misc Buffer}.)
- Whenever you change a hunk, Diff mode attempts to automatically
- correct the line numbers in the hunk headers, to ensure that the patch
- remains correct.  To disable automatic line number correction,
- change the variable @code{diff-update-on-the-fly} to @code{nil}.
- 
-   Diff mode treats each hunk as an error message, similar to
- Compilation mode.  Thus, you can use commands such as @kbd{M-g M-n} to
- visit the corresponding source locations.  @xref{Compilation Mode}.
+ read-only, you need to make it writable first; see @ref{Misc Buffer}.)
+ Whenever you edit a hunk, Diff mode attempts to automatically correct
+ the line numbers in the hunk headers, to ensure that the patch remains
+ correct, and could still be applied by @command{patch}.  To disable
+ automatic line number correction, change the variable
+ @code{diff-update-on-the-fly} to @code{nil}.
+ 
+   Diff mode arranges for hunks to be treated as compiler error
 -messages by @kbd{C-x `} and other commands that handle error messages
++messages by @kbd{M-g M-n} and other commands that handle error messages
+ (@pxref{Compilation Mode}).  Thus, you can use the compilation-mode
+ commands to visit the corresponding source locations.
  
    In addition, Diff mode provides the following commands to navigate,
  manipulate and apply parts of patches:
diff --cc src/data.c
index f8b991e8981,0a098c99949..0980cf99886
--- a/src/data.c
+++ b/src/data.c
@@@ -267,11 -276,12 +267,13 @@@ for example, (type-of 1) returns `integ
            }
          case PVEC_MODULE_FUNCTION:
            return Qmodule_function;
+         case PVEC_XWIDGET:
+           return Qxwidget;
+         case PVEC_XWIDGET_VIEW:
+           return Qxwidget_view;
          /* "Impossible" cases.  */
 +	case PVEC_MISC_PTR:
-         case PVEC_XWIDGET:
          case PVEC_OTHER:
-         case PVEC_XWIDGET_VIEW:
          case PVEC_SUB_CHAR_TABLE:
          case PVEC_FREE: ;
          }