aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2012-12-30 13:34:39 -0800
committerPaul Eggert2012-12-30 13:34:39 -0800
commit84cc1ab62539eed7869a88003a017330d79e8cac (patch)
tree66ed8c47857fecd3973cfa43f43f6f4b33e8428d /src
parent7ec363cf23ac40b4d6f1423226a2e6cfa5e98df5 (diff)
downloademacs-84cc1ab62539eed7869a88003a017330d79e8cac.tar.gz
emacs-84cc1ab62539eed7869a88003a017330d79e8cac.zip
* coding.c (Qmac): Now static.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/coding.c3
-rw-r--r--src/coding.h2
3 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index bb69917bfb2..483930a6489 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12012-12-30 Paul Eggert <eggert@cs.ucla.edu>
2
3 * coding.c (Qmac): Now static.
4
12012-12-30 Jan Djärv <jan.h.d@swipnet.se> 52012-12-30 Jan Djärv <jan.h.d@swipnet.se>
2 6
3 * gtkutil.c (TOOLBAR_TOP_WIDGET): New macro. 7 * gtkutil.c (TOOLBAR_TOP_WIDGET): New macro.
diff --git a/src/coding.c b/src/coding.c
index 2c1139ec5fc..044583d26b6 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -301,7 +301,8 @@ Lisp_Object Vcoding_system_hash_table;
301 301
302static Lisp_Object Qcoding_system, Qeol_type; 302static Lisp_Object Qcoding_system, Qeol_type;
303static Lisp_Object Qcoding_aliases; 303static Lisp_Object Qcoding_aliases;
304Lisp_Object Qunix, Qdos, Qmac; 304Lisp_Object Qunix, Qdos;
305static Lisp_Object Qmac;
305Lisp_Object Qbuffer_file_coding_system; 306Lisp_Object Qbuffer_file_coding_system;
306static Lisp_Object Qpost_read_conversion, Qpre_write_conversion; 307static Lisp_Object Qpost_read_conversion, Qpre_write_conversion;
307static Lisp_Object Qdefault_char; 308static Lisp_Object Qdefault_char;
diff --git a/src/coding.h b/src/coding.h
index 192be58f083..db0033c751b 100644
--- a/src/coding.h
+++ b/src/coding.h
@@ -767,7 +767,7 @@ extern Lisp_Object Qcoding_system_p;
767extern Lisp_Object Qraw_text, Qemacs_mule, Qno_conversion, Qundecided; 767extern Lisp_Object Qraw_text, Qemacs_mule, Qno_conversion, Qundecided;
768extern Lisp_Object Qbuffer_file_coding_system; 768extern Lisp_Object Qbuffer_file_coding_system;
769 769
770extern Lisp_Object Qunix, Qdos, Qmac; 770extern Lisp_Object Qunix, Qdos;
771 771
772extern Lisp_Object Qtranslation_table; 772extern Lisp_Object Qtranslation_table;
773extern Lisp_Object Qtranslation_table_id; 773extern Lisp_Object Qtranslation_table_id;