procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix typos that broke OS X build.

Browse source 
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.
This commit is contained in:
Paul Eggert 2012-07-12 09:58:37 -07:00
parent debd9b27a2
commit b300b1f424
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/ChangeLog
View file

@ -1,3 +1,11 @@
2012-07-12 Paul Eggert <eggert@cs.ucla.edu>
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 <rgm@gnu.org>
* src/s/aix4-2.h, src/s/cygwin.h, src/s/darwin.h:

6
src/nsterm.m
View file

@ -416,7 +416,7 @@ Updated by Christian Limpach (chris@nice.ch)
/* 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 @@ Free a pool and temporary objects it refers to (callable from C)
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';
}