aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuanma Barranquero2011-04-28 04:01:33 +0200
committerJuanma Barranquero2011-04-28 04:01:33 +0200
commitb124fd93b090f840e30ad1fd9a9cbf1858c74342 (patch)
tree0d33400d00c2607eb8119c1fa132c76798d044e2 /src
parent8fff8daa8993c8d91e5cfbe1eb84ebf3f3dfca4c (diff)
downloademacs-b124fd93b090f840e30ad1fd9a9cbf1858c74342.tar.gz
emacs-b124fd93b090f840e30ad1fd9a9cbf1858c74342.zip
src/w32fns.c: #if-0 some functions entirely, not just the bodies.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/w32fns.c12
2 files changed, 8 insertions, 9 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 567c1251480..91777751853 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12011-04-28 Juanma Barranquero <lekktu@gmail.com>
2
3 * w32fns.c (Fx_change_window_property, Fx_delete_window_property)
4 (Fx_window_property): #if-0 the whole functions, not just the bodies.
5
12011-04-27 Paul Eggert <eggert@cs.ucla.edu> 62011-04-27 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 * doprnt.c (doprnt): Support "ll" length modifier, for long long. 8 * doprnt.c (doprnt): Support "ll" length modifier, for long long.
diff --git a/src/w32fns.c b/src/w32fns.c
index 821cc671646..bdf9dce9411 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -4865,6 +4865,8 @@ If TERMINAL is omitted or nil, that stands for the selected frame's display. */
4865 Window properties 4865 Window properties
4866 ***********************************************************************/ 4866 ***********************************************************************/
4867 4867
4868#if 0 /* TODO : port window properties to W32 */
4869
4868DEFUN ("x-change-window-property", Fx_change_window_property, 4870DEFUN ("x-change-window-property", Fx_change_window_property,
4869 Sx_change_window_property, 2, 6, 0, 4871 Sx_change_window_property, 2, 6, 0,
4870 doc: /* Change window property PROP to VALUE on the X window of FRAME. 4872 doc: /* Change window property PROP to VALUE on the X window of FRAME.
@@ -4884,7 +4886,6 @@ If OUTER_P is non-nil, the property is changed for the outer X window of
4884FRAME. Default is to change on the edit X window. */) 4886FRAME. Default is to change on the edit X window. */)
4885 (Lisp_Object prop, Lisp_Object value, Lisp_Object frame, Lisp_Object type, Lisp_Object format, Lisp_Object outer_p) 4887 (Lisp_Object prop, Lisp_Object value, Lisp_Object frame, Lisp_Object type, Lisp_Object format, Lisp_Object outer_p)
4886{ 4888{
4887#if 0 /* TODO : port window properties to W32 */
4888 struct frame *f = check_x_frame (frame); 4889 struct frame *f = check_x_frame (frame);
4889 Atom prop_atom; 4890 Atom prop_atom;
4890 4891
@@ -4901,8 +4902,6 @@ FRAME. Default is to change on the edit X window. */)
4901 XFlush (FRAME_W32_DISPLAY (f)); 4902 XFlush (FRAME_W32_DISPLAY (f));
4902 UNBLOCK_INPUT; 4903 UNBLOCK_INPUT;
4903 4904
4904#endif /* TODO */
4905
4906 return value; 4905 return value;
4907} 4906}
4908 4907
@@ -4913,8 +4912,6 @@ DEFUN ("x-delete-window-property", Fx_delete_window_property,
4913FRAME nil or omitted means use the selected frame. Value is PROP. */) 4912FRAME nil or omitted means use the selected frame. Value is PROP. */)
4914 (Lisp_Object prop, Lisp_Object frame) 4913 (Lisp_Object prop, Lisp_Object frame)
4915{ 4914{
4916#if 0 /* TODO : port window properties to W32 */
4917
4918 struct frame *f = check_x_frame (frame); 4915 struct frame *f = check_x_frame (frame);
4919 Atom prop_atom; 4916 Atom prop_atom;
4920 4917
@@ -4926,7 +4923,6 @@ FRAME nil or omitted means use the selected frame. Value is PROP. */)
4926 /* Make sure the property is removed when we return. */ 4923 /* Make sure the property is removed when we return. */
4927 XFlush (FRAME_W32_DISPLAY (f)); 4924 XFlush (FRAME_W32_DISPLAY (f));
4928 UNBLOCK_INPUT; 4925 UNBLOCK_INPUT;
4929#endif /* TODO */
4930 4926
4931 return prop; 4927 return prop;
4932} 4928}
@@ -4951,8 +4947,6 @@ Value is nil if FRAME hasn't a property with name PROP or if PROP has
4951no value of TYPE (always string in the MS Windows case). */) 4947no value of TYPE (always string in the MS Windows case). */)
4952 (Lisp_Object prop, Lisp_Object frame) 4948 (Lisp_Object prop, Lisp_Object frame)
4953{ 4949{
4954#if 0 /* TODO : port window properties to W32 */
4955
4956 struct frame *f = check_x_frame (frame); 4950 struct frame *f = check_x_frame (frame);
4957 Atom prop_atom; 4951 Atom prop_atom;
4958 int rc; 4952 int rc;
@@ -4992,10 +4986,10 @@ no value of TYPE (always string in the MS Windows case). */)
4992 4986
4993 return prop_value; 4987 return prop_value;
4994 4988
4995#endif /* TODO */
4996 return Qnil; 4989 return Qnil;
4997} 4990}
4998 4991
4992#endif /* TODO */
4999 4993
5000 4994
5001/*********************************************************************** 4995/***********************************************************************