• Paul Eggert's avatar
    Merge from origin/emacs-25 · 0274862f
    Paul Eggert authored
    d08afa1d * etc/AUTHORS: Update the AUTHORS file
    26685000 ;; * ChangeLog.2: ChangeLog update.
    7acfaead ; ChangeLog fixes
    97d28b42 * admin/authors.el (authors-valid-file-names): Addition.
    9ab52f69 * admin/authors.el: Additions.
    0e646c73 Warn about Cairo-related problems
    bc4c07fc Don't let completion break `declare' handling
    66f95e0d Adjust match data before calling after-change-funs
    52cf0d5d Do not show string-rectangle preview if minibuffer is empty
    6a3d031a * etc/PROBLEMS: Add entry about selection problems under Plas...
    
    # Conflicts:
    #	ChangeLog.2
    #	src/lisp.h
    0274862f
elisp-mode.el 66.7 KB