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

doc/lispref/objects.texi

@@ -167,6 +167,16 @@ A hash table (@pxref{Hash Table Type}).
 
 @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