emacs/admin, branch fix/bug-20871

* admin/gitmerge.el (gitmerge-resolve): Handle NEWS. (Bug#29366)

2017-12-02T03:06:40+00:00

Don't hard-code gitmerge.el's default merge branch

2017-12-02T03:03:05+00:00

* admin/gitmerge.el (gitmerge-default-branch): Make it a variable,
defaulting to nil.
(gitmerge-emacs-version, gitmerge-default-branch): New functions.
(gitmerge): Guess the branch to merge from.

* admin/gitmerge.el (gitmerge-resolve):

2017-12-02T03:00:02+00:00

Fix treatment of generated files.

Add date to dependency and source zips for snapshots

2017-11-30T22:59:39+00:00

* admin/nt/dist-build/build-zips.sh,
  admin/nt/dist-build/build-dep-zips.py: Support snapshot naming

Update Build files for Emacs-27

2017-11-27T22:13:41+00:00

* admin/nt/dist-build/README-windows-binaries,
  admin/nt/dist-build/build-dep-zips.py,
  admin/nt/dist-build/build-zips.sh: Update Version

Merge from origin/emacs-26

2017-11-26T06:55:35+00:00

a89f0b6f33 maint: shorten https://lists.gnu.org/archive/html/... links
8be3aee281 Merge from Gnulib
265cee553f Work around GCC bug 80776 on Fedora 27 x86
dc7a97fb84 Tweak copy-file, rename-file doc
cfa2a944d4 Change font-lock-extend-region-multiline handling in mhtml...
a8664cc998 Minor cleanup in tramp-gvfs-handle-file-local-copy
55c5b12fa0 Add test for Bug#29423 in Tramp.
3198a1646e Avoid jumbled order in HTML rendered by shr.el
23bfc2d2db Make sure 'dired-filename' property is always put by ls-lisp
f7fdaea4c0 A better solution for bug#29347
86e6ed8521 ; * src/thread.c (acquire_global_lock): Fix thinko in last...
f300852037 Avoid a hang after C-g while sit-for on a Unix TTY
d7fc719ff1 Improve the doc string of 'list-packages'
b4f67ebb92 Improve discoverability of 'defvar' for suppressing warnings
8a2b204e64 Improve discoverability of 'read-buffer-completion-ignore-...
eea4e9194c Improve documentation of self-insert-uses-region-functions
e6e41dac87 Reflect changes in copy-file and rename-file in doc strings
0ec534070f * lisp/progmodes/cc-vars.el (c-offsets-alist): Doc fix.  (...
1d0dbdff6c Reorder type predicates in ELisp manual
b081ec9dd7 Fix backward scrolling in buffers with header-line
8e40429c96 ; Fix some doc typos
ed2c542920 * lisp/bindings.el (buffer-file-coding-system): Add explic...
d82474e452 * src/fns.c (syms_of_fns) : ...
292c09ff6d Fix incorrect interaction of drag/drop and double click (b...
d6fadb1d26 * lisp/menu-bar.el (menu-bar-options-save): Add display-li...
daa959efbc * lisp/menu-bar.el (menu-bar-options-save): Add global-dis...
17fc74d1b9 * lisp/follow.el (follow-mode): Restore mode line lighter....
f20c2e2f3d ; Compare process status against 127 exactly
2d203ffb7e Extract the common part of ruby-flymake-simple and ruby-fl...
09944d499a Add Rubocop Flymake backend
c65a0ae7c4 ; Fix a typo
7ab7603125 Update nt/INSTALL.W64 (Bug#28601)
11db253c08 Remove incorrect NEWS item about VC state indicator (Bug#2...
2fdc01c036 * lisp/emacs-lisp/byte-run.el (defsubst): Doc fix.
735c8b516e Make c-defun-name analyze more thoroughly a function type ...
92f0c4cd56 Avoid bogus abbreviated file names if HOME changes
8d450453fa * lisp/emacs-lisp/byte-run.el (inline): Give it a doc.
37a3b4ea40 Fix erc keep-place module with new defaults (Bug#29111)
6c312605bf Add window divider faces to NS (bug#29353)

# Conflicts:
#	etc/NEWS
#	lisp/ruler-mode.el

maint: shorten https://lists.gnu.org/archive/html/... links

2017-11-26T06:48:12+00:00

Fix lower case installer name

2017-11-20T22:30:31+00:00

* admin/nt/dist-build/build-zips.sh (build_installer):

Add date to snapshot file

2017-11-20T19:55:31+00:00

* admin/nt/dist-build/build-zips.sh: Add date to all out files.
* admin/nt/dist-build/emacs.nsi: Lower case and date installer.

Rebrand Uninstaller

2017-11-17T23:03:03+00:00

* admin/nt/dist-build/emacs.nsi: Add MUI_UNICON