procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* buffer.c (Fset_buffer_modified_p): Use buffer_window_count

Browse source 
to check whether the buffer is displayed in some window.
* xdisp.c (message_dolog): Likewise.
This commit is contained in:
Dmitry Antipov 2012-12-24 16:21:42 +04:00
parent e7d52a4de5
commit 2944d406db
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/ChangeLog
View file

@ -5,6 +5,9 @@
struct buffer_text to avoid accessing an uninitialized value
when compact_buffer is called for the first time.
(compact_buffer): Use convenient BUF_COMPACT and BUF_MODIFF.
(Fset_buffer_modified_p): Use buffer_window_count to check
whether the buffer is displayed in some window.
* xdisp.c (message_dolog): Likewise.
2012-12-23 Eli Zaretskii <eliz@gnu.org>

6
src/buffer.c
View file

@ -1341,7 +1341,7 @@ DEFUN ("set-buffer-modified-p", Fset_buffer_modified_p, Sset_buffer_modified_p,
A non-nil FLAG means mark the buffer modified. */)
(Lisp_Object flag)
{
Lisp_Object fn, buffer, window;
Lisp_Object fn;
#ifdef CLASH_DETECTION
/* If buffer becoming modified, lock the file.
@ -1394,9 +1394,7 @@ A non-nil FLAG means mark the buffer modified. */)
Ideally, I think there should be another mechanism for fontifying
buffers without "modifying" buffers, or redisplay should be
smarter about updating the `*' in mode lines. --gerd */
XSETBUFFER (buffer, current_buffer);
window = Fget_buffer_window (buffer, Qt);
if (WINDOWP (window))
if (buffer_window_count (current_buffer))
{
++update_mode_lines;
current_buffer->prevent_redisplay_optimizations_p = 1;

7
src/xdisp.c
View file

@ -9397,7 +9397,8 @@ message_dolog (const char *m, ptrdiff_t nbytes, int nlflag, int multibyte)
int old_windows_or_buffers_changed = windows_or_buffers_changed;
ptrdiff_t point_at_end = 0;
ptrdiff_t zv_at_end = 0;
Lisp_Object old_deactivate_mark, tem;
Lisp_Object old_deactivate_mark;
bool shown;
struct gcpro gcpro1;
old_deactivate_mark = Vdeactivate_mark;
@ -9539,9 +9540,9 @@ message_dolog (const char *m, ptrdiff_t nbytes, int nlflag, int multibyte)
unchain_marker (XMARKER (oldbegv));
unchain_marker (XMARKER (oldzv));
tem = Fget_buffer_window (Fcurrent_buffer (), Qt);
shown = buffer_window_count (current_buffer) > 0;
set_buffer_internal (oldbuf);
if (NILP (tem))
if (!shown)
windows_or_buffers_changed = old_windows_or_buffers_changed;
message_log_need_newline = !nlflag;
Vdeactivate_mark = old_deactivate_mark;