Merge from origin/emacs-26

e5a2933 (origin/emacs-26) lisp/vc/: documentation fixes
f21f8e6 Document 'desktop-files-not-to-save'
d8917eb Improve documentation of Profiling features
b228839 Improve indexing of "performance" in ELisp manual
ab67b3e Minor change in Emacs manual's VC chapter
c352434 Avoid memory corruption with specpdl overflow + edebug (Bug#3...
593bbda Document comment-fill-column in the manual (Bug#11636)
bd4cc8d * doc/emacs/dired.texi (Marks vs Flags): Copyedits.
69107f3 ; Fix doc typos related to indefinite articles
aaad1e6 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emac...
5906418 More fixes for the Emacs manual
9ab3df1 ; Fix doc typos related to indefinite articles
66a4e65 ; Fix doc typos related to indefinite articles
35e5c57 ; Fix doc typos related to indefinite articles

diff --cc doc/emacs/dired.texi
Simple merge

diff --cc doc/emacs/programs.texi
Simple merge

diff --cc doc/lispintro/emacs-lisp-intro.texi
Simple merge

diff --cc doc/lispref/buffers.texi
Simple merge

diff --cc doc/lispref/debugging.texi
Simple merge

diff --cc doc/lispref/edebug.texi
Simple merge

diff --cc doc/lispref/package.texi
Simple merge

diff --cc doc/lispref/text.texi
Simple merge

diff --cc doc/misc/efaq.texi
Simple merge

diff --cc doc/misc/org.texi
Simple merge

diff --cc lisp/calendar/holidays.el
Simple merge

diff --cc lisp/calendar/todo-mode.el
Simple merge

diff --cc lisp/cedet/semantic/analyze.el
Simple merge

diff --cc lisp/cedet/semantic/lex.el
Simple merge

diff --cc lisp/cus-edit.el
Simple merge

diff --cc lisp/desktop.el
Simple merge

diff --cc lisp/emacs-lisp/benchmark.el
Simple merge

diff --cc lisp/emacs-lisp/edebug.el
Simple merge

diff --cc lisp/emacs-lisp/elp.el
Simple merge

diff --cc lisp/emacs-lisp/package.el
Simple merge

diff --cc lisp/epa.el
Simple merge

diff --cc lisp/filenotify.el
Simple merge

diff --cc lisp/gnus/gnus-agent.el
Simple merge

diff --cc lisp/gnus/gnus-cache.el
Simple merge

diff --cc lisp/gnus/gnus-cus.el
Simple merge

diff --cc lisp/gnus/gnus.el
Simple merge

diff --cc lisp/image/gravatar.el
Simple merge

diff --cc lisp/net/mailcap.el
Simple merge

diff --cc lisp/progmodes/cc-engine.el
Simple merge

diff --cc lisp/progmodes/python.el
Simple merge

diff --cc lisp/progmodes/sh-script.el
Simple merge

diff --cc lisp/textmodes/rst.el
Simple merge

diff --cc lisp/vc/add-log.el
Simple merge

diff --cc lisp/vc/vc-git.el
Simple merge

diff --cc lisp/vc/vc.el
index b87701536f88ec6c4823f591cc7fd3acdc5d9b95,93e9c25cbfd6382a59e5c535e573533d180bb058..01dc47e808923486134c6f7e1a01939f093601ec
--- 1/lisp/vc/vc.el
--- 2/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@@ -2415,10 -2415,13 +2415,13 @@@ When called interactively with a prefi
  
  ;;;###autoload
  (defun vc-region-history (from to)
-   "Show the history of the region FROM..TO."
+   "Show the history of the region between FROM and TO.
+ 
+ If called interactively, show the history between point and
+ mark."
    (interactive "r")
 -  (let* ((lfrom (line-number-at-pos from))
 -         (lto   (line-number-at-pos (1- to)))
 +  (let* ((lfrom (line-number-at-pos from t))
 +         (lto   (line-number-at-pos (1- to) t))
           (file buffer-file-name)
           (backend (vc-backend file))
           (buf (get-buffer-create "*VC-history*")))

diff --cc src/.gdbinit
Simple merge

diff --cc src/character.c
Simple merge

diff --cc src/character.h
Simple merge

diff --cc src/coding.c
Simple merge

diff --cc src/eval.c
Simple merge

diff --cc src/process.c
Simple merge

diff --cc src/regex.c
Simple merge

diff --cc src/syntax.c
Simple merge

diff --cc src/xdisp.c
Simple merge