]> git.eshelyaron.com Git - emacs.git/commit
Merge from origin/emacs-25
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 30 Jan 2016 19:28:37 +0000 (11:28 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 30 Jan 2016 19:28:37 +0000 (11:28 -0800)
commit1a9cec16fe8d805dbb9f3a082bebcdefb878cf13
treed9aeebb668e61da05bbf2ef88eabc9b4f015923a
parent3b71a72a777237c8ef34835a2021adc8eb5e5c7f
parent3f481ad0072ea4fe300af7f326de9049a8d32d4a
Merge from origin/emacs-25

3f481ad Rename xref-query-replace to xref-query-replace-in-results
62f4ed4 Update cl-defgeneric and cl-defmethod docstrings
2111e0e Comment out next-error-function integration in xref
4e11ad3 Correct a use of "which" in intro.texi
a1865bc Distinguish the two meanings of Java's keyword "default".  Fixes bug #22358.
76045f7 Don't operate on menu bar of nonexistent frame
c32f3bc Unbreak the GNUstep build.
doc/emacs/dired.texi
etc/NEWS
lisp/dired-aux.el
lisp/progmodes/cc-engine.el
lisp/progmodes/cc-langs.el