]> git.eshelyaron.com Git - emacs.git/commit
Merge from origin/emacs-26
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 1 Jan 2018 09:13:04 +0000 (01:13 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 1 Jan 2018 09:13:04 +0000 (01:13 -0800)
commitbb267f17f9e1e593d8dee379aceee22d7fa42680
tree466dfb3f8ef7587ebcb652709bd1cc05d18a92f3
parenta5835dfee139322de7aa071f1c87ef015acbecad
parent63b04c11d530f4a6a41f112d1b3ba1ed1eb81195
Merge from origin/emacs-26

63b04c11d5 Fix copyright years by hand
5c7dd8a783 Update copyright year to 2018
220a9ecba1 Merge from Gnulib
312c565566 Don't add empty keyboard macro to macro ring (Bug#24992)
39ca289a7a Allow customization of decoding of "man" command
f8240815ea * etc/NEWS: Add security consideration note on passphrase ...
0c78822c70 Fix subtle problem with scroll-down when scroll-margin is ...
acd289c5a4 Fix problems with indexing in User manual
b240c7846b * lisp/help.el (describe-key): Only (copy-sequence elt) wh...
e879a5444a * src/buffer.c (Frestore_buffer_modified_p): Fix bug#29846
81b1028b63 Improve documentation of 'inhibit-modification-hooks' and ...
7175496d7a Fix doc string of 'enable-recursive-minibuffers'
5b38406491 Fix documentation of delsel and of killing text

# Conflicts:
# etc/NEWS
# etc/refcards/ru-refcard.tex
322 files changed:
Makefile.in
README
admin/authors.el
admin/gitmerge.el
admin/grammars/make.by
admin/merge-gnulib
admin/nt/dist-build/build-dep-zips.py
admin/nt/dist-build/build-zips.sh
configure.ac
doc/emacs/dired.texi
doc/emacs/files.texi
doc/emacs/text.texi
doc/lispref/edebug.texi
doc/lispref/elisp.texi
doc/lispref/eval.texi
doc/lispref/files.texi
doc/lispref/functions.texi
doc/lispref/numbers.texi
doc/lispref/strings.texi
doc/lispref/text.texi
doc/misc/auth.texi
doc/misc/ert.texi
doc/misc/gnus.texi
doc/misc/tramp.texi
doc/misc/trampver.texi
etc/DEBUG
etc/NEWS.26
etc/PROBLEMS
etc/refcards/ru-refcard.tex
lib/gnulib.mk.in
lisp/allout-widgets.el
lisp/allout.el
lisp/ansi-color.el
lisp/auth-source-pass.el
lisp/auth-source.el
lisp/autoinsert.el
lisp/bindings.el
lisp/calendar/cal-dst.el
lisp/calendar/calendar.el
lisp/calendar/diary-lib.el
lisp/calendar/solar.el
lisp/calendar/todo-mode.el
lisp/cedet/ede/detect.el
lisp/cedet/pulse.el
lisp/cedet/semantic.el
lisp/cedet/semantic/analyze.el
lisp/cedet/semantic/analyze/refs.el
lisp/cedet/semantic/lex.el
lisp/cedet/semantic/symref/filter.el
lisp/cedet/srecode/dictionary.el
lisp/cedet/srecode/map.el
lisp/comint.el
lisp/cus-edit.el
lisp/delim-col.el
lisp/desktop.el
lisp/dired-aux.el
lisp/dired.el
lisp/electric.el
lisp/emacs-lisp/advice.el
lisp/emacs-lisp/benchmark.el
lisp/emacs-lisp/byte-opt.el
lisp/emacs-lisp/bytecomp.el
lisp/emacs-lisp/checkdoc.el
lisp/emacs-lisp/cl-generic.el
lisp/emacs-lisp/cl-macs.el
lisp/emacs-lisp/cl-print.el
lisp/emacs-lisp/copyright.el
lisp/emacs-lisp/debug.el
lisp/emacs-lisp/derived.el
lisp/emacs-lisp/easy-mmode.el
lisp/emacs-lisp/edebug.el
lisp/emacs-lisp/eieio-base.el
lisp/emacs-lisp/eieio.el
lisp/emacs-lisp/elint.el
lisp/emacs-lisp/elp.el
lisp/emacs-lisp/ert.el
lisp/emacs-lisp/find-func.el
lisp/emacs-lisp/gv.el
lisp/emacs-lisp/lisp-mode.el
lisp/emacs-lisp/lisp.el
lisp/emacs-lisp/package.el
lisp/emacs-lisp/testcover.el
lisp/emacs-lisp/thunk.el
lisp/epa.el
lisp/erc/erc-autoaway.el
lisp/erc/erc-backend.el
lisp/erc/erc-button.el
lisp/erc/erc-capab.el
lisp/erc/erc-compat.el
lisp/erc/erc-dcc.el
lisp/erc/erc-desktop-notifications.el
lisp/erc/erc-ezbounce.el
lisp/erc/erc-fill.el
lisp/erc/erc-identd.el
lisp/erc/erc-imenu.el
lisp/erc/erc-join.el
lisp/erc/erc-list.el
lisp/erc/erc-log.el
lisp/erc/erc-match.el
lisp/erc/erc-menu.el
lisp/erc/erc-netsplit.el
lisp/erc/erc-notify.el
lisp/erc/erc-page.el
lisp/erc/erc-pcomplete.el
lisp/erc/erc-replace.el
lisp/erc/erc-ring.el
lisp/erc/erc-services.el
lisp/erc/erc-sound.el
lisp/erc/erc-speedbar.el
lisp/erc/erc-spelling.el
lisp/erc/erc-stamp.el
lisp/erc/erc-track.el
lisp/erc/erc-truncate.el
lisp/erc/erc-xdcc.el
lisp/erc/erc.el
lisp/eshell/em-hist.el
lisp/filecache.el
lisp/files.el
lisp/find-dired.el
lisp/format.el
lisp/gnus/gnus-agent.el
lisp/gnus/gnus-art.el
lisp/gnus/gnus-cache.el
lisp/gnus/gnus-cloud.el
lisp/gnus/gnus-cus.el
lisp/gnus/gnus-group.el
lisp/gnus/gnus-html.el
lisp/gnus/gnus-icalendar.el
lisp/gnus/gnus-range.el
lisp/gnus/gnus-registry.el
lisp/gnus/gnus-score.el
lisp/gnus/gnus-srvr.el
lisp/gnus/gnus-sum.el
lisp/gnus/gnus-topic.el
lisp/gnus/gnus-util.el
lisp/gnus/gnus-win.el
lisp/gnus/gnus.el
lisp/gnus/message.el
lisp/gnus/nndiary.el
lisp/gnus/nnmail.el
lisp/gnus/nnrss.el
lisp/gnus/score-mode.el
lisp/help-fns.el
lisp/help-mode.el
lisp/ibuf-ext.el
lisp/ibuf-macs.el
lisp/ibuffer.el
lisp/image.el
lisp/image/gravatar.el
lisp/info-look.el
lisp/kmacro.el
lisp/macros.el
lisp/mail/binhex.el
lisp/mail/emacsbug.el
lisp/mail/flow-fill.el
lisp/mail/footnote.el
lisp/mail/hashcash.el
lisp/mail/ietf-drums.el
lisp/mail/rfc2231.el
lisp/mail/rmail.el
lisp/mail/sendmail.el
lisp/mail/smtpmail.el
lisp/mail/uudecode.el
lisp/mail/yenc.el
lisp/man.el
lisp/mh-e/mh-letter.el
lisp/minibuffer.el
lisp/mpc.el
lisp/net/ange-ftp.el
lisp/net/mailcap.el
lisp/net/newst-backend.el
lisp/net/tramp-adb.el
lisp/net/tramp-cache.el
lisp/net/tramp-cmds.el
lisp/net/tramp-compat.el
lisp/net/tramp-gvfs.el
lisp/net/tramp-sh.el
lisp/net/tramp-smb.el
lisp/net/tramp.el
lisp/net/trampver.el
lisp/newcomment.el
lisp/nxml/rng-maint.el
lisp/play/gamegrid.el
lisp/printing.el
lisp/progmodes/cperl-mode.el
lisp/progmodes/cpp.el
lisp/progmodes/ebnf-abn.el
lisp/progmodes/ebnf-bnf.el
lisp/progmodes/ebnf-dtd.el
lisp/progmodes/ebnf-ebx.el
lisp/progmodes/ebnf-iso.el
lisp/progmodes/ebnf-otz.el
lisp/progmodes/ebnf-yac.el
lisp/progmodes/ebnf2ps.el
lisp/progmodes/elisp-mode.el
lisp/progmodes/etags.el
lisp/progmodes/flymake-proc.el
lisp/progmodes/flymake.el
lisp/progmodes/gdb-mi.el
lisp/progmodes/idlwave.el
lisp/progmodes/js.el
lisp/progmodes/sh-script.el
lisp/ps-def.el
lisp/ps-mule.el
lisp/ps-print.el
lisp/ps-samp.el
lisp/register.el
lisp/registry.el
lisp/replace.el
lisp/rtree.el
lisp/ruler-mode.el
lisp/simple.el
lisp/startup.el
lisp/subr.el
lisp/svg.el
lisp/term/common-win.el
lisp/term/ns-win.el
lisp/term/pc-win.el
lisp/term/w32-win.el
lisp/term/x-win.el
lisp/term/xterm.el
lisp/textmodes/css-mode.el
lisp/textmodes/fill.el
lisp/textmodes/mhtml-mode.el
lisp/textmodes/page-ext.el
lisp/textmodes/reftex-ref.el
lisp/textmodes/remember.el
lisp/textmodes/rst.el
lisp/textmodes/texinfo.el
lisp/thingatpt.el
lisp/time.el
lisp/tooltip.el
lisp/type-break.el
lisp/url/url-cache.el
lisp/url/url-cookie.el
lisp/url/url.el
lisp/vc/ediff-wind.el
lisp/vc/log-edit.el
lisp/vc/vc-dir.el
lisp/vc/vc-git.el
lisp/vc/vc-hg.el
lisp/vc/vc.el
lisp/w32-fns.el
lisp/whitespace.el
lisp/woman.el
lisp/xdg.el
m4/gnulib-comp.m4
msdos/sed2v2.inp
nt/INSTALL
nt/INSTALL.W64
nt/README.W32
nt/gnulib-cfg.mk
src/.gdbinit
src/Makefile.in
src/alloc.c
src/buffer.c
src/bytecode.c
src/callint.c
src/cmds.c
src/coding.c
src/coding.h
src/data.c
src/dispnew.c
src/doprnt.c
src/editfns.c
src/emacs-module.c
src/emacs.c
src/eval.c
src/fileio.c
src/frame.c
src/fringe.c
src/gmalloc.c
src/gtkutil.c
src/keyboard.c
src/keyboard.h
src/lastfile.c
src/lisp.h
src/lread.c
src/macfont.m
src/menu.c
src/menu.h
src/msdos.c
src/nsfns.m
src/nsimage.m
src/nsselect.m
src/nsterm.h
src/nsterm.m
src/process.c
src/regex.c
src/syntax.c
src/sysdep.c
src/syssignal.h
src/w32fns.c
src/xdisp.c
src/xfaces.c
src/xfns.c
src/xml.c
src/xwidget.c
test/Makefile.in
test/lisp/auth-source-pass-tests.el
test/lisp/char-fold-tests.el
test/lisp/dired-aux-tests.el
test/lisp/electric-tests.el
test/lisp/emacs-lisp/bytecomp-tests.el
test/lisp/emacs-lisp/cl-lib-tests.el
test/lisp/emacs-lisp/eieio-tests/eieio-tests.el
test/lisp/emacs-lisp/testcover-resources/testcases.el
test/lisp/emacs-lisp/testcover-tests.el
test/lisp/emacs-lisp/thunk-tests.el
test/lisp/gnus/gnus-tests.el
test/lisp/help-fns-tests.el
test/lisp/htmlfontify-tests.el
test/lisp/net/gnutls-tests.el
test/lisp/net/tramp-tests.el
test/lisp/textmodes/css-mode-tests.el
test/lisp/xdg-tests.el
test/manual/cedet/semantic-ia-utest.el
test/manual/cedet/semantic-tests.el
test/src/data-tests.el
test/src/editfns-tests.el
test/src/fileio-tests.el
test/src/lread-tests.el