diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-02-25 22:53:56 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-02-25 22:53:56 -0800 |
| commit | d8e9122115b5ffcec342c841b81cb2d2b8217e4b (patch) | |
| tree | 477830be0a1707699381146a4ed45c53d0b928b0 /lisp/vc/vc-cvs.el | |
| parent | cbd447e1cdbbebcd2a04144194138bb7936dea9d (diff) | |
| parent | e726f2058c98e68c951bdb290fe68dac2a84ff65 (diff) | |
| download | emacs-d8e9122115b5ffcec342c841b81cb2d2b8217e4b.tar.gz emacs-d8e9122115b5ffcec342c841b81cb2d2b8217e4b.tar.bz2 emacs-d8e9122115b5ffcec342c841b81cb2d2b8217e4b.zip | |
Merge from origin/emacs-24
e726f20 Handle "#" operator properly inside macro. Fix coding bug.
618931b Handle dead frame in menu-bar-non-minibuffer-window-p. (Bug#19728)
017a03a Document MS-Windows file-name idiosyncrasies (Bug#19463)
f3faf4f Fix description of Customize buffer in Emacs manual.
1c1d0b7 Fix a typo in the Emacs manual's Hungry Delete description.
be7fb82 src/dispextern.h (FACE_FOR_CHAR): Fix the commentary.
33c4409 Spelling fixes
6c8231e python.el: Handle tabs in python-indent-dedent-line.
41c3b92 * lisp/progmodes/python.el: Respect user indentation after comment.
868df45 Avoid compiler warnings in decode_env_path.
b28c979 Fix XEmacs version typo in comment and ChangeLog
989fb32 Improve solution of bug #19701
6310530 Fix refilling of list of language environments in User Manual
c4c447d Restore XEmacs compatibility
Conflicts:
doc/emacs/ChangeLog
lisp/ChangeLog
src/ChangeLog
test/ChangeLog
Diffstat (limited to 'lisp/vc/vc-cvs.el')
0 files changed, 0 insertions, 0 deletions