]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from origin/emacs-26
authorGlenn Morris <rgm@gnu.org>
Sat, 27 Oct 2018 16:15:32 +0000 (09:15 -0700)
committerGlenn Morris <rgm@gnu.org>
Sat, 27 Oct 2018 16:15:32 +0000 (09:15 -0700)
df64da8 (origin/emacs-26) * lisp/simple.el (region-extract-function):...
520c486 * lisp/simple.el (region-bounds): Doc fix.  (Bug#33168)
9193db0 Improve documentation of 'process-connection-type'
106b9e1 Unify prompt for gnupg passphrase between GNU/Linux and MS-Wi...
2a41616 Doc fix of 'gnus-fetch-old-headers'
29a7644 Deactivate incorrect hyperlinking in gnus-build-sparse-thread...
53ae90f Minor copyedits in cmdargs.texi
fc2e65a Improve documentation of X resource loading
13132b3 * lisp/net/tramp-sh.el (tramp-inline-compress-commands):
8361292 ; Fix sorting in admin/MAINTAINERS
92de44f Don't error when indenting malformed Lisp (Bug#30891)
c3adbc8 Improve 'isearch-delete-char' documentation (Bug#32990)
6ca71ce ; * lisp/help.el (with-help-window): Remove extra space in doc.
f5f9583 Improve XPM load failure message (bug#33126)
f3d01d4 Avoid infloop in CPerl mode fontification
71a2d50 Fix minibuffer-help-form for lexical binding
7e8eee6 Fix some NS drawing issues (bug#32932)
d72975a * lisp/gnus/mm-util.el (mm-decompress-buffer): Fix split-stri...
c97a5f1 * doc/misc/calc.texi (Summary): The +/- key is 'p', not 'P'.

# Conflicts:
# lisp/gnus/mm-util.el

17 files changed:
1  2 
admin/MAINTAINERS
doc/emacs/search.texi
doc/lispref/processes.texi
doc/misc/calc.texi
etc/PROBLEMS
lisp/cus-edit.el
lisp/emacs-lisp/lisp-mode.el
lisp/epg.el
lisp/gnus/gnus-sum.el
lisp/gnus/mm-util.el
lisp/help.el
lisp/isearch.el
lisp/net/tramp-sh.el
lisp/progmodes/cperl-mode.el
lisp/simple.el
src/image.c
src/nsterm.m

Simple merge
Simple merge
Simple merge
Simple merge
diff --cc etc/PROBLEMS
Simple merge
Simple merge
Simple merge
diff --cc lisp/epg.el
Simple merge
Simple merge
Simple merge
diff --cc lisp/help.el
Simple merge
diff --cc lisp/isearch.el
Simple merge
Simple merge
Simple merge
diff --cc lisp/simple.el
Simple merge
diff --cc src/image.c
Simple merge
diff --cc src/nsterm.m
Simple merge