]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: be589ea 4f406e9)
Merge from origin/emacs-25
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 10 Oct 2016 14:39:05 +0000 (07:39 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 10 Oct 2016 14:39:05 +0000 (07:39 -0700)
commit46b83c0f08f936eb1a0ae761db557169fe295cc7
treebdb663d86a908a83b7c953316d04714664b32a0ctree | snapshot
parentbe589ea0dc71063d26595378df303a2a1c25ee4ecommit | diff
parent4f406e9813e073b675bb45613bf1dd111eec2368commit | diff
Merge from origin/emacs-25

4f406e9 CC Mode manual: remove reference to former Emacs variable las...
44e402e Allow to disable compaction of font caches
4ff4b66 Allow selection of font for symbols as in Emacs 24.x
c03d44b ; Fix last commit
d4be4f3 ; Fix indexing in lispref manual
ed399f2 ; Minor improvement in documentation of generators
197a6bc Fix horizontal scrolling during Isearch
3566644 Fix infloop in redisplay due to truncated lines and invisible...

# Conflicts:
# etc/NEWS
doc/lispref/functions.texi diff1 | diff2 | blob | history
doc/misc/cc-mode.texi diff1 | diff2 | blob | history
etc/NEWS.25 diff1 | | blob | history
lisp/isearch.el diff1 | diff2 | blob | history
src/alloc.c diff1 | diff2 | blob | history
src/font.c diff1 | diff2 | blob | history
src/fontset.c diff1 | diff2 | blob | history
src/xdisp.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.