]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from origin/emacs-26
authorGlenn Morris <rgm@gnu.org>
Fri, 28 Sep 2018 14:54:24 +0000 (07:54 -0700)
committerGlenn Morris <rgm@gnu.org>
Fri, 28 Sep 2018 14:54:24 +0000 (07:54 -0700)
1908173 (origin/emacs-26) Fix Bug#32828
7f5086d * lisp/net/shr.el (shr-copy-url): Fix docstring.
d309994 Fix typos in documentation
25cdd65 ; Spellcheck two more documentation strings
c8bda05 ; * lisp/simple.el (save-interprogram-paste-before-kill): Fix...
dc7fdee * doc/emacs/kmacro.texi (Basic Keyboard Macro): Mention old b...
17766a1 Improve docs of functions/variables related to 'display-buffer'
a363931 * lisp/mouse.el (tear-off-window): Fix non-mouse use (bug#32799)
8b8a4c0 Improve documentation of directory-local variables
c9c9756 Don't use obsolete variable 'save-place' in documentation
ca208e8 Use save-place-mode instead of save-place

18 files changed:
1  2 
doc/emacs/custom.texi
doc/lispref/control.texi
doc/lispref/os.texi
doc/misc/calc.texi
doc/misc/eshell.texi
doc/misc/gnus.texi
doc/misc/org.texi
doc/misc/tramp.texi
doc/misc/url.texi
lisp/files.el
lisp/menu-bar.el
lisp/mouse.el
lisp/net/dbus.el
lisp/net/shr.el
lisp/saveplace.el
lisp/simple.el
lisp/window.el
src/keymap.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc lisp/files.el
Simple merge
Simple merge
diff --cc lisp/mouse.el
Simple merge
Simple merge
diff --cc lisp/net/shr.el
Simple merge
Simple merge
diff --cc lisp/simple.el
Simple merge
diff --cc lisp/window.el
Simple merge
diff --cc src/keymap.c
Simple merge