]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from origin/emacs-25
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 18 Apr 2016 21:05:31 +0000 (14:05 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 18 Apr 2016 21:05:31 +0000 (14:05 -0700)
32364bb substitute-command-keys keeps quotes’ text props
567ab52 * src/xwidget.c (x_draw_xwidget_glyph_string): More clipping ...
24b87a1 Add semantic-symref-filepattern-alist entry for lisp-interact...
cc0b713 Perform xref searches without visiting unopened files
5045575 Revert "Prevent bootstrap autoload backup files"

1  2 
lisp/emacs-lisp/autoload.el
src/doc.c

Simple merge
diff --cc src/doc.c
Simple merge