git.eshelyaron.com Git - emacs.git/commit

]> git.eshelyaron.com Git - emacs.git/commit

author	Glenn Morris <rgm@gnu.org>
	Wed, 28 Mar 2018 16:38:22 +0000 (09:38 -0700)
committer	Glenn Morris <rgm@gnu.org>
	Wed, 28 Mar 2018 16:38:22 +0000 (09:38 -0700)
commit	7d8234c0cb9daac31ae2f660f503a3ede7324549
tree	62529bfe7a2ba90f934f416031cbc62930f7124f	tree \| snapshot
parent	e6bb547353915b376b663fda32f88d1bf8f24d1f	commit \| diff
parent	9bff405d09f6eeeb577e6e0111e49f35d3b95b52	commit \| diff

Merge from origin/emacs-26

9bff405 (origin/emacs-26) * doc/misc/org.texi (Installation): Fix clo...
613c9a5 Update Org to v9.1.9
1b075a9 ; Fix some tiny doc typos
441fe20 De-obsolete `if-let' and `when-let'
8696038 * lisp/htmlfontify.el (hfy-begin-span-handler): Doc fix.
930f7b1 * doc/lispref/functions.texi (Defining Functions): Improve in...
95ccf50 Fix crash after frame is freed on macOS (bug#30800)
45d0475 More manual editing
2acb9f0 Minor manual changes changes
d481cba * lisp/calculator.el (calculator-paste-decimals): Add version.
7d6c7d0 ; Use GNU not Gnu in docs
1bc4def More proofreading of the Emacs manual

Conflicts:
doc/misc/org.texi
etc/NEWS
lisp/org/org-clock.el

19 files changed:

doc/emacs/custom.texi	diff1 \|	diff2 \|	blob \| history
doc/emacs/emacs.texi	diff1 \|	diff2 \|	blob \| history
doc/emacs/mini.texi	diff1 \|	diff2 \|	blob \| history
doc/emacs/misc.texi	diff1 \|	diff2 \|	blob \| history
doc/lispref/functions.texi	diff1 \|	diff2 \|	blob \| history
doc/misc/org.texi	diff1 \|	diff2 \|	blob \| history
etc/NEWS.26	diff1 \|	\|	blob \| history
lisp/emacs-lisp/bytecomp.el	diff1 \|	diff2 \|	blob \| history
lisp/files.el	diff1 \|	diff2 \|	blob \| history
lisp/htmlfontify.el	diff1 \|	diff2 \|	blob \| history
lisp/org/org-agenda.el	diff1 \|	diff2 \|	blob \| history
lisp/org/org-element.el	diff1 \|	diff2 \|	blob \| history
lisp/org/org-indent.el	diff1 \|	diff2 \|	blob \| history
lisp/org/org-macs.el	diff1 \|	diff2 \|	blob \| history
lisp/org/org-pcomplete.el	diff1 \|	diff2 \|	blob \| history
lisp/org/org.el	diff1 \|	diff2 \|	blob \| history
lisp/org/ox-odt.el	diff1 \|	diff2 \|	blob \| history
lisp/progmodes/ebrowse.el	diff1 \|	diff2 \|	blob \| history
src/nsterm.m	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

doc/emacs/custom.texi	diff1 \|	diff2 \|	blob \| history
doc/emacs/emacs.texi	diff1 \|	diff2 \|	blob \| history
doc/emacs/mini.texi	diff1 \|	diff2 \|	blob \| history
doc/emacs/misc.texi	diff1 \|	diff2 \|	blob \| history
doc/lispref/functions.texi	diff1 \|	diff2 \|	blob \| history
doc/misc/org.texi	diff1 \|	diff2 \|	blob \| history
etc/NEWS.26	diff1 \|	\|	blob \| history
lisp/emacs-lisp/bytecomp.el	diff1 \|	diff2 \|	blob \| history
lisp/files.el	diff1 \|	diff2 \|	blob \| history
lisp/htmlfontify.el	diff1 \|	diff2 \|	blob \| history
lisp/org/org-agenda.el	diff1 \|	diff2 \|	blob \| history
lisp/org/org-element.el	diff1 \|	diff2 \|	blob \| history
lisp/org/org-indent.el	diff1 \|	diff2 \|	blob \| history
lisp/org/org-macs.el	diff1 \|	diff2 \|	blob \| history
lisp/org/org-pcomplete.el	diff1 \|	diff2 \|	blob \| history
lisp/org/org.el	diff1 \|	diff2 \|	blob \| history
lisp/org/ox-odt.el	diff1 \|	diff2 \|	blob \| history
lisp/progmodes/ebrowse.el	diff1 \|	diff2 \|	blob \| history
src/nsterm.m	diff1 \|	diff2 \|	blob \| history