aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/atom.names
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2013-02-12 14:30:13 +0100
committerBjörn Gustavsson <[email protected]>2013-02-12 14:30:13 +0100
commitcd08400f92ec7672025bf39a458effcf33a423dc (patch)
treeb874f8c3fe97558d72dcaedc31dd941060ccea75 /erts/emulator/beam/atom.names
parentbbf692965470a9e993e1afd6f1a9375cbe832fcb (diff)
parent08bc8a328275e751836fab0c562b50cf71000c2b (diff)
downloadotp-cd08400f92ec7672025bf39a458effcf33a423dc.tar.gz
otp-cd08400f92ec7672025bf39a458effcf33a423dc.tar.bz2
otp-cd08400f92ec7672025bf39a458effcf33a423dc.zip
Merge branch 'pan/unicode_filename_warnings'
* pan/unicode_filename_warnings: Add file:list_dir_all/1 and file:read_link_all/1 prim_file: Add list_dir_all() and read_link_all() Teach prim_file:set_cwd() to avoid entering non-translatable directories Make prim_file skip invalid filenames in unicode mode prim_file: Refactor functions that return filenames prim_file: Refactor handling of responses prim_file: Always open non-file ports in binary mode Test that list_dir("non-existing-dir") fails with the correct error
Diffstat (limited to 'erts/emulator/beam/atom.names')
-rw-r--r--erts/emulator/beam/atom.names1
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/emulator/beam/atom.names b/erts/emulator/beam/atom.names
index f138324e1f..ce60bb9bbc 100644
--- a/erts/emulator/beam/atom.names
+++ b/erts/emulator/beam/atom.names
@@ -269,6 +269,7 @@ atom hipe_architecture
atom http httph https http_response http_request http_header http_eoh http_error http_bin httph_bin
atom id
atom if_clause
+atom ignore
atom imports
atom in
atom in_exiting