Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1121

ChangeLog

+2008-04-23  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* configure.in: Remove hpux10.20 from the desupported list.
+
 2008-04-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* configure.in: Define USE_LUCID/USE_MOTIF in config.h.

admin/FOR-RELEASE

@@ -53,12 +53,6 @@ from 2007-08-27.  Impossible to procede without more input from OP (as
 of 20070912, emails are bouncing) or someone else who can reproduce this.
 http://lists.gnu.org/archive/html/emacs-devel/2007-08/msg01497.html
 
-** emacs-22.1 with GTK problems (with patches)
-Only outstanding issue seems to be whether Solaris 2.6 GTK can be
-supported in the absence of recursive mutexes, via a change to
-alloc.c, or whether configure should abort.
-http://lists.gnu.org/archive/html/bug-gnu-emacs/2007-09/msg00055.html
-
 * BUGS
 
 ** Does deleting frames run Lisp code?  If so, can we get rid of that?

configure.in

@@ -769,7 +769,7 @@ case "${machine}" in
 esac
 
 case "${opsys}" in
-     bsd386 | bsdos2-1 |  bsdos2 | bsdos3 | bsdos4 | bsd4-1 | bsd4-2 | bsd4-3 | usg5-0 | usg5-2-2 | usg5-2 | usg5-3 | ultrix4-3 | 386bsd | hpux | hpux8 | hpux9 | hpux9shr | hpux10 | hpux10-20 | aix3-1 | aix3-2-5 | aix3-2 | aix4-1 | nextstep | ux4800 | uxpds | uxpv )
+     bsd386 | bsdos2-1 |  bsdos2 | bsdos3 | bsdos4 | bsd4-1 | bsd4-2 | bsd4-3 | usg5-0 | usg5-2-2 | usg5-2 | usg5-3 | ultrix4-3 | 386bsd | hpux | hpux8 | hpux9 | hpux9shr | hpux10 | aix3-1 | aix3-2-5 | aix3-2 | aix4-1 | nextstep | ux4800 | uxpds | uxpv )
      	  echo "The system that you are configuring on: ${canonical} is considered to be obsolete"
 	  echo "and it is planned to be desupported in the next version of Emacs"
 	  echo "Please email emacs-devel@gnu.org as soon as possible if this system is still in use."

doc/emacs/ChangeLog

@@ -13,6 +13,11 @@
 	* building.texi (GDB-UI Layout, Breakpoints Buffer)
 	(Other GDB-UI Buffers): Update for recent thread related changes.
 
+2008-04-11  Mirko Vukovic  <mirko.vukovic@gmail.com>  (tiny change)
+
+	* maintaining.texi (Maintaining):
+	* emacs.texi (Top): Typo.
+
 2008-04-08  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* display.texi (Font Lock): Prefer add-hook to using a non-nil `mode'

doc/emacs/emacs.texi

@@ -713,7 +713,7 @@ Maintaining Large Programs
 
 * Change Log::	        Maintaining a change history for your program.
 * Format of ChangeLog:: What the change log file looks like.
-* Tags::	        Go direct to any function in your program in one
+* Tags::	        Go directly to any function in your program in one
 			  command.  Tags remembers which file it is in.
 * Emerge::              A convenient way of merging two versions of a program.
 

doc/emacs/maintaining.texi

@@ -12,7 +12,7 @@ also particularly useful for this purpose.
 @menu
 * Change Log::	        Maintaining a change history for your program.
 * Format of ChangeLog:: What the change log file looks like.
-* Tags::	        Go direct to any function in your program in one
+* Tags::	        Go directly to any function in your program in one
 			  command.  Tags remembers which file it is in.
 @ifnottex
 * Emerge::              A convenient way of merging two versions of a program.

lib-src/ChangeLog

+2008-04-10  Jason Rumney  <jasonr@gnu.org>
+
+	* makefile.w32-in (CLIENTRES): New variable and target.
+	(TRES): Remove.
+	($(BLD)/emacsclientw.exe): Use $(CLIENTRES) instead of $(TRES).
+
 2008-04-19  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* vcdiff: Use "sccs get" rather than "get"; leave PATH alone.

lib-src/makefile.w32-in

@@ -75,18 +75,19 @@ ECLIENTOBJS =	$(BLD)/emacsclient.$(O) \
 		$(BLD)/getopt.$(O) \
 		$(BLD)/getopt1.$(O) \
 		$(BLD)/ntlib.$(O)
-TRES =		../nt/$(BLD)/emacs.res
+CLIENTRES =	../nt/$(BLD)/emacsclient.res
 
-$(TRES):	../nt/emacs.rc
-		$(RC) $(RC_OUT)../nt/$(BLD)/emacs.res $(ALL_DEPS)
+$(CLIENTRES):	../nt/emacsclient.rc
+	@echo Emacsclient resource file must be built from nt directory
+	@exit -1
 
 $(BLD)/emacsclient.exe:		$(ECLIENTOBJS)
 # put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib
 		$(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(USER32) $(COMCTL32) $(LIBS)
 
-$(BLD)/emacsclientw.exe:	$(ECLIENTOBJS) $(TRES)
+$(BLD)/emacsclientw.exe:	$(ECLIENTOBJS) $(CLIENTRES)
 # put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib
-		$(LINK) $(LINK_OUT)$@ $(TRES) -mwindows $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(USER32) $(COMCTL32) $(LIBS)
+		$(LINK) $(LINK_OUT)$@ $(CLIENTRES) -mwindows $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(USER32) $(COMCTL32) $(LIBS)
 
 # emacsclient.$(O) depends on makefile.w32-in because makefile.w32-in
 # can be edited to define VERSION string, which is part of ECLIENT_CFLAGS.

lisp/ChangeLog

+2008-04-12  Nick Roberts  <nickrob@snap.net.nz>
+
+	* progmodes/gdb-ui.el (gdb-init-buffer): New function.
+	(gdb-set-gud-minor-mode-existing-buffers)
+	(gdb-info-breakpoints-custom, gdb-get-location)
+	(gdb-set-gud-minor-mode-existing-buffers-1): Use it.
+	Previously gdb-create-define-alist wasn't always run and added to
+	after-save-hook.
+
+	* progmodes/gud.el (gud-tooltip-tips): Use tooltip-event-buffer
+
+2008-04-12  Kevin Ryde  <user42@zip.com.au>
+
+	* progmodes/make-mode.el (makefile-fill-paragraph): Treat indented
+	comments like unindented ones.
+
+2008-04-12  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* term/mac-win.el (mac-ae-open-documents): Adjust selection range
+	parameter origins.
+
+2008-04-11  Kevin Ryde  <user42@zip.com.au>
+
+	* emacs-lisp/autoload.el (autoload-generate-file-autoloads):
+	Bind print-level to ensure output forms aren't truncated if
+	print-level is set to eval-expression-print-level when going via
+	eval-defun and friends, or has been otherwise fiddled with.
+
+2008-04-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* progmodes/cc-mode.el (c-basic-common-init): Don't set
+	font-lock-extend-after-change-region-function globally.
+
 2008-04-23  Juanma Barranquero  <lekktu@gmail.com>
 
 	* speedbar.el (speedbar-use-tool-tips-flag)

lisp/emacs-lisp/autoload.el

@@ -335,6 +335,7 @@ Return non-nil iff FILE adds no autoloads to OUTFILE
     (let ((autoloads-done '())
           (load-name (autoload-file-load-name file))
           (print-length nil)
+	  (print-level nil)
           (print-readably t)           ; This does something in Lucid Emacs.
           (float-output-format nil)
           (visited (get-file-buffer file))

lisp/gnus/nnrss.el

@@ -1131,7 +1131,5 @@ prefix), return the prefix."
 
 (provide 'nnrss)
 
-
-;;; nnrss.el ends here
-
 ;; arch-tag: 12910c07-0cdf-44fb-8d2c-416ded64c267
+;;; nnrss.el ends here

lisp/progmodes/cc-mode.el

@@ -601,7 +601,7 @@ that requires a literal mode spec at compile time."
   (add-hook 'before-change-functions 'c-before-change nil t)
   (make-local-hook 'after-change-functions)
   (add-hook 'after-change-functions 'c-after-change nil t)
-  (setq font-lock-extend-after-change-region-function
+  (set (make-local-variable 'font-lock-extend-after-change-region-function)
  	'c-extend-after-change-region))	; Currently (2008-04), only used by AWK.
 
 (defun c-setup-doc-comment-style ()

lisp/progmodes/gdb-ui.el

@@ -481,6 +481,15 @@ otherwise do not."
 
 (defconst gdb-source-file-regexp "\\(.+?\\), \\|\\([^, \n].*$\\)")
 
+(defun gdb-init-buffer ()
+  (set (make-local-variable 'gud-minor-mode)
+       (buffer-local-value 'gud-minor-mode gud-comint-buffer))
+  (set (make-local-variable 'tool-bar-map) gud-tool-bar-map)
+  (when gud-tooltip-mode
+    (make-local-variable 'gdb-define-alist)
+    (gdb-create-define-alist)
+    (add-hook 'after-save-hook 'gdb-create-define-alist nil t)))
+
 (defun gdb-set-gud-minor-mode-existing-buffers ()
   "Create list of source files for current GDB session."
   (goto-char (point-min))
@@ -493,12 +502,7 @@ otherwise do not."
 	(when (and buffer-file-name
 		   (member (file-name-nondirectory buffer-file-name)
 			   gdb-source-file-list))
-	  (set (make-local-variable 'gud-minor-mode) 'gdba)
-	  (set (make-local-variable 'tool-bar-map) gud-tool-bar-map)
-	  (when gud-tooltip-mode
-	    (make-local-variable 'gdb-define-alist)
-	    (gdb-create-define-alist)
-	    (add-hook 'after-save-hook 'gdb-create-define-alist nil t))))))
+	  (gdb-init-buffer)))))
   (gdb-force-mode-line-update
    (propertize "ready" 'face font-lock-variable-name-face)))
 
@@ -1953,10 +1957,7 @@ static char *magick[] = {
 				   (not (string-equal file "File not found")))
 			      (with-current-buffer
 				  (find-file-noselect file 'nowarn)
-				(set (make-local-variable 'gud-minor-mode)
-				     'gdba)
-				(set (make-local-variable 'tool-bar-map)
-				     gud-tool-bar-map)
+				(gdb-init-buffer)
 				;; Only want one breakpoint icon at each
 				;; location.
 				(save-excursion
@@ -3269,9 +3270,7 @@ Add directory to search path for source files using the GDB command, dir."))
       (throw 'file-not-found nil))
     (with-current-buffer
 	(find-file-noselect (match-string 0))
-      (save-current-buffer
-	(set (make-local-variable 'gud-minor-mode) 'gdba)
-	(set (make-local-variable 'tool-bar-map) gud-tool-bar-map))
+      (gdb-init-buffer)
       ;; only want one breakpoint icon at each location
       (save-excursion
 	(goto-line (string-to-number line))
@@ -3293,9 +3292,7 @@ of the current session."
 		    buffer-file-name)
 		  gdb-source-file-list)
 	  (with-current-buffer (find-buffer-visiting buffer-file-name)
-	    (set (make-local-variable 'gud-minor-mode)
-		 (buffer-local-value 'gud-minor-mode gud-comint-buffer))
-	    (set (make-local-variable 'tool-bar-map) gud-tool-bar-map)))))
+	    (gdb-init-buffer)))))
 
 ;;from put-image
 (defun gdb-put-string (putstring pos &optional dprop &rest sprops)
@@ -3625,13 +3622,7 @@ is set in them."
   (dolist (buffer (buffer-list))
     (with-current-buffer buffer
       (when (member buffer-file-name gdb-source-file-list)
-	(set (make-local-variable 'gud-minor-mode)
-	     (buffer-local-value 'gud-minor-mode gud-comint-buffer))
-	(set (make-local-variable 'tool-bar-map) gud-tool-bar-map)
-	(when gud-tooltip-mode
-	  (make-local-variable 'gdb-define-alist)
-	  (gdb-create-define-alist)
-	  (add-hook 'after-save-hook 'gdb-create-define-alist nil t)))))
+	(gdb-init-buffer))))
   (gdb-force-mode-line-update
    (propertize "ready" 'face font-lock-variable-name-face)))
 

lisp/progmodes/gud.el

@@ -3424,10 +3424,7 @@ This function must return nil if it doesn't handle EVENT."
 	  (if (and (eq gud-minor-mode 'gdba)
 		   (not gdb-active-process))
 	      (progn
-		(with-current-buffer
-		    (window-buffer (let ((mouse (mouse-position)))
-				     (window-at (cadr mouse)
-						(cddr mouse))))
+		(with-current-buffer (tooltip-event-buffer event)
 		  (let ((define-elt (assoc expr gdb-define-alist)))
 		    (unless (null define-elt)
 		      (tooltip-show

lisp/progmodes/make-mode.el

@@ -1352,7 +1352,7 @@ definition and conveniently use this command."
   (save-excursion
     (beginning-of-line)
     (cond
-     ((looking-at "^#+\\s-*")
+     ((looking-at "^[ \t]*#+\\s-*")
       ;; Found a comment.  Return nil to let normal filling take place.
       nil)
 

lisp/term/mac-win.el

@@ -1802,11 +1802,11 @@ if possible.  If there's no such frame, a new frame is created."
 	     (let ((line (car selection-range))
 		   (start (cadr selection-range))
 		   (end (nth 2 selection-range)))
-	       (if (> line 0)
-		   (goto-line line)
-		 (if (and (> start 0) (> end 0))
-		     (progn (set-mark start)
-			    (goto-char end))))))
+	       (if (>= line 0)
+		   (goto-line (1+ line))
+		 (if (and (>= start 0) (>= end 0))
+		     (progn (set-mark (1+ start))
+			    (goto-char (1+ end)))))))
 	    ((stringp search-text)
 	     (re-search-forward
 	      (mapconcat 'regexp-quote (split-string search-text) "\\|")

lisp/textmodes/paragraphs.el

@@ -355,8 +355,8 @@ With argument ARG, do it ARG times;
 a negative argument ARG = -N means move forward N paragraphs.
 
 A paragraph start is the beginning of a line which is a
-`first-line-of-paragraph' or which is ordinary text and follows a
-paragraph-separating line; except: if the first real line of a
+`paragraph-start' or which is ordinary text and follows a
+`paragraph-separate'ing line; except: if the first real line of a
 paragraph is preceded by a blank line, the paragraph starts at that
 blank line.
 

nt/ChangeLog

+2008-04-23  Eli Zaretskii  <eliz@gnu.org>
+
+	* makefile.w32-in (ALL): Move $(CLIENTRES) from here...
+	(all): ...to here.  $(ALL) is a prerequisite of .PHONY, so having
+	a real file there is not a good idea.
+
+2008-04-23  Jason Rumney  <jasonr@gnu.org>
+
+	* makefile.w32-in (CLIENTRES): New variable and build target.
+	(all): Depend on it.
+	($(TRES)): Use $(TRES) in rule.
+
 2008-04-21  Jason Rumney  <jasonr@gnu.org>
 
 	* configure.bat (success): Print "make" rather than "gmake", as that

nt/makefile.w32-in

@@ -24,13 +24,15 @@
 # FIXME: This file uses DOS EOLs.  Convert to Unix after 22.1 is out
 #        (and remove or replace this comment).
 
+TRES		= $(BLD)/emacs.res
+CLIENTRES	= $(BLD)/emacsclient.res
+
+XMFLAGS		=
+
 ALL		= addpm ddeclient runemacs cmdproxy addsection preprep
 
 .PHONY: $(ALL)
 
-TRES		= $(BLD)/emacs.res
-
-XMFLAGS		=
 
 addpm:		  stamp_BLD $(BLD)/addpm.exe
 $(BLD)/addpm.exe: $(BLD)/addpm.$(O)
@@ -62,7 +64,10 @@ $(BLD)/preprep.exe: $(BLD)/preprep.$(O)
 # it is not necessary on later versions, it is still ok to use it.
 #
 $(TRES):	emacs.rc icons/emacs.ico emacs.manifest stamp_BLD
-		$(RC) $(RC_OUT)$(BLD)/emacs.res emacs.rc
+		$(RC) $(RC_OUT)$(TRES) emacs.rc
+
+$(CLIENTRES):	emacsclient.rc stamp_BLD
+		$(RC) $(RC_OUT)$(CLIENTRES) emacsclient.rc
 
 runemacs:	  stamp_BLD $(BLD)/runemacs.exe
 $(BLD)/runemacs.exe: $(BLD)/runemacs.$(O) $(TRES)
@@ -81,7 +86,7 @@ $(BLD)/addpm.$(O) $(BLD)/ddeclient.$(O) $(BLD)/runemacs.$(O) $(BLD)/cmdproxy.$(O
 #
 # Build emacs
 #
-all:	which-sh stamp_BLD $(ALL) maybe-bootstrap all-other-dirs-$(MAKETYPE)
+all:	which-sh stamp_BLD $(ALL) $(CLIENTRES) maybe-bootstrap all-other-dirs-$(MAKETYPE)
 
 all-other-dirs-nmake: addsection
 	cd ..\lib-src

src/ChangeLog

+2008-04-19  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* mac.c (create_apple_event) [TARGET_API_MAC_CARBON]:
+	Make function non-static.
+	(create_apple_event_from_event_ref) [TARGET_API_MAC_CARBON]:
+	Remove function.
+	(create_apple_event_from_drag_ref) [TARGET_API_MAC_CARBON]:
+	Move to mactoolbox.c.
+	(mac_event_parameters_to_lisp) [TARGET_API_MAC_CARBON]: New function.
+
+	* macgui.h (CGFloat) [!CGFLOAT_DEFINED]: New typedef.
+	(mac_rect_make): New macro.
+
+	* macterm.c (mac_draw_image_string_atsui) [MAC_OSX]: Use CGFloat
+	instead of float.
+	(mac_draw_image_string_cg) [USE_CG_TEXT_DRAWING]: Likewise.
+	(init_cg_color, mac_draw_line, mac_draw_cg_image, XSetForeground)
+	(XSetBackground) [USE_CG_DRAWING]: Likewise.
+	(mac_draw_image_string_atsui) [MAC_OSX]: Use mac_rect_make instead of
+	CGRectMake.
+	(mac_draw_image_string_cg) [USE_CG_TEXT_DRAWING]: Likewise.
+	(mac_erase_rectangle, mac_draw_cg_image, mac_fill_rectangle)
+	(mac_set_clip_rectangles) [USE_CG_DRAWING]: Likewise.
+	(XCreatePixmap, XCreatePixmapFromBitmapData): Use Window
+	instead of WindowRef in argument type.
+	(XCreatePixmap) [!MAC_OS8]: Don't call SetPortWindowPort.
+	(mac_invert_rectangle): Use CGContextSetBlendMode if available.
+	(mac_set_clip_rectangles, mac_reset_clip_rectangles): Take argument F
+	instead of DISPLAY.  All uses changed.
+	(mac_handle_size_change): Don't call SET_FRAME_GARBAGED.
+	(x_calc_absolute_position): Simplify so as not to use
+	FRAME_PIXEL_WIDTH/FRAME_PIXEL_HEIGHT.
+
+	* macterm.h (XCreatePixmap, XCreatePixmapFromBitmapData): Use Window
+	instead of WindowRef in argument type.
+	(create_apple_event_from_event_ref, create_apple_event_from_drag_ref)
+	[TARGET_API_MAC_CARBON]: Remove externs.
+	(create_apple_event, mac_event_parameters_to_lisp)
+	[TARGET_API_MAC_CARBON]: Add externs.
+
+	* mactoolbox.c: (Vmac_ts_script_language_on_focus)
+	(saved_ts_script_language_on_focus) [USE_MAC_TSM]: Remove externs.
+	(XTread_socket) [USE_MAC_TOOLBAR]: Select window if its structure part
+	is clicked.
+	(x_activate_menubar): Remove extern for saved_menu_event_location.
+	(create_apple_event_from_drag_ref) [TARGET_API_MAC_CARBON]:
+	Move from mac.c.
+
+2008-04-12  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* alloc.c [!SYSTEM_MALLOC && !SYNC_INPUT] (uninterrupt_malloc)
+	[HAVE_GTK_AND_PTHREAD && !DOUG_LEA_MALLOC]: Don't use recursive mutex.
+
+2008-04-10  Jason Rumney  <jasonr@gnu.org>
+
+	* w32.c (stat): When Vw32_get_true_file_attributes is Qlocal, get
+	attributes only for local files.
+
+	* w32proc.c (syms_of_ntproc): Change Vw32_get_true_file attributes
+	default	to Qlocal.
+
 2008-04-22  Juri Linkov  <juri@jurta.org>
 
 	* buffer.c (Fswitch_to_buffer): Change interactive spec to call

src/alloc.c

@@ -1366,6 +1366,7 @@ void
 uninterrupt_malloc ()
 {
 #ifdef HAVE_GTK_AND_PTHREAD
+#ifdef DOUG_LEA_MALLOC
   pthread_mutexattr_t attr;
 
   /*  GLIBC has a faster way to do this, but lets keep it portable.
@@ -1373,6 +1374,11 @@ uninterrupt_malloc ()
   pthread_mutexattr_init (&attr);
   pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_RECURSIVE);
   pthread_mutex_init (&alloc_mutex, &attr);
+#else  /* !DOUG_LEA_MALLOC */
+  /* Some systems such as Solaris 2.6 doesn't have a recursive mutex,
+     and the bundled gmalloc.c doesn't require it.  */
+  pthread_mutex_init (&alloc_mutex, NULL);
+#endif /* !DOUG_LEA_MALLOC */
 #endif /* HAVE_GTK_AND_PTHREAD */
 
   if (__free_hook != emacs_blocked_free)

src/mac.c

@@ -817,7 +817,7 @@ init_coercion_handler ()
 }
 
 #if TARGET_API_MAC_CARBON
-static OSErr
+OSErr
 create_apple_event (class, id, result)
      AEEventClass class;
      AEEventID id;
@@ -842,129 +842,76 @@ create_apple_event (class, id, result)
   return err;
 }
 
-OSStatus
-create_apple_event_from_event_ref (event, num_params, names, types, result)
+Lisp_Object
+mac_event_parameters_to_lisp (event, num_params, names, types)
      EventRef event;
      UInt32 num_params;
      const EventParamName *names;
      const EventParamType *types;
-     AppleEvent *result;
 {
   OSStatus err;
-  UInt32 i, size;
+  Lisp_Object result = Qnil;
+  UInt32 i;
+  ByteCount size;
+#ifdef MAC_OSX
   CFStringRef string;
   CFDataRef data;
-  char *buf = NULL;
-
-  err = create_apple_event (0, 0, result); /* Dummy class and ID.  */
-  if (err != noErr)
-    return err;
-
-  for (i = 0; i < num_params; i++)
-    switch (types[i])
-      {
-#ifdef MAC_OSX
-      case typeCFStringRef:
-	err = GetEventParameter (event, names[i], typeCFStringRef, NULL,
-				 sizeof (CFStringRef), NULL, &string);
-	if (err != noErr)
-	  break;
-	data = CFStringCreateExternalRepresentation (NULL, string,
-						     kCFStringEncodingUTF8,
-						     '?');
-	if (data == NULL)
-	  break;
-	AEPutParamPtr (result, names[i], typeUTF8Text,
-		       CFDataGetBytePtr (data), CFDataGetLength (data));
-	CFRelease (data);
-	break;
 #endif
-
-      default:
-	err = GetEventParameter (event, names[i], types[i], NULL,
-				 0, &size, NULL);
-	if (err != noErr)
-	  break;
-	buf = xrealloc (buf, size);
-	err = GetEventParameter (event, names[i], types[i], NULL,
-				 size, NULL, buf);
-	if (err == noErr)
-	  AEPutParamPtr (result, names[i], types[i], buf, size);
-	break;
-      }
-  if (buf)
-    xfree (buf);
-
-  return noErr;
-}
-
-OSErr
-create_apple_event_from_drag_ref (drag, num_types, types, result)
-     DragRef drag;
-     UInt32 num_types;
-     const FlavorType *types;
-     AppleEvent *result;
-{
-  OSErr err;
-  UInt16 num_items;
-  AppleEvent items;
-  long index;
   char *buf = NULL;
 
-  err = CountDragItems (drag, &num_items);
-  if (err != noErr)
-    return err;
-  err = AECreateList (NULL, 0, false, &items);
-  if (err != noErr)
-    return err;
-
-  for (index = 1; index <= num_items; index++)
+  for (i = 0; i < num_params; i++)
     {
-      ItemReference item;
-      DescType desc_type = typeNull;
-      Size size;
+      EventParamName name = names[i];
+      EventParamType type = types[i];
 
-      err = GetDragItemReferenceNumber (drag, index, &item);
-      if (err == noErr)
+      switch (type)
 	{
-	  int i;
+#ifdef MAC_OSX
+	case typeCFStringRef:
+	  err = GetEventParameter (event, name, typeCFStringRef, NULL,
+				   sizeof (CFStringRef), NULL, &string);
+	  if (err != noErr)
+	    break;
+	  data = CFStringCreateExternalRepresentation (NULL, string,
+						       kCFStringEncodingUTF8,
+						       '?');
+	  if (data == NULL)
+	    break;
+	  name = EndianU32_NtoB (name);
+	  type = EndianU32_NtoB (typeUTF8Text);
+	  result =
+	    Fcons (Fcons (make_unibyte_string ((char *) &name, 4),
+			  Fcons (make_unibyte_string ((char *) &type, 4),
+				 make_unibyte_string (CFDataGetBytePtr (data),
+						      CFDataGetLength (data)))),
+		   result);
+	  CFRelease (data);
+	  break;
+#endif
 
-	  for (i = 0; i < num_types; i++)
+	default:
+	  err = GetEventParameter (event, name, type, NULL, 0, &size, NULL);
+	  if (err != noErr)
+	    break;
+	  buf = xrealloc (buf, size);
+	  err = GetEventParameter (event, name, type, NULL, size, NULL, buf);
+	  if (err == noErr)
 	    {
-	      err = GetFlavorDataSize (drag, item, types[i], &size);
-	      if (err == noErr)
-		{
-		  buf = xrealloc (buf, size);
-		  err = GetFlavorData (drag, item, types[i], buf, &size, 0);
-		}
-	      if (err == noErr)
-		{
-		  desc_type = types[i];
-		  break;
-		}
+	      name = EndianU32_NtoB (name);
+	      type = EndianU32_NtoB (type);
+	      result =
+		Fcons (Fcons (make_unibyte_string ((char *) &name, 4),
+			      Fcons (make_unibyte_string ((char *) &type, 4),
+				     make_unibyte_string (buf, size))),
+		       result);
 	    }
+	  break;
 	}
-      err = AEPutPtr (&items, index, desc_type,
-		      desc_type != typeNull ? buf : NULL,
-		      desc_type != typeNull ? size : 0);
-      if (err != noErr)
-	break;
     }
   if (buf)
     xfree (buf);
 
-  if (err == noErr)
-    {
-      err = create_apple_event (0, 0, result); /* Dummy class and ID.  */
-      if (err == noErr)
-	err = AEPutParamDesc (result, keyDirectObject, &items);
-      if (err != noErr)
-	AEDisposeDesc (result);
-    }
-
-  AEDisposeDesc (&items);
-
-  return err;
+  return result;
 }
 #endif	/* TARGET_API_MAC_CARBON */
 

src/macgui.h

@@ -126,6 +126,10 @@ typedef unsigned long Time;
 #endif
 #endif
 
+#ifndef CGFLOAT_DEFINED
+typedef float CGFloat;
+#endif
+
 typedef WindowRef Window;
 #if TARGET_API_MAC_CARBON
 typedef ScrapRef Selection;
@@ -149,6 +153,7 @@ typedef int Selection;
 #define mac_size_window		SizeWindow
 #define mac_get_global_mouse	GetGlobalMouse
 #define mac_is_window_toolbar_visible	IsWindowToolbarVisible
+#define mac_rect_make(f, x, y, w, h)	CGRectMake (x, y, w, h)
 typedef GWorldPtr Pixmap;
 
 #define Cursor ThemeCursor

src/macterm.c

@@ -351,7 +351,7 @@ init_cg_color ()
   if (CGColorGetTypeID != NULL)
 #endif
     {
-      float rgba[] = {0.0f, 0.0f, 0.0f, 1.0f};
+      CGFloat rgba[] = {0.0f, 0.0f, 0.0f, 1.0f};
 
       mac_cg_color_black = CGColorCreate (mac_cg_color_space_rgb, rgba);