diff options
| author | Eli Zaretskii | 2025-02-01 07:40:19 -0500 |
|---|---|---|
| committer | Eli Zaretskii | 2025-02-01 07:40:19 -0500 |
| commit | d58fe6619f9b31069ebb420f0e85c7ce00a5fcb7 (patch) | |
| tree | 42b098c30d10ace21562a76702e3b799e9c292a8 /doc | |
| parent | 25fc779986744913a97bbd4349907877bde68d38 (diff) | |
| parent | ba2719389515cee54874588d76b9244c17f568d5 (diff) | |
| download | emacs-d58fe6619f9b31069ebb420f0e85c7ce00a5fcb7.tar.gz emacs-d58fe6619f9b31069ebb420f0e85c7ce00a5fcb7.zip | |
Merge from origin/emacs-30
ba271938951 ; * etc/NEWS: Fix wording.
fdc6842a44e Remove bookmark fringe marks when deleting all bookmarks
3bccd04c5c6 Improve wording in symbols.texi
6441b9ea7af Fix typo in Gnus manual
87be3aa1491 eglot: Allow omnisharp binary to be capitalized "OmniSharp"
5485ea6aef9 Do not set `trusted-content` in major modes
d11488fd6fb ; * lisp/subr.el (sit-for): Doc fix.
# Conflicts:
# etc/NEWS
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/lispref/symbols.texi | 10 | ||||
| -rw-r--r-- | doc/misc/gnus.texi | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/doc/lispref/symbols.texi b/doc/lispref/symbols.texi index 37fb3b49e43..6cddd50c920 100644 --- a/doc/lispref/symbols.texi +++ b/doc/lispref/symbols.texi | |||
| @@ -106,11 +106,11 @@ reference any object. (This is not the same thing as holding the symbol | |||
| 106 | a value cell that is void results in an error, such as @samp{Symbol's | 106 | a value cell that is void results in an error, such as @samp{Symbol's |
| 107 | value as variable is void}. | 107 | value as variable is void}. |
| 108 | 108 | ||
| 109 | Because each symbol has separate value and function cells, variables | 109 | Because each symbol has separate value and function cells, the names |
| 110 | names and function names do not conflict. For example, the symbol | 110 | of variables and functions do not conflict. For example, the symbol |
| 111 | @code{buffer-file-name} has a value (the name of the file being | 111 | @code{buffer-file-name} has a value (the name of the file being visited |
| 112 | visited in the current buffer) as well as a function definition (a | 112 | in the current buffer) as well as a function definition (a primitive |
| 113 | primitive function that returns the name of the file): | 113 | function that returns the name of the file): |
| 114 | 114 | ||
| 115 | @example | 115 | @example |
| 116 | buffer-file-name | 116 | buffer-file-name |
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index cfcc8039165..239aa43703f 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi | |||
| @@ -17204,7 +17204,7 @@ filename is unrelated to the article number in Gnus. @code{nnmaildir} | |||
| 17204 | also stores the equivalent of @code{nnml}'s overview files in one file | 17204 | also stores the equivalent of @code{nnml}'s overview files in one file |
| 17205 | per article, so it uses about twice as many inodes as @code{nnml}. | 17205 | per article, so it uses about twice as many inodes as @code{nnml}. |
| 17206 | (Use @code{df -i} to see how plentiful your inode supply is.) If this | 17206 | (Use @code{df -i} to see how plentiful your inode supply is.) If this |
| 17207 | slows you down or takes up very much space, a non-block-structured | 17207 | slows you down or takes up very much space, use a non-block-structured |
| 17208 | file system. | 17208 | file system. |
| 17209 | 17209 | ||
| 17210 | Since maildirs don't require locking for delivery, the maildirs you use | 17210 | Since maildirs don't require locking for delivery, the maildirs you use |