[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xdisp.c
From: |
Richard M . Stallman |
Subject: |
[Emacs-diffs] Changes to emacs/src/xdisp.c |
Date: |
Wed, 08 Sep 2004 21:35:45 -0400 |
Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.906 emacs/src/xdisp.c:1.907
*** emacs/src/xdisp.c:1.906 Wed Sep 8 11:37:16 2004
--- emacs/src/xdisp.c Thu Sep 9 01:30:27 2004
***************
*** 15794,15808 ****
DEFUN ("format-mode-line", Fformat_mode_line, Sformat_mode_line,
! 0, 3, 0,
doc: /* Return the mode-line of selected window as a string.
First optional arg FORMAT specifies a different format string (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. */)
! (format, window, no_props)
! Lisp_Object format, window, no_props;
{
struct it it;
int len;
--- 15794,15809 ----
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 a different format string (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;
{
struct it it;
int len;
***************
*** 15814,15825 ****
window = selected_window;
CHECK_WINDOW (window);
w = XWINDOW (window);
- CHECK_BUFFER (w->buffer);
! if (XBUFFER (w->buffer) != current_buffer)
{
old_buffer = current_buffer;
! set_buffer_internal_1 (XBUFFER (w->buffer));
}
if (NILP (format) || EQ (format, Qt))
--- 15815,15830 ----
window = selected_window;
CHECK_WINDOW (window);
w = XWINDOW (window);
! if (NILP (buffer))
! buffer = w->buffer;
!
! CHECK_BUFFER (buffer);
!
! if (XBUFFER (buffer) != current_buffer)
{
old_buffer = current_buffer;
! set_buffer_internal_1 (XBUFFER (buffer));
}
if (NILP (format) || EQ (format, Qt))
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Steven Tamm, 2004/09/02
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F . Storm, 2004/09/03
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Richard M . Stallman, 2004/09/04
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Richard M . Stallman, 2004/09/04
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F . Storm, 2004/09/08
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F . Storm, 2004/09/08
- [Emacs-diffs] Changes to emacs/src/xdisp.c,
Richard M . Stallman <=
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Richard M . Stallman, 2004/09/09
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Richard M . Stallman, 2004/09/18
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F . Storm, 2004/09/28
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F . Storm, 2004/09/29