diff options
| author | Eli Zaretskii | 2023-04-21 07:29:14 -0400 |
|---|---|---|
| committer | Eli Zaretskii | 2023-04-21 07:29:14 -0400 |
| commit | f1ce49d148b334a8fb5302c4dd596aceffbb6b57 (patch) | |
| tree | e551bef8b4c260e79f920b495a206c993de7fc7c /doc/misc | |
| parent | 4416262f59f5e74d3991fdf9c06ad776eca50663 (diff) | |
| parent | 3899acbb3367984d66c7484a208b40a6851f4cc2 (diff) | |
| download | emacs-f1ce49d148b334a8fb5302c4dd596aceffbb6b57.tar.gz emacs-f1ce49d148b334a8fb5302c4dd596aceffbb6b57.zip | |
Merge from origin/emacs-29
3899acbb336 ; * src/fringe.c: Fix description of large circle. (Bug#...
2b10e1827d3 sql: add missing postgresql types
9ac12592781 Fix display of menu-bar bindings of commands in *Help* bu...
ecdd3a9efac Improve Completion Example section in the Emacs manual
626e1ac62b2 Improve 'message-server-alist' docstring
327986936c3 Add index entry for fallback modes
1c4783c3300 ; * etc/NEWS: Copyedits and grammar fixes.
3d6f7553319 xref-search-program-alist: Fix searching larger file list...
1b8b2cf61bd Fix typo and inaccuracy in the ELisp Reference manual
df17682ebf1 ; Support 'dart-ts-mode' in Eglot
e0dc60e0780 ; Fix typos in gdb-mi.el
60560cc7adf Fix description of lexical environment's internals
1456adf4248 ; Eglot: fix a typo in a customization type
2f59595f5f4 ; * etc/NEWS: Grammar fixes.
596b780ab71 Update to Org 9.6.4-2-g0f6ae7
a0b04a22479 Documentation copyedits for 'package-install-upgrade-buil...
580d8278c5f Allow upgrading built-in packages with 'package-install'
329304c23fa ; * src/term.c (init_tty): Fix last change. (Bug#62877)
200dbf7d302 Minor changes in c-ts-mode.el's support of DEFUNs
9686b015a0d Fix strike-through attribute support on TTY frames
39035fbfc5f Avoid crashes in 'describe-keymap' due to shadowing
# Conflicts:
# etc/NEWS
# lisp/progmodes/c-ts-mode.el
# lisp/progmodes/eglot.el
Diffstat (limited to 'doc/misc')
| -rw-r--r-- | doc/misc/org.org | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/misc/org.org b/doc/misc/org.org index 7ff0933de75..ae3fae0623e 100644 --- a/doc/misc/org.org +++ b/doc/misc/org.org | |||
| @@ -5958,8 +5958,9 @@ the agenda (see [[*Weekly/daily agenda]]). We distinguish: | |||
| 5958 | #+findex: org-block | 5958 | #+findex: org-block |
| 5959 | 5959 | ||
| 5960 | For more complex date specifications, Org mode supports using the | 5960 | For more complex date specifications, Org mode supports using the |
| 5961 | special expression diary entries implemented in the Emacs Calendar | 5961 | special expression diary entries implemented in the |
| 5962 | package[fn:20]. For example, with optional time: | 5962 | [[info:emacs#Special Diary Entries][Emacs Calendar package]][fn:20]. |
| 5963 | For example, with optional time: | ||
| 5963 | 5964 | ||
| 5964 | #+begin_example | 5965 | #+begin_example |
| 5965 | ,* 22:00-23:00 The nerd meeting on every 2nd Thursday of the month | 5966 | ,* 22:00-23:00 The nerd meeting on every 2nd Thursday of the month |