-

diff --cc configure.ac
Simple merge

diff --cc etc/NEWS
Simple merge

diff --cc lisp/htmlfontify.el
Simple merge

diff --cc lisp/net/shr.el
Simple merge

diff --cc src/Makefile.in
index defce62c52959bb6bd44eed7b9899052c5048fc5,4a52757fec6e02956a0a4033d82c578352a3989e..b38e7d558b880cd85eaeb526ff85330107fcfb7c
--- 1/src/Makefile.in
--- 2/src/Makefile.in
+++ b/src/Makefile.in
@@@ -359,9 -364,10 +365,10 @@@ ALL_CFLAGS=-Demacs $(MYCPPFLAGS) -I. -I
    $(GNUSTEP_CFLAGS) $(CFLAGS_SOUND) $(RSVG_CFLAGS) $(IMAGEMAGICK_CFLAGS) \
    $(PNG_CFLAGS) $(LIBXML2_CFLAGS) $(DBUS_CFLAGS) \
    $(XRANDR_CFLAGS) $(XINERAMA_CFLAGS) $(XFIXES_CFLAGS) \
+   $(WEBKIT_CFLAGS) \
    $(SETTINGS_CFLAGS) $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) \
    $(LIBOTF_CFLAGS) $(M17N_FLT_CFLAGS) $(DEPFLAGS) \
 -  $(LIBGNUTLS_CFLAGS) $(GFILENOTIFY_CFLAGS) $(CAIRO_CFLAGS) \
 +  $(LIBGNUTLS_CFLAGS) $(NOTIFY_CFLAGS) $(CAIRO_CFLAGS) \
    $(WARN_CFLAGS) $(WERROR_CFLAGS) $(CFLAGS)
  ALL_OBJC_CFLAGS=$(ALL_CFLAGS) $(GNU_OBJC_CFLAGS)
  

diff --cc src/buffer.c
Simple merge

diff --cc src/dispnew.c
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/keyboard.c
index c8a9728e896bf891552cede1a9119a2aab901bb9,58831f548cad0091070ccc75b260ae3b9d0e8440..fe503b8ce566815070d0ada3efee05cb3f5a4e96
--- 1/src/keyboard.c
--- 2/src/keyboard.c
+++ b/src/keyboard.c
@@@ -5950,7 -5957,15 +5957,14 @@@ make_lispy_event (struct input_event *e
        }
  #endif /* HAVE_DBUS */
  
 -
 -#if defined HAVE_GFILENOTIFY || defined HAVE_INOTIFY
+ #ifdef HAVE_XWIDGETS
+     case XWIDGET_EVENT:
+       {
+         return Fcons (Qxwidget_event,event->arg);
+       }
+ #endif
+ 
 +#if defined HAVE_INOTIFY || defined HAVE_KQUEUE || defined HAVE_GFILENOTIFY
      case FILE_NOTIFY_EVENT:
        {
          return Fcons (Qfile_notify, event->arg);

diff --cc src/lisp.h
Simple merge

diff --cc src/window.c
Simple merge

diff --cc test/manual/indent/ruby.rb
index dec6de98605044ac4926220656d2d17673d72f06,0000000000000000000000000000000000000000..dfd1c75a679679520ee0efc6fec7ace562c44c45
mode 100644,000000..100644
--- 1/test/manual/indent/ruby.rb
--- /dev/null
+++ b/test/manual/indent/ruby.rb
@@@ -1,414 -1,0 +1,418 @@@
 +if something_wrong?             # ruby-move-to-block-skips-heredoc
 +  ActiveSupport::Deprecation.warn(<<-eowarn)
 +  boo hoo
 +  end
 +  eowarn
 +  foo
++
++  foo(<<~squiggly)
++  end
++  squiggly
 +end
 +
 +def foo
 +  %^bar^
 +end
 +
 +# Percent literals.
 +b = %Q{This is a "string"}
 +c = %w!foo
 + bar
 + baz!
 +d = %(hello (nested) world)
 +
 +# Don't propertize percent literals inside strings.
 +"(%s, %s)" % [123, 456]
 +
 +"abc/#{def}ghi"
 +"abc\#{def}ghi"
 +
 +# Or inside comments.
 +x = # "tot %q/to"; =
 +  y = 2 / 3
 +
 +# Regexp after whitelisted method.
 +"abc".sub /b/, 'd'
 +
 +# Don't mis-match "sub" at the end of words.
 +a = asub / aslb + bsub / bslb;
 +
 +# Highlight the regexp after "if".
 +x = toto / foo if /do bar/ =~ "dobar"
 +
 +# Regexp options are highlighted.
 +
 +/foo/xi != %r{bar}mo.tee
 +
 +foo { /"tee/
 +  bar { |qux| /'fee"/ }         # bug#20026
 +}
 +
 +bar(class: XXX) do              # ruby-indent-keyword-label
 +  foo
 +end
 +bar
 +
 +foo = [1,                       # ruby-deep-indent
 +       2]
 +
 +foo = {                         # ruby-deep-indent-disabled
 +  a: b
 +}
 +
 +foo = { a: b,
 +        a1: b1
 +      }
 +
 +foo({                           # bug#16118
 +      a: b,
 +      c: d
 +    })
 +
 +bar = foo(
 +  a, [
 +    1,
 +  ],
 +  :qux => [
 +    3
 +  ])
 +
 +foo(
 +  [
 +    {
 +      a: b
 +    },
 +  ],
 +  {
 +    c: d
 +  }
 +)
 +
 +foo([{
 +       a: 2
 +     },
 +     {
 +       b: 3
 +     },
 +     4
 +    ])
 +
 +foo = [                         # ruby-deep-indent-disabled
 +  1
 +]
 +
 +foo(                            # ruby-deep-indent-disabled
 +  a
 +)
 +
 +# Multiline regexp.
 +/bars
 + tees # toots
 + nfoos/
 +
 +def test1(arg)
 +  puts "hello"
 +end
 +
 +def test2 (arg)
 +  a = "apple"
 +
 +  if a == 2
 +    puts "hello"
 +  else
 +    puts "there"
 +  end
 +
 +  if a == 2 then
 +    puts "hello"
 +  elsif a == 3
 +    puts "hello3"
 +  elsif a == 3 then
 +    puts "hello3"
 +  else
 +    puts "there"
 +  end
 +
 +  b = case a
 +      when "a"
 +        6
 +      # Support for this syntax was removed in Ruby 1.9, so we
 +      # probably don't need to handle it either.
 +      # when "b" :
 +      #   7
 +      # when "c" : 2
 +      when "d"  then 4
 +      else 5
 +      end
 +end
 +
 +# Some Cucumber code:
 +Given /toto/ do
 +  print "hello"
 +end
 +
 +# Bug#15208
 +if something == :==
 +  do_something
 +
 +  return false unless method == :+
 +  x = y + z # Bug#16609
 +
 +  a = 1 ? 2 :(
 +    2 + 3
 +  )
 +end
 +
 +# Bug#17097
 +if x == :!=
 +  something
 +end
 +
 +# Example from http://www.ruby-doc.org/docs/ProgrammingRuby/html/language.html
 +d = 4 + 5 +      # no '\' needed
 +    6 + 7
 +
 +# Example from http://www.ruby-doc.org/docs/ProgrammingRuby/html/language.html
 +e = 8 + 9   \
 +    + 10         # '\' needed
 +
 +foo = obj.bar { |m| tee(m) } +
 +      obj.qux { |m| hum(m) }
 +
 +begin
 +  foo
 +ensure
 +  bar
 +end
 +
 +# Bug#15369
 +MSG = 'Separate every 3 digits in the integer portion of a number' \
 +      'with underscores(_).'
 +
 +class C
 +  def foo
 +    self.end
 +    D.new.class
 +  end
 +end
 +
 +a = foo(j, k) -
 +    bar_tee
 +
 +while a < b do # "do" is optional
 +  foo
 +end
 +
 +desc "foo foo" \
 +     "bar bar"
 +
 +foo.
 +  bar
 +
 +# https://github.com/rails/rails/blob/17f5d8e062909f1fcae25351834d8e89967b645e/activesupport/lib/active_support/time_with_zone.rb#L206
 +foo
 +  .bar
 +
 +z = {
 +  foo: {
 +    a: "aaa",
 +    b: "bbb"
 +  }
 +}
 +
 +foo if
 +  bar
 +
 +if foo?
 +  bar
 +end
 +
 +method arg1,                   # bug#15594
 +       method2 arg2,
 +               arg3
 +
 +method? arg1,
 +        arg2
 +
 +method! arg1,
 +        arg2
 +
 +method !arg1,
 +       arg2
 +
 +method [],
 +       arg2
 +
 +method :foo,
 +       :bar
 +
 +method (a + b),
 +       c, :d => :e,
 +       f: g
 +
 +desc "abc",
 +     defg
 +
 +it "is a method call with block" do |asd|
 +  foo
 +end
 +
 +it("is too!") {
 +  bar
 +    .qux
 +}
 +
 +and_this_one(has) { |block, parameters|
 +  tee
 +}
 +
 +if foo &&
 +   bar
 +end
 +
 +foo +
 +  bar
 +
 +foo and
 +  bar
 +
 +foo > bar &&
 +  tee < qux
 +
 +zux do
 +  foo == bar and
 +    tee == qux
 +end
 +
 +foo ^
 +  bar
 +
 +foo_bar_tee(1, 2, 3)
 +  .qux.bar
 +  .tee
 +
 +foo do
 +  bar
 +    .tee
 +end
 +
 +def bar
 +  foo
 +    .baz
 +end
 +
 +# http://stackoverflow.com/questions/17786563/emacs-ruby-mode-if-expressions-indentation
 +tee = if foo
 +        bar
 +      else
 +        tee
 +      end
 +
 +a = b {
 +  c
 +}
 +
 +aa = bb do
 +  cc
 +end
 +
 +foo :bar do
 +  qux
 +end
 +
 +foo do |*args|
 +  tee
 +end
 +
 +bar do |&block|
 +  tee
 +end
 +
 +foo = [1, 2, 3].map do |i|
 +  i + 1
 +end
 +
 +bar.foo do
 +  bar
 +end
 +
 +bar.foo(tee) do
 +  bar
 +end
 +
 +bar.foo(tee) {
 +  bar
 +}
 +
 +bar 1 do
 +  foo 2 do
 +    tee
 +  end
 +end
 +
 +foo |
 +  bar
 +
 +def qux
 +  foo ||= begin
 +            bar
 +            tee
 +          rescue
 +            oomph
 +          end
 +end
 +
 +private def foo
 +  bar
 +end
 +
 +%^abc^
 +ddd
 +
 +qux = foo.fee ?
 +        bar :
 +        tee
 +
 +zoo.keep.bar!(
 +  {x: y,
 +   z: t})
 +
 +zoo
 +  .lose(
 +    q, p)
 +
 +a.records().map(&:b).zip(
 +  foo)
 +
 +# FIXME: This is not consistent with the example below it, but this
 +# offset only happens if the colon is at eol, which wouldn't be often.
 +# Tokenizing `bar:' as `:bar =>' would be better, but it's hard to
 +# distinguish from a variable reference inside a ternary operator.
 +foo(bar:
 +      tee)
 +
 +foo(:bar =>
 +    tee)
 +
 +{'a' => {
 +   'b' => 'c',
 +   'd' => %w(e f)
 + }
 +}
 +
 +# Bug#17050
 +
 +return render json: {
 +                errors: { base: [message] },
 +                copying: copying
 +              },
 +              status: 400
 +
 +top test(
 +      some,
 +      top,
 +      test)
 +
 +foo bar, {
 +      tee: qux
 +    }