aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert <[email protected]>2011-04-10 23:48:18 -0700
committerPaul Eggert <[email protected]>2011-04-10 23:48:18 -0700
commita2cb4e6346247e98aac57d83afabfdee334e5559 (patch)
tree91c0bbcbcd494505c83cb3dd61cd499278057276 /src
parent127198fdc718d38078cf6abeb6f3a0862f3ac1d2 (diff)
* charset.h (charset_iso_8859_1): Remove decl.
* charset.c (charset_iso_8859_1, charset_emacs, map_charset_for_dump): Now static.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/charset.c14
-rw-r--r--src/charset.h1
3 files changed, 10 insertions, 9 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index dcbab4b96b..baf0c1f10a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
2011-04-11 Paul Eggert <[email protected]>
+ * charset.h (charset_iso_8859_1): Remove decl.
+ * charset.c (charset_iso_8859_1, charset_emacs, map_charset_for_dump):
+ Now static.
+
* ccl.h (check_ccl_update, Vccl_program_table): Remove decls.
* ccl.c (Vccl_program_table): Now static.
(check_ccl_update): Remove; unused.
diff --git a/src/charset.c b/src/charset.c
index dc91cea2e1..cc7c53ae61 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -76,9 +76,9 @@ static Lisp_Object Qemacs;
/* The corresponding charsets. */
int charset_ascii;
int charset_eight_bit;
-int charset_iso_8859_1;
+static int charset_iso_8859_1;
int charset_unicode;
-int charset_emacs;
+static int charset_emacs;
/* The other special charsets. */
int charset_jisx0201_roman;
@@ -652,12 +652,10 @@ DEFUN ("charsetp", Fcharsetp, Scharsetp, 1, 1, 0,
}
-void map_charset_for_dump (void (*c_function) (Lisp_Object, Lisp_Object),
- Lisp_Object function, Lisp_Object arg,
- unsigned from, unsigned to);
-
-void
-map_charset_for_dump (void (*c_function) (Lisp_Object, Lisp_Object), Lisp_Object function, Lisp_Object arg, unsigned int from, unsigned int to)
+static void
+map_charset_for_dump (void (*c_function) (Lisp_Object, Lisp_Object),
+ Lisp_Object function, Lisp_Object arg,
+ unsigned int from, unsigned int to)
{
int from_idx = CODE_POINT_TO_INDEX (temp_charset_work->current, from);
int to_idx = CODE_POINT_TO_INDEX (temp_charset_work->current, to);
diff --git a/src/charset.h b/src/charset.h
index fef50394e6..74d55a31b4 100644
--- a/src/charset.h
+++ b/src/charset.h
@@ -519,7 +519,6 @@ extern Lisp_Object Qcharsetp;
extern Lisp_Object Qascii;
extern int charset_ascii, charset_eight_bit;
-extern int charset_iso_8859_1;
extern int charset_unicode;
extern int charset_jisx0201_roman;
extern int charset_jisx0208_1978;