aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndreas Schwab2002-06-28 12:39:46 +0000
committerAndreas Schwab2002-06-28 12:39:46 +0000
commit1aa1cb6611ed1c524b191bc483026d2376b85c53 (patch)
tree16ed953d41260ae5c4cf2280f587d1edb4d37f5d /src
parent789d1bf0f08f1095ab67737e857ed5fec31b5d97 (diff)
downloademacs-1aa1cb6611ed1c524b191bc483026d2376b85c53.tar.gz
emacs-1aa1cb6611ed1c524b191bc483026d2376b85c53.zip
Remove duplicate declaration of code_convert_string_norecord.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/lisp.h1
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index f02f7113f29..d3898130d7c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12002-06-28 Andreas Schwab <schwab@suse.de>
2
3 * lisp.h: Remove duplicate declaration of
4 code_convert_string_norecord.
5
12002-06-27 Kim F. Storm <storm@cua.dk> 62002-06-27 Kim F. Storm <storm@cua.dk>
2 7
3 * xdisp.c: (mode_line_string_list, mode_line_string_face) 8 * xdisp.c: (mode_line_string_list, mode_line_string_face)
diff --git a/src/lisp.h b/src/lisp.h
index 659bf8db3f1..6ae8a8d016b 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2127,7 +2127,6 @@ EXFUN (Fupdate_coding_systems_internal, 0);
2127EXFUN (Fencode_coding_string, 3); 2127EXFUN (Fencode_coding_string, 3);
2128EXFUN (Fdecode_coding_string, 3); 2128EXFUN (Fdecode_coding_string, 3);
2129extern Lisp_Object detect_coding_system P_ ((unsigned char *, int, int, int)); 2129extern Lisp_Object detect_coding_system P_ ((unsigned char *, int, int, int));
2130Lisp_Object code_convert_string_norecord P_ ((Lisp_Object, Lisp_Object, int));
2131extern void init_coding P_ ((void)); 2130extern void init_coding P_ ((void));
2132extern void init_coding_once P_ ((void)); 2131extern void init_coding_once P_ ((void));
2133extern void syms_of_coding P_ ((void)); 2132extern void syms_of_coding P_ ((void));