aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2013-08-14 00:05:54 -0700
committerPaul Eggert2013-08-14 00:05:54 -0700
commitaab1fcdf812a7ebd32b8312c05ffcdd1bf610d2b (patch)
treed8e906e4383a7a2d167651d0331e27ed389ab77d /src
parent01c3051fc39127302943846f15047da305c07df0 (diff)
downloademacs-aab1fcdf812a7ebd32b8312c05ffcdd1bf610d2b.tar.gz
emacs-aab1fcdf812a7ebd32b8312c05ffcdd1bf610d2b.zip
* xdisp.c (cursor_type_changed): Now static.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/window.h4
-rw-r--r--src/xdisp.c2
3 files changed, 3 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 30a3dc3462b..a120cf1b182 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12013-08-14 Paul Eggert <eggert@cs.ucla.edu> 12013-08-14 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 * xdisp.c (cursor_type_changed): Now static.
4
3 * image.c (imagemagick_filename_hint): New arg HINT_BUFFER. 5 * image.c (imagemagick_filename_hint): New arg HINT_BUFFER.
4 Use changed. This avoids the need to call xmalloc and for the 6 Use changed. This avoids the need to call xmalloc and for the
5 caller to call xfree, and avoids memory leaks in some situations. 7 caller to call xfree, and avoids memory leaks in some situations.
diff --git a/src/window.h b/src/window.h
index 585697f0805..c64641825e3 100644
--- a/src/window.h
+++ b/src/window.h
@@ -906,10 +906,6 @@ extern int update_mode_lines;
906 906
907extern int windows_or_buffers_changed; 907extern int windows_or_buffers_changed;
908 908
909/* Nonzero means a frame's cursor type has been changed. */
910
911extern int cursor_type_changed;
912
913/* If *ROWS or *COLS are too small a size for FRAME, set them to the 909/* If *ROWS or *COLS are too small a size for FRAME, set them to the
914 minimum allowable size. */ 910 minimum allowable size. */
915 911
diff --git a/src/xdisp.c b/src/xdisp.c
index b8520e36344..82b528cdafd 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -524,7 +524,7 @@ int windows_or_buffers_changed;
524 524
525/* Nonzero means a frame's cursor type has been changed. */ 525/* Nonzero means a frame's cursor type has been changed. */
526 526
527int cursor_type_changed; 527static int cursor_type_changed;
528 528
529/* Nonzero after display_mode_line if %l was used and it displayed a 529/* Nonzero after display_mode_line if %l was used and it displayed a
530 line number. */ 530 line number. */