Re: Please install and ack

From: "Jan Djärv" <jan.h.d@swipnet.se>
To: rms@gnu.org
Cc: emacs-devel@gnu.org
Subject: Re: Please install and ack
Date: Sun, 16 Sep 2007 10:56:39 +0200	[thread overview]
Message-ID: <46ECEFC7.3030606@swipnet.se> (raw)
In-Reply-To: <E1IVCOl-0000qc-F6@fencepost.gnu.org>

Richard Stallman skrev:
> These are tiny changes by "Peter O'Gorman"
> <bug-gnu-emacs@mlists.thewrittenword.com>.
> Would someone please install them?

Ack.

	Jan D.

> 
> 
> Index: src/xterm.c
> ===================================================================
> --- src/xterm.c.orig	2007-05-25 12:43:35.000000000 +0000
> +++ src/xterm.c	2007-08-31 03:43:32.106444418 +0000
> @@ -155,7 +155,9 @@
>  #endif
>  #endif
>  
> +#ifndef abs
>  #define abs(x)	((x) < 0 ? -(x) : (x))
> +#endif
>  
>  /* Default to using XIM if available.  */
>  #ifdef USE_XIM
> Index: src/keyboard.c
> ===================================================================
> --- src/keyboard.c.orig	2007-04-01 21:54:54.000000000 +0000
> +++ src/keyboard.c	2007-08-31 03:43:32.291971223 +0000
> @@ -112,7 +112,9 @@
>  #define KBD_BUFFER_SIZE 4096
>  #endif	/* No X-windows */
>  
> +#ifndef abs
>  #define abs(x)		((x) >= 0 ? (x) : -(x))
> +#endif
>  
>  /* Following definition copied from eval.c */
>  
> 
> ===================================================================
> --- src/gtkutil.c.orig	2007-05-14 14:56:31.000000000 +0000
> +++ src/gtkutil.c	2007-09-03 20:58:27.261561563 +0000
> @@ -1403,8 +1403,8 @@
>      {
>        Lisp_Object file;
>        struct gcpro gcpro1;
> -      GCPRO1 (file);
>        char *utf8_filename;
> +      GCPRO1 (file);
>  
>        file = build_string (default_filename);
>  
> 
>     This should have -lBSD, but that library is said to make
> Index: src/frame.h
> ===================================================================
> --- src/frame.h.orig	2007-01-21 04:18:16.000000000 +0000
> +++ src/frame.h	2007-09-06 18:18:37.784302154 +0000
> @@ -1036,7 +1036,7 @@
>    FULLSCREEN_WIDTH      = 1,
>    FULLSCREEN_HEIGHT     = 2,
>    FULLSCREEN_BOTH       = 3,
> -  FULLSCREEN_WAIT       = 4,
> +  FULLSCREEN_WAIT       = 4
>  };
>  
>  
> Index: src/termhooks.h
> ===================================================================
> --- src/termhooks.h.orig	2007-01-14 03:24:37.000000000 +0000
> +++ src/termhooks.h	2007-09-06 18:17:17.922589738 +0000
> @@ -331,7 +331,7 @@
>  
>    /* Queued from XTread_socket when session manager sends
>       save yourself before shutdown. */
> -  SAVE_SESSION_EVENT,
> +  SAVE_SESSION_EVENT
>  
>  #ifdef MAC_OS
>    /* Generated when an Apple event, a HICommand event, or a Services
> @@ -340,7 +340,7 @@
>       symbols, respectively.  Member `arg' is a Lisp object converted
>       from the received Apple event.  Parameters for non-Apple events
>       are converted to those in Apple events.  */
> -  MAC_APPLE_EVENT
> +  ,MAC_APPLE_EVENT
>  #endif
>  };
>  
> Index: src/xfaces.c
> ===================================================================
> --- src/xfaces.c.orig	2007-02-14 15:47:51.000000000 +0000
> +++ src/xfaces.c	2007-09-06 18:17:56.728517424 +0000
> @@ -263,9 +263,9 @@
>  #endif /* HAVE_X_WINDOWS */
>  
>  #include <ctype.h>
> -
> +#ifndef abs
>  #define abs(X)		((X) < 0 ? -(X) : (X))
> -
> +#endif
>  /* Number of pt per inch (from the TeXbook).  */
>  
>  #define PT_PER_INCH 72.27
> 
> 
> _______________________________________________
> Emacs-devel mailing list
> Emacs-devel@gnu.org
> http://lists.gnu.org/mailman/listinfo/emacs-devel