[Emacs-diffs] Changes to emacs/src/callproc.c [emacs-unicode-2]

[Miles Bader]

Index: emacs/src/callproc.c
diff -c emacs/src/callproc.c:1.198.2.3 emacs/src/callproc.c:1.198.2.4
*** emacs/src/callproc.c:1.198.2.3      Mon Jun 28 07:29:18 2004
--- emacs/src/callproc.c        Thu Oct 14 08:49:56 2004
***************
*** 216,222 ****
       int nargs;
       register Lisp_Object *args;
  {
!   Lisp_Object infile, buffer, current_dir, display, path;
    int fd[2];
    int filefd;
    register int pid;
--- 216,223 ----
       int nargs;
       register Lisp_Object *args;
  {
!   Lisp_Object infile, buffer, current_dir, path;
!   int display_p;
    int fd[2];
    int filefd;
    register int pid;
***************
*** 372,378 ****
      UNGCPRO;
    }
  
!   display = nargs >= 4 ? args[3] : Qnil;
  
    filefd = emacs_open (SDATA (infile), O_RDONLY, 0);
    if (filefd < 0)
--- 373,379 ----
      UNGCPRO;
    }
  
!   display_p = INTERACTIVE && nargs >= 4 && !NILP (args[3]);
  
    filefd = emacs_open (SDATA (infile), O_RDONLY, 0);
    if (filefd < 0)
***************
*** 739,745 ****
      int first = 1;
      int total_read = 0;
      int carryover = 0;
!     int display_on_the_fly = !NILP (display) && INTERACTIVE;
      struct coding_system saved_coding;
  
      saved_coding = process_coding;
--- 740,746 ----
      int first = 1;
      int total_read = 0;
      int carryover = 0;
!     int display_on_the_fly = display_p;
      struct coding_system saved_coding;
  
      saved_coding = process_coding;
***************
*** 803,808 ****
--- 804,812 ----
                    display_on_the_fly = 0;
                    process_coding = saved_coding;
                    carryover = nread;
+                   /* This is to make the above condition always
+                      fails in the future.  */
+                   saved_coding.type = coding_type_no_conversion;
                    continue;
                  }
  
***************
*** 832,843 ****
            bufptr = tempptr;
          }
  
!       if (!NILP (display) && INTERACTIVE)
          {
            if (first)
              prepare_menu_bars ();
            first = 0;
            redisplay_preserve_echo_area (1);
          }
        immediate_quit = 1;
        QUIT;
--- 836,851 ----
            bufptr = tempptr;
          }
  
!       if (display_p)
          {
            if (first)
              prepare_menu_bars ();
            first = 0;
            redisplay_preserve_echo_area (1);
+           /* This variable might have been set to 0 for code
+              detection.  In that case, we set it back to 1 because
+              we should have already detected a coding system.  */
+           display_on_the_fly = 1;
          }
        immediate_quit = 1;
        QUIT;