summaryrefslogtreecommitdiff
path: root/mac
diff options
context:
space:
mode:
Diffstat (limited to 'mac')
-rw-r--r--mac/ChangeLog6
-rw-r--r--mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings4
-rw-r--r--mac/inc/config.h6
-rw-r--r--mac/src/Emacs.r6
4 files changed, 16 insertions, 6 deletions
diff --git a/mac/ChangeLog b/mac/ChangeLog
index 038d749ec2f..225d953dfc4 100644
--- a/mac/ChangeLog
+++ b/mac/ChangeLog
@@ -1,3 +1,7 @@
+2006-12-04 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
+
+ * inc/config.h: Sync with src/config.in.
+
2006-11-24 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* INSTALL: Add descriptions about configuration and invocation.
@@ -859,7 +863,7 @@
* src/macterm.c: New file.
;; Local Variables:
-;; coding: iso-2022-7bit-unix
+;; coding: iso-2022-7bit
;; add-log-time-zone-rule: t
;; End:
diff --git a/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings b/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings
index d297cfb34ef..88098f4728f 100644
--- a/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings
+++ b/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings
@@ -1,5 +1,5 @@
/* Localized versions of Info.plist keys */
CFBundleName = "Emacs";
-CFBundleShortVersionString = "22.0.91";
-CFBundleGetInfoString = "22.0.91, Copyright (C) 2006 Free Software Foundation, Inc.";
+CFBundleShortVersionString = "22.0.92";
+CFBundleGetInfoString = "22.0.92, Copyright (C) 2006 Free Software Foundation, Inc.";
diff --git a/mac/inc/config.h b/mac/inc/config.h
index 3af1f35e389..3dd38a2913d 100644
--- a/mac/inc/config.h
+++ b/mac/inc/config.h
@@ -588,6 +588,9 @@ Boston, MA 02110-1301, USA. */
/* Define to 1 if `struct utimbuf' is declared by <utime.h>. */
#define HAVE_STRUCT_UTIMBUF 1
+/* Define to 1 if you have the `sync' function. */
+/* #undef HAVE_SYNC */
+
/* Define to 1 if you have the `sysinfo' function. */
/* #undef HAVE_SYSINFO */
@@ -715,6 +718,9 @@ Boston, MA 02110-1301, USA. */
/* Define to 1 if you have the X11R6 or newer version of Xt. */
/* #undef HAVE_X11XTR6 */
+/* Define to 1 if the file /usr/lib64 exists. */
+/* #undef HAVE_X86_64_LIB64_DIR */
+
/* Define to 1 if you have the Xaw3d library (-lXaw3d). */
/* #undef HAVE_XAW3D */
diff --git a/mac/src/Emacs.r b/mac/src/Emacs.r
index 73be8488f6b..37d6d0f7c39 100644
--- a/mac/src/Emacs.r
+++ b/mac/src/Emacs.r
@@ -221,10 +221,10 @@ resource 'vers' (1) {
0x22, /* Major revision in BCD */
0x0, /* Minor revision in BCD */
alpha, /* development, alpha, beta, or final (release) */
- 91, /* Non-final release # */
+ 92, /* Non-final release # */
0, /* Region code */
- "22.0.91", /* Short version number */
- "22.0.91, Copyright \0xa9 2006 "
+ "22.0.92", /* Short version number */
+ "22.0.92, Copyright \0xa9 2006 "
"Free Software Foundation, Inc." /* Long version number */
};