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

Backport 2012-05-02T11:33:49Z!lekktu@gmail.com from trunk

Browse source
This commit is contained in:
Chong Yidong 2012-05-02 21:06:50 +08:00
parent 687d464f5c
commit be4e7c155b
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib-src/ChangeLog
View file

@ -1,3 +1,7 @@
2012-05-02 Juanma Barranquero <lekktu@gmail.com>
* emacsclient.c (min): Undef before redefining it.
2012-05-02 Jim Meyering <jim@meyering.net>
* emacsclient.c (send_to_emacs): Avoid invalid strcpy upon partial

3
lib-src/emacsclient.c
View file

@ -119,6 +119,9 @@ char *(getcwd) (char *, size_t);
# define IF_LINT(Code) /* empty */
#endif
#ifdef min
#undef min
#endif
#define min(x, y) (((x) < (y)) ? (x) : (y))