diff options
| author | Phillip Lord <phillip.lord@russet.org.uk> | 2015-11-12 22:01:22 +0000 |
|---|---|---|
| committer | Phillip Lord <phillip.lord@russet.org.uk> | 2015-11-12 22:01:22 +0000 |
| commit | 20aa42e8204f8f0139ba3880cb32ddf88acc9bf4 (patch) | |
| tree | f77644c920b0f6a5a2f5849a064c6828c17530b1 /lisp/emacs-lisp/syntax.el | |
| parent | d2f73db50bec29724cb1324910350ad24420b174 (diff) | |
| parent | 44dfa86b7d382b84564d68472da1448d08f48129 (diff) | |
| download | emacs-20aa42e8204f8f0139ba3880cb32ddf88acc9bf4.tar.gz emacs-20aa42e8204f8f0139ba3880cb32ddf88acc9bf4.tar.bz2 emacs-20aa42e8204f8f0139ba3880cb32ddf88acc9bf4.zip | |
; Merge branch 'fix/no-undo-boundary-on-secondary-buffer-change'
Conflicts:
src/cmds.c
src/keyboard.c
Diffstat (limited to 'lisp/emacs-lisp/syntax.el')
0 files changed, 0 insertions, 0 deletions