• Paul Eggert's avatar
    Merge from origin/emacs-24 · 2393085c
    Paul Eggert authored
    ad89f850 Another minor improvement in ELisp manual  (Bug#20168)
    5e2951be Improve docs of 'posn-actual-col-row'  (Bug#20169)
    1291ce18 Minor documentation fix in ELisp manual  (Bug#20174)
    33e2236f * display.texi (Useless Whitespace): Fix thinko.
    ff3878d7 * configure.ac: Fix jpeg version check to work with gcc >= 5.
    90b46f5b Work for the case nnmail-expiry-target is an nnmh group (bug#20170)
    e7f92aa3 authors.el small additions
    0bfe915b * etc/PROBLEMS: Add entry about dir-locals and some auto-mounters.
    c3c4b758 Fixes: debbugs:18939
    
    Conflicts:
    	ChangeLog
    	doc/lispref/ChangeLog
    	etc/PROBLEMS
    	lisp/ChangeLog
    	lisp/gnus/ChangeLog
    	lisp/simple.el
    2393085c
ChangeLog 957 KB