diff options
| author | Eli Zaretskii | 2016-12-04 19:59:17 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2016-12-04 19:59:17 +0200 |
| commit | de4624c99ea5bbe38ad5aff7b6461cc5c740d0be (patch) | |
| tree | 1b57de9e769cdb695cb2cecf157b50f7dea9cfe5 /etc | |
| parent | a486fabb41cdbaa5813c2687fd4008945297d71d (diff) | |
| parent | e7bde34e939451d87fb42a36195086bdbe48b5e1 (diff) | |
| download | emacs-de4624c99ea5bbe38ad5aff7b6461cc5c740d0be.tar.gz emacs-de4624c99ea5bbe38ad5aff7b6461cc5c740d0be.zip | |
Merge branch 'concurrency'
Conflicts (resolved):
configure.ac
src/Makefile.in
src/alloc.c
src/bytecode.c
src/emacs.c
src/eval.c
src/lisp.h
src/process.c
src/regex.c
src/regex.h
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/DEBUG | 2 |
1 files changed, 1 insertions, 1 deletions
| @@ -313,7 +313,7 @@ type. Here are these commands: | |||
| 313 | xbufobjfwd xkbobjfwd xbuflocal xbuffer xsymbol xstring xvector xframe | 313 | xbufobjfwd xkbobjfwd xbuflocal xbuffer xsymbol xstring xvector xframe |
| 314 | xwinconfig xcompiled xcons xcar xcdr xsubr xprocess xfloat xscrollbar | 314 | xwinconfig xcompiled xcons xcar xcdr xsubr xprocess xfloat xscrollbar |
| 315 | xchartable xsubchartable xboolvector xhashtable xlist xcoding | 315 | xchartable xsubchartable xboolvector xhashtable xlist xcoding |
| 316 | xcharset xfontset xfont | 316 | xcharset xfontset xfont xbytecode |
| 317 | 317 | ||
| 318 | Each one of them applies to a certain type or class of types. | 318 | Each one of them applies to a certain type or class of types. |
| 319 | (Some of these types are not visible in Lisp, because they exist only | 319 | (Some of these types are not visible in Lisp, because they exist only |