aboutsummaryrefslogtreecommitdiffstats
path: root/src/cmds.c
diff options
context:
space:
mode:
authorTom Tromey2017-08-05 18:30:52 -0600
committerTom Tromey2017-08-05 18:31:39 -0600
commit9b463fa8648b7baed95a44f4317cb7402fd8bf1c (patch)
treec7134b781617519f14256c5126a766673a01c7dd /src/cmds.c
parent0bd08c00751a9deee66d304d3f18aa45ef1276db (diff)
downloademacs-9b463fa8648b7baed95a44f4317cb7402fd8bf1c.tar.gz
emacs-9b463fa8648b7baed95a44f4317cb7402fd8bf1c.zip
Respect comment-auto-fill-only-comments
Respect comment-auto-fill-only-comments when auto-filling and a comment syntax is defined. * lisp/newcomment.el (comment-indent-new-line): Do not check comment-auto-fill-only-comments. * lisp/simple.el (internal-auto-fill): New defun. * src/cmds.c (internal_self_insert): Call Qinternal_auto_fill, not auto_fill_function. (syms_of_cmds): Define Qinternal_auto_fill.
Diffstat (limited to 'src/cmds.c')
-rw-r--r--src/cmds.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/cmds.c b/src/cmds.c
index 51652d542a8..6f2db8696e9 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -268,9 +268,10 @@ Whichever character you type to run this command is inserted.
268The numeric prefix argument N says how many times to repeat the insertion. 268The numeric prefix argument N says how many times to repeat the insertion.
269Before insertion, `expand-abbrev' is executed if the inserted character does 269Before insertion, `expand-abbrev' is executed if the inserted character does
270not have word syntax and the previous character in the buffer does. 270not have word syntax and the previous character in the buffer does.
271After insertion, the value of `auto-fill-function' is called if the 271After insertion, `internal-auto-fill' is called if
272`auto-fill-chars' table has a non-nil value for the inserted character. 272`auto-fill-function' is non-nil and if the `auto-fill-chars' table has
273At the end, it runs `post-self-insert-hook'. */) 273a non-nil value for the inserted character. At the end, it runs
274`post-self-insert-hook'. */)
274 (Lisp_Object n) 275 (Lisp_Object n)
275{ 276{
276 CHECK_NUMBER (n); 277 CHECK_NUMBER (n);
@@ -475,7 +476,7 @@ internal_self_insert (int c, EMACS_INT n)
475 that. Must have the newline in place already so filling and 476 that. Must have the newline in place already so filling and
476 justification, if any, know where the end is going to be. */ 477 justification, if any, know where the end is going to be. */
477 SET_PT_BOTH (PT - 1, PT_BYTE - 1); 478 SET_PT_BOTH (PT - 1, PT_BYTE - 1);
478 auto_fill_result = call0 (BVAR (current_buffer, auto_fill_function)); 479 auto_fill_result = call0 (Qinternal_auto_fill);
479 /* Test PT < ZV in case the auto-fill-function is strange. */ 480 /* Test PT < ZV in case the auto-fill-function is strange. */
480 if (c == '\n' && PT < ZV) 481 if (c == '\n' && PT < ZV)
481 SET_PT_BOTH (PT + 1, PT_BYTE + 1); 482 SET_PT_BOTH (PT + 1, PT_BYTE + 1);
@@ -494,6 +495,8 @@ internal_self_insert (int c, EMACS_INT n)
494void 495void
495syms_of_cmds (void) 496syms_of_cmds (void)
496{ 497{
498 DEFSYM (Qinternal_auto_fill, "internal-auto-fill");
499
497 DEFSYM (Qundo_auto_amalgamate, "undo-auto-amalgamate"); 500 DEFSYM (Qundo_auto_amalgamate, "undo-auto-amalgamate");
498 DEFSYM (Qundo_auto__this_command_amalgamating, 501 DEFSYM (Qundo_auto__this_command_amalgamating,
499 "undo-auto--this-command-amalgamating"); 502 "undo-auto--this-command-amalgamating");