[Emacs-diffs] Changes to emacs/src/xdisp.c

[Richard M . Stallman]

Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.954 emacs/src/xdisp.c:1.955
*** emacs/src/xdisp.c:1.954     Wed Jan  5 00:09:29 2005
--- emacs/src/xdisp.c   Thu Jan  6 17:47:18 2005
***************
*** 15969,15982 ****
  
  
  DEFUN ("format-mode-line", Fformat_mode_line, Sformat_mode_line,
!        0, 4, 0,
         doc: /* Return the mode-line of selected window as a string.
! First optional arg FORMAT specifies the mode line format (see
! `mode-line-format' for details) to use.  If FORMAT is t, return
! the buffer's header-line.  Second optional arg WINDOW specifies a
! different window to use as the context for the formatting.
! If third optional arg NO-PROPS is non-nil, string is not propertized.
! Fourth optional arg BUFFER specifies which buffer to use.  */)
    (format, window, no_props, buffer)
       Lisp_Object format, window, no_props, buffer;
  {
--- 15969,15981 ----
  
  
  DEFUN ("format-mode-line", Fformat_mode_line, Sformat_mode_line,
!        1, 4, 0,
         doc: /* Return the mode-line of selected window as a string.
! First arg FORMAT specifies the mode line format (see `mode-line-format' for
! details) to use.  Second optional arg WINDOW specifies a different window to
! use as the context for the formatting.  If third optional arg NO-PROPS is
! non-nil, string is not propertized.  Fourth optional arg BUFFER specifies
! which buffer to use.  */)
    (format, window, no_props, buffer)
       Lisp_Object format, window, no_props, buffer;
  {
***************
*** 16002,16017 ****
        set_buffer_internal_1 (XBUFFER (buffer));
      }
  
-   if (NILP (format) || EQ (format, Qt))
-     {
-       face_id = (NILP (format)
-                ? CURRENT_MODE_LINE_FACE_ID (w)
-                : HEADER_LINE_FACE_ID);
-       format = (NILP (format)
-               ? current_buffer->mode_line_format
-               : current_buffer->header_line_format);
-     }
- 
    init_iterator (&it, w, -1, -1, NULL, face_id);
  
    if (NILP (no_props))
--- 16001,16006 ----