aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog8
-rw-r--r--src/data.c6
2 files changed, 11 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 750e3d52df3..5260196d5cd 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12004-10-19 Luc Teirlinck <teirllm@auburn.edu>
2
3 * data.c (Flocal_variable_if_set_p): Doc fix.
4
12004-10-19 Jason Rumney <jasonr@gnu.org> 52004-10-19 Jason Rumney <jasonr@gnu.org>
2 6
3 * w32.c (init_environment): Set emacs_dir correctly when running 7 * w32.c (init_environment): Set emacs_dir correctly when running
@@ -10,7 +14,7 @@
10 14
112004-10-19 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> 152004-10-19 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
12 16
13 * gtkutil.h (xg_update_scrollbar_pos): Remove arguments real_left 17 * gtkutil.h (xg_update_scrollbar_pos): Remove arguments real_left
14 and canon_width. 18 and canon_width.
15 (xg_frame_cleared): Removed. 19 (xg_frame_cleared): Removed.
16 20
@@ -25,7 +29,7 @@
25 Move window clear to xterm.c. 29 Move window clear to xterm.c.
26 30
27 * gtkutil.h (xg_frame_cleared): Removed. 31 * gtkutil.h (xg_frame_cleared): Removed.
28 32
29 * xterm.c (x_clear_frame): Remove call to xg_frame_cleared 33 * xterm.c (x_clear_frame): Remove call to xg_frame_cleared
30 (x_scroll_bar_create, XTset_vertical_scroll_bar): Remove 34 (x_scroll_bar_create, XTset_vertical_scroll_bar): Remove
31 arguments left and width to xg_update_scrollbar_pos. 35 arguments left and width to xg_update_scrollbar_pos.
diff --git a/src/data.c b/src/data.c
index 616e91c2d62..33b37376a49 100644
--- a/src/data.c
+++ b/src/data.c
@@ -1794,7 +1794,11 @@ BUFFER defaults to the current buffer. */)
1794 1794
1795DEFUN ("local-variable-if-set-p", Flocal_variable_if_set_p, Slocal_variable_if_set_p, 1795DEFUN ("local-variable-if-set-p", Flocal_variable_if_set_p, Slocal_variable_if_set_p,
1796 1, 2, 0, 1796 1, 2, 0,
1797 doc: /* Non-nil if VARIABLE will be local in buffer BUFFER if it is set there. 1797 doc: /* Non-nil if VARIABLE will be local in buffer BUFFER when set there.
1798More precisely, this means that setting the variable \(with `set' or`setq'),
1799while it does not have a `let'-style binding that was made in BUFFER,
1800will produce a buffer local binding. See Info node
1801`(elisp)Creating Buffer-Local'.
1798BUFFER defaults to the current buffer. */) 1802BUFFER defaults to the current buffer. */)
1799 (variable, buffer) 1803 (variable, buffer)
1800 register Lisp_Object variable, buffer; 1804 register Lisp_Object variable, buffer;