aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndreas Schwab2012-07-07 23:39:23 +0200
committerAndreas Schwab2012-07-07 23:39:23 +0200
commitb676b881b26958bea01278cbcb7fee67fd79532e (patch)
tree667668babd0ae104d72a3a74e8ef3706d85fc20b /src
parent4da41f1c10ab05ebe74cd86211e79e3b9ae657ac (diff)
downloademacs-b676b881b26958bea01278cbcb7fee67fd79532e.tar.gz
emacs-b676b881b26958bea01278cbcb7fee67fd79532e.zip
* lisp.h: Remove empty conditional.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/lisp.h2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 3ef12b230b0..4ae2622d87d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12012-07-07 Andreas Schwab <schwab@linux-m68k.org>
2
3 * lisp.h: Remove empty conditional.
4
12012-07-07 Paul Eggert <eggert@cs.ucla.edu> 52012-07-07 Paul Eggert <eggert@cs.ucla.edu>
2 6
3 * lread.c (load_path_check): Now static. 7 * lread.c (load_path_check): Now static.
diff --git a/src/lisp.h b/src/lisp.h
index 53a15545794..ca199190bc0 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2958,8 +2958,6 @@ extern int indented_beyond_p (ptrdiff_t, ptrdiff_t, EMACS_INT);
2958extern void syms_of_indent (void); 2958extern void syms_of_indent (void);
2959 2959
2960/* Defined in frame.c */ 2960/* Defined in frame.c */
2961#ifdef HAVE_WINDOW_SYSTEM
2962#endif /* HAVE_WINDOW_SYSTEM */
2963extern Lisp_Object Qonly; 2961extern Lisp_Object Qonly;
2964extern Lisp_Object Qvisible; 2962extern Lisp_Object Qvisible;
2965extern void store_frame_param (struct frame *, Lisp_Object, Lisp_Object); 2963extern void store_frame_param (struct frame *, Lisp_Object, Lisp_Object);