diff options
author | Amin Bandali <bandali@gnu.org> | 2021-07-04 00:14:47 -0400 |
---|---|---|
committer | Amin Bandali <bandali@gnu.org> | 2021-07-04 00:14:47 -0400 |
commit | 8d957f2dd8b026ec0d7178222c0e5d9f82a2b91e (patch) | |
tree | 5537b9b530f07363a978472c449a9cbf46340967 /lisp/progmodes/cmacexp.el | |
parent | 136b30b0c44d30d642afa2ce00d804305eca3c23 (diff) | |
parent | 348b2aed0c8c3630be4c15c8e70acf7ea9c023af (diff) | |
download | emacs-8d957f2dd8b026ec0d7178222c0e5d9f82a2b91e.tar.gz |
Merge from origin/emacs-27
348b2aed0c Update IRC-related references to point to Libera.Chat
b0e725e2fe Fix typo in c-macro-expand docstring
# Conflicts:
# doc/misc/erc.texi
# doc/misc/gnus-faq.texi
# doc/misc/rcirc.texi
# etc/NEWS
# lisp/erc/erc-services.el
# lisp/erc/erc.el
# lisp/ldefs-boot.el
# lisp/net/rcirc.el
Diffstat (limited to 'lisp/progmodes/cmacexp.el')
-rw-r--r-- | lisp/progmodes/cmacexp.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/progmodes/cmacexp.el b/lisp/progmodes/cmacexp.el index edcd88ce24e..0f7c8c6f31a 100644 --- a/lisp/progmodes/cmacexp.el +++ b/lisp/progmodes/cmacexp.el @@ -141,7 +141,7 @@ Normally display output in temp buffer, but prefix arg means replace the region with it. `c-macro-preprocessor' specifies the preprocessor to use. -Tf the user option `c-macro-prompt-flag' is non-nil +If the user option `c-macro-prompt-flag' is non-nil prompt for arguments to the preprocessor \(e.g. `-DDEBUG -I ./include'), otherwise use `c-macro-cppflags'. |