GitLab

Originally reported in https://github.com/mooz/js2-mode/issues/174.
* lisp/progmodes/js.el (js--indent-operator-re): Make assignments and
(in)equality operator a separate case.
(js--continued-expression-p): Escape the second `+' in the regexp.

* doc/emacs/misc.texi (DocView Slicing): Describe how to slice with the
mouse.  Fix command mentioned by slice by BoundingBox paragraph.
(Bug#18040)

* lisp/window.el (handle-select-window): Deactivate shift-region.

Local attributes belong to .git/info/attributes.

* version.el (emacs-repository-get-version): Use git rev-parse
instead of git log.

* admin/update_autogen: Auto-detect VCS in use.
(vcs): New variable.
(status, commit, main): Handle git.

* lisp/progmodes/python.el (python-indent-calculate-levels): Fix
indentation behavior multiline dedenter statement.

* test/automated/python-tests.el (python-indent-dedenters-8): New test
for Bug#18432.

Fixes: debbugs:18843

* lisp/progmodes/python.el (python-indent-region): Use
python-indent-line and skip special cases.

* test/automated/python-tests.el (python-indent-region-1)
(python-indent-region-2, python-indent-region-3)
(python-indent-region-4, python-indent-region-5): New tests.

* nsterm.m (ns_send_appdefined): Check for application defined
event on Cocoa (Bug#18993).  Backport from trunk.

 src/window.c (window_scroll_pixel_based): Avoid truncation/rounding
 errors in computing the number of pixels to scroll.  Suggested by
 Kelly Dean <kelly@prtime.org>.

* vc/vc-hg.el (vc-hg-state): Disable pager.

Conflicts:
	lisp/ChangeLog

Fixes: debbugs:19054

* mail/emacsbug.el (report-emacs-bug): Make a better guess at
  envelope-from when reporting through sendmail.

* nsmenu.m (update_frame_tool_bar): If tool bar changes height,
call updateFrameSize.

* nsterm.m (setFrame:): Remove call to display (Bug#18757).

 Reported by Kelly Dean <kelly@prtime.org>.

Fixes: debbugs:18854

* progmodes/python.el (python-ffap-module-path): Use
`derived-mode-p' instead of equality test on `major-mode'.

Fixes: debbugs:19049

* version.el (emacs-repository-get-version): Call `git log'
command with proper format argument (bug#19049).

* nsfns.m (x_set_foreground_color, x_set_background_color)
(x_set_cursor_color, Fxw_color_values): Block/unblock input,
use SET_FRAME_GARBAGED instead of redraw_frame (Bug#19036).

Reported by Perry E. Metzger in:
http://lists.gnu.org/archive/html/emacs-devel/2014-11/msg00745.html
* .dir-locals.el: Remove reference to bzr commit --fixes debbugs.
* etc/CONTRIBUTE: More git transition.

 .gitignore: Copy over sufficient ignorable files from the old
 .bzrignore that a simple build doesn't list lots of unregistered
 files.

All bzr revision IDS, and all CVS revision IDs for which a commit
could be identified, were changed to time-date!committer version
stamps. All .cvsignore files in the history became .gitignore files.
Fixes-bug annotations from bzr were copied into the corresponding
commit comments.

(The first .cvsignore commit was 1999-09-30T14:07:54Z!fx@gnu.org>.
The last CVS commit was <2009-12-27T08:11:12Z!cyd@stupidchicken.com>)

Committer/author email addresses are generally correct for the
transition day, not necessarily when the commit was originally made.

* gnus.texi (HTML): Update section so that it mentions shr and w3m.
Also link the full EWW manual that explains more on shr, too.
* gnus-faq.texi (FAQ 4 - Reading messages, FAQ 4-16): Add Q&A on how to
increase contrast when displaying HTML mail with shr.

 admin/unidata/Makefile.in (${top_srcdir}/src/macuvs.h): Use
 unmsys--file-name.

 src/fileio.c (Finsert_file_contents): Invalidate buffer caches also
 when the inserted text does not need decoding.

 src/w32heap.c (allocate_heap): Set the lower limit of heap at 8MB.

* nsterm.m (ns_set_vertical_scroll_bar): Release bar.
(ns_judge_scroll_bars): Only set removed if judge returns true.
(judge): Returns bool == condemned.  Remove self from window.
(setPosition:portion:whole:): Remove raise SIGIO.

Fixes: debbugs:18757