[Emacs-diffs] Changes to emacs/src/macselect.c

[YAMAMOTO Mitsuharu]

Index: emacs/src/macselect.c
diff -c emacs/src/macselect.c:1.2 emacs/src/macselect.c:1.3
*** emacs/src/macselect.c:1.2   Mon Apr 25 01:46:56 2005
--- emacs/src/macselect.c       Fri May  6 08:03:08 2005
***************
*** 98,105 ****
--- 98,107 ----
     selection type with a scrap flavor type via `mac-ostype'.  */
  static Lisp_Object Qmac_scrap_name, Qmac_ostype;
  
+ #ifdef MAC_OSX
  /* Selection name for communication via Services menu.  */
  static Lisp_Object Vmac_services_selection;
+ #endif
  
  /* Get a reference to the scrap corresponding to the symbol SYM.  The
     reference is set to *SCRAP, and it becomes NULL if there's no
***************
*** 455,463 ****
            value = call3 (handler_fn, selection_name,
                           type, selection_value);
  
!         if (CONSP (value)
!             && EQ (XCAR (value), type)
!             && STRINGP (XCDR (value)))
            err = put_scrap_string (scrap, type, XCDR (value));
        }
  
--- 457,467 ----
            value = call3 (handler_fn, selection_name,
                           type, selection_value);
  
!         if (STRINGP (value))
!           err = put_scrap_string (scrap, type, value);
!         else if (CONSP (value)
!                  && EQ (XCAR (value), type)
!                  && STRINGP (XCDR (value)))
            err = put_scrap_string (scrap, type, XCDR (value));
        }
  
***************
*** 622,628 ****
        hooks = Vx_lost_selection_functions;
        selection_symbol = Fcar (Fcar (Vselection_alist));
  
!       if (!EQ (hooks, Qunbound))
        {
          for (; CONSP (hooks); hooks = Fcdr (hooks))
            call1 (Fcar (hooks), selection_symbol);
--- 626,633 ----
        hooks = Vx_lost_selection_functions;
        selection_symbol = Fcar (Fcar (Vselection_alist));
  
!       if (!EQ (hooks, Qunbound)
!         && !NILP (Fx_selection_owner_p (selection_symbol)))
        {
          for (; CONSP (hooks); hooks = Fcdr (hooks))
            call1 (Fcar (hooks), selection_symbol);
***************
*** 646,652 ****
        hooks = Vx_lost_selection_functions;
        selection_symbol = Fcar (Fcar (XCDR (rest)));
  
!       if (!EQ (hooks, Qunbound))
          {
            for (; CONSP (hooks); hooks = Fcdr (hooks))
              call1 (Fcar (hooks), selection_symbol);
--- 651,658 ----
        hooks = Vx_lost_selection_functions;
        selection_symbol = Fcar (Fcar (XCDR (rest)));
  
!       if (!EQ (hooks, Qunbound)
!         && !NILP (Fx_selection_owner_p (selection_symbol)))
          {
            for (; CONSP (hooks); hooks = Fcdr (hooks))
              call1 (Fcar (hooks), selection_symbol);