Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs

diff --cc doc/lispref/objects.texi
index 7de632e102bb1687ae5376fdc6cc6b96d72ab545,470982e8d2dc08bc7f4d5b57f4fe10c591d3b1b5..e06cddc9defab3b158b27a21b46cdbca302c3487
--- 1/doc/lispref/objects.texi
--- 2/doc/lispref/objects.texi
+++ b/doc/lispref/objects.texi
@@@ -144,29 -144,36 +144,39 @@@ starting list count
  object, so when reading back the object, they will be the same object
  instead of copies (@pxref{Circular Objects}).
  
 -@item @samp{#xN}
 +@item #@@N
 +Skip the next @samp{N} characters (@pxref{Comments}).
 +
 +@item #xN
  @samp{N} represented as a hexadecimal number (@samp{#x2a}).
  
 -@item @samp{#oN}
 +@item #oN
  @samp{N} represented as an octal number (@samp{#o52}).
  
 -@item @samp{#bN}
 +@item #bN
  @samp{N} represented as a binary number (@samp{#b101010}).
  
 -@item @samp{#(...)}
 +@item #(@dots{})
  A string text properties (@pxref{Text Props and Strings}).
  
 -@item @samp{#^}
 +@item #^
  A char table (@pxref{Char-Table Type}).
  
 -@item @samp{#s(hash-table ...)}
 +@item #s(hash-table @dots{})
  A hash table (@pxref{Hash Table Type}).
  
 -@item @samp{?C}
 +@item ?C
  A character (@pxref{Basic Char Syntax}).
+ 
+ @item @samp{#$}
+ The current file name in byte-compiled files (@pxref{Docs and
+ Compilation}).  This is not meant to be used in Emacs Lisp source
+ files.
+ 
+ @item @samp{#@@N}
+ Skip the next @samp{N} characters (@pxref{Comments}).  This is used in
+ byte-compiled files, and is not meant to be used in Emacs Lisp source
+ files.
  @end table