diff options
| author | Pavel Janík <Pavel@Janik.cz> | 2001-10-08 08:39:21 +0000 |
|---|---|---|
| committer | Pavel Janík <Pavel@Janik.cz> | 2001-10-08 08:39:21 +0000 |
| commit | 3fe81fdfd29e9d2d367076c3a323255e4aa3d6d4 (patch) | |
| tree | 12016441f85d57604f06c6bb861b26469637cf1c | |
| parent | 32c82ac0a18004dac223729f6e3a77a197814086 (diff) | |
| download | emacs-3fe81fdfd29e9d2d367076c3a323255e4aa3d6d4.tar.gz emacs-3fe81fdfd29e9d2d367076c3a323255e4aa3d6d4.tar.bz2 emacs-3fe81fdfd29e9d2d367076c3a323255e4aa3d6d4.zip | |
*** empty log message ***
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/keyboard.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 4e5a211d82e..c4030bffbb6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2001-10-08 Pavel Jan,Bm(Bk <Pavel@Janik.cz> + + * keyboard.c: Don't define min/max. + 2001-10-08 Gerd Moellmann <gerd@gnu.org> * xterm.c, xmenu.c, xfns.c, xdisp.c, window.c: diff --git a/src/keyboard.c b/src/keyboard.c index b9b825e16b3..6319ca2ff64 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -696,9 +696,6 @@ static void any_kboard_state P_ ((void)); to support it. */ static int cannot_suspend; -#define min(a,b) ((a)<(b)?(a):(b)) -#define max(a,b) ((a)>(b)?(a):(b)) - /* Install the string STR as the beginning of the string of echoing, so that it serves as a prompt for the next character. Also start echoing. */ |