master updated (26290870b35 -> 8d5983aa78e)

[Po Lu]

oldosfan pushed a change to branch master.

      from  26290870b35 diff-mode.el (diff-refine-nonmodified): New option
       new  65d4bf71105 ; * .dir-locals.el (java-mode): Transfer suitable 
c-mode options.
       new  8d5983aa78e Fix bug#69321


Summary of changes:
 .dir-locals.el                      |  5 +++
 java/org/gnu/emacs/EmacsWindow.java | 68 ++++++++++++++++++++++++++-----------
 2 files changed, 53 insertions(+), 20 deletions(-)