[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r109053: Fix typos that broke OS X bu
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r109053: Fix typos that broke OS X build. |
Date: |
Thu, 12 Jul 2012 09:58:37 -0700 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 109053
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Thu 2012-07-12 09:58:37 -0700
message:
Fix typos that broke OS X build.
Reported by Randal L. Schwartz in
<http://lists.gnu.org/archive/html/emacs-devel/2012-07/msg00225.html>.
* nsterm.m (ns_timeout): Add missing local decl.
(ns_get_color): snprintf -> sprintf, to fix typo.
modified:
src/ChangeLog
src/nsterm.m
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-07-12 07:43:05 +0000
+++ b/src/ChangeLog 2012-07-12 16:58:37 +0000
@@ -1,3 +1,11 @@
+2012-07-12 Paul Eggert <address@hidden>
+
+ Fix typos that broke OS X build.
+ Reported by Randal L. Schwartz in
+ <http://lists.gnu.org/archive/html/emacs-devel/2012-07/msg00225.html>.
+ * nsterm.m (ns_timeout): Add missing local decl.
+ (ns_get_color): snprintf -> sprintf, to fix typo.
+
2012-07-12 Glenn Morris <address@hidden>
* src/s/aix4-2.h, src/s/cygwin.h, src/s/darwin.h:
=== modified file 'src/nsterm.m'
--- a/src/nsterm.m 2012-07-10 23:24:36 +0000
+++ b/src/nsterm.m 2012-07-12 16:58:37 +0000
@@ -416,7 +416,7 @@
/* Keep waiting until past the time wakeup. */
while (1)
{
- EMACS_TIME now = current_emacs_time ();
+ EMACS_TIME timeout, now = current_emacs_time ();
if (EMACS_TIME_LE (wakeup, now))
break;
timeout = sub_emacs_time (wakeup, now);
@@ -1446,8 +1446,8 @@
int i;
scaling = strlen(name+start) / 3;
for (i = 0; i < 3; i++)
- snprintf (hex + i * (scaling + 1), "%.*s/", scaling,
- name + start + i * scaling);
+ sprintf (hex + i * (scaling + 1), "%.*s/", scaling,
+ name + start + i * scaling);
hex[3 * (scaling + 1) - 1] = '\0';
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r109053: Fix typos that broke OS X build.,
Paul Eggert <=