[Emacs-diffs] master e0a2dae 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs

[Eli Zaretskii]

branch: master
commit e0a2dae0dbb5dcf22ff8153344d141c7bc82d17a
Merge: 2d3bb22 0ba0af0
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
---
 doc/lispref/objects.texi | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/doc/lispref/objects.texi b/doc/lispref/objects.texi
index 7de632e..e06cddc 100644
--- a/doc/lispref/objects.texi
+++ b/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