Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
930d429c
Commit
930d429c
authored
Mar 15, 2011
by
Paul Eggert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* cmds.c (internal_self_insert): Rename local to avoid shadowing.
parent
7082eac6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
src/ChangeLog
src/ChangeLog
+2
-0
src/cmds.c
src/cmds.c
+3
-3
No files found.
src/ChangeLog
View file @
930d429c
2011-03-15 Paul Eggert <eggert@cs.ucla.edu>
* cmds.c (internal_self_insert): Rename local to avoid shadowing.
* lisp.h (GCPRO2_VAR, GCPRO3_VAR, GCPRO4_VAR, GCPRO5_VAR, GCPRO6_VAR):
New macros, so that the caller can use some names other than
gcpro1, gcpro2, etc.
src/cmds.c
View file @
930d429c
...
...
@@ -485,18 +485,18 @@ internal_self_insert (int c, EMACS_INT n)
:
(
c
==
' '
||
c
==
'\n'
))
&&
!
NILP
(
BVAR
(
current_buffer
,
auto_fill_function
)))
{
Lisp_Object
tem
;
Lisp_Object
auto_fill_result
;
if
(
c
==
'\n'
)
/* After inserting a newline, move to previous line and fill
that. Must have the newline in place already so filling and
justification, if any, know where the end is going to be. */
SET_PT_BOTH
(
PT
-
1
,
PT_BYTE
-
1
);
tem
=
call0
(
BVAR
(
current_buffer
,
auto_fill_function
));
auto_fill_result
=
call0
(
BVAR
(
current_buffer
,
auto_fill_function
));
/* Test PT < ZV in case the auto-fill-function is strange. */
if
(
c
==
'\n'
&&
PT
<
ZV
)
SET_PT_BOTH
(
PT
+
1
,
PT_BYTE
+
1
);
if
(
!
NILP
(
tem
))
if
(
!
NILP
(
auto_fill_result
))
hairy
=
2
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment