• Paul Eggert's avatar
    Merge from origin/emacs-24 · 923602fe
    Paul Eggert authored
    0077b36e # NEWS copyedits
    3ca2ff36 * lisp/erc/erc.el (erc-rename-buffers): Doc fix.  Add :version.
    b85523fe * lisp/textmodes/flyspell.el (flyspell-duplicate-distance):
    decb48d3 Augment text-mode syntax table for a few special characters
    8b3ba7ae Improve docs of transient-mark-mode  (Bug#19841)
    72fd047e NEWS: Add section to include ERC changes
    a7254bbf Improve string search in `flyspell-word-search-*`. (Bug#16800)
    
    Conflicts:
    	etc/ChangeLog
    	etc/NEWS
    	lisp/ChangeLog
    	lisp/erc/ChangeLog
    	src/ChangeLog
    923602fe
simple.el 328 KB