+2011-11-26 Paul Eggert <eggert@cs.ucla.edu>
+
+ Rename locals to avoid shadowing.
+ * fileio.c (Finsert_file_contents):
+ Rename inner 'gcpro1' to 'inner_gcpro1' to avoid shadowing.
+ * process.c (wait_reading_process_output):
+ Rename inner 'proc' to 'p' to avoid shadowing.
+ Indent for consistency with usual Emacs style.
+
2011-11-25 Eli Zaretskii <eliz@gnu.org>
* xdisp.c (redisplay_window): If cursor row is not fully visible
int this_count = SPECPDL_INDEX ();
int multibyte = ! NILP (BVAR (current_buffer, enable_multibyte_characters));
Lisp_Object conversion_buffer;
- struct gcpro gcpro1;
+ struct gcpro inner_gcpro1;
conversion_buffer = code_conversion_save (1, multibyte);
inserted = 0; /* Bytes put into CONVERSION_BUFFER so far. */
unprocessed = 0; /* Bytes not processed in previous loop. */
- GCPRO1 (conversion_buffer);
+ GCPRO1_VAR (conversion_buffer, inner_gcpro);
while (how_much < total)
{
/* We read one bunch by one (READ_BUF_SIZE bytes) to allow
the gnutls library -- 2.12.14 has been confirmed
to need it. See
http://comments.gmane.org/gmane.emacs.devel/145074 */
- struct Lisp_Process *proc;
for (channel = 0; channel < MAXDESC; ++channel)
- {
- if (! NILP (chan_process[channel]) &&
- (proc = XPROCESS (chan_process[channel])) != NULL &&
- proc->gnutls_p &&
- proc->infd &&
- emacs_gnutls_record_check_pending (proc->gnutls_state) > 0)
- {
- nfds++;
- FD_SET (proc->infd, &Available);
- }
- }
+ if (! NILP (chan_process[channel]))
+ {
+ struct Lisp_Process *p =
+ XPROCESS (chan_process[channel]);
+ if (p && p->gnutls_p && p->infd
+ && ((emacs_gnutls_record_check_pending
+ (p->gnutls_state))
+ > 0))
+ {
+ nfds++;
+ FD_SET (p->infd, &Available);
+ }
+ }
}
else
{
/* Check this specific channel. */
- if (wait_proc->gnutls_p && /* Check for valid process. */
+ if (wait_proc->gnutls_p /* Check for valid process. */
/* Do we have pending data? */
- emacs_gnutls_record_check_pending (wait_proc->gnutls_state) > 0)
+ && ((emacs_gnutls_record_check_pending
+ (wait_proc->gnutls_state))
+ > 0))
{
nfds = 1;
/* Set to Available. */