From: Joakim Verona <joakim@verona.se>
Date: Wed, 13 Jun 2012 16:00:21 +0000 (+0200)
Subject: upstream, doesn build yet
X-Git-Tag: emacs-25.0.90~3305
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=13d6898b0656b38da837261ec20a055a1be4a7e5;p=emacs.git

upstream, doesn build yet
---

13d6898b0656b38da837261ec20a055a1be4a7e5
diff --cc autogen/configure
index c1e77c0a13d,e4e1cbfd641..228cd850b29
--- a/autogen/configure
+++ b/autogen/configure
@@@ -1289,8 -1244,8 +1290,7 @@@ build_vendo
  build_cpu
  build
  PROFILING_CFLAGS
- MAINT
  GZIP_INFO
 -cache_file
  am__untar
  am__tar
  AMTAR
@@@ -2043,9 -1998,6 +2042,12 @@@ Optional Features
    --disable-ns-self-contained
                            disable self contained build under NeXTstep
    --enable-asserts        compile code with asserts enabled
++<<<<<<< TREE
 +  --enable-maintainer-mode
 +                          enable make rules and dependencies not useful (and
 +                          sometimes confusing) to the casual installer
++=======
++>>>>>>> MERGE-SOURCE
    --enable-locallisppath=PATH
                            directories Emacs should search for lisp files
                            specific to this site
@@@ -2682,65 -2635,6 +2684,68 @@@ $as_echo "$ac_res" >&6; 
  
  } # ac_fn_c_check_func
  
++<<<<<<< TREE
 +<<<<<<< TREE
 +=======
 +# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
 +# ----------------------------------------------------
 +# Tries to find if the field MEMBER exists in type AGGR, after including
 +# INCLUDES, setting cache variable VAR accordingly.
 +ac_fn_c_check_member ()
 +{
 +  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
 +$as_echo_n "checking for $2.$3... " >&6; }
 +if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +$5
 +int
 +main ()
 +{
 +static $2 ac_aggr;
 +if (ac_aggr.$3)
 +return 0;
 +  ;
 +  return 0;
 +}
 +_ACEOF
 +if ac_fn_c_try_compile "$LINENO"; then :
 +  eval "$4=yes"
 +else
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +$5
 +int
 +main ()
 +{
 +static $2 ac_aggr;
 +if (sizeof ac_aggr.$3)
 +return 0;
 +  ;
 +  return 0;
 +}
 +_ACEOF
 +if ac_fn_c_try_compile "$LINENO"; then :
 +  eval "$4=yes"
 +else
 +  eval "$4=no"
 +fi
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +fi
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +fi
 +eval ac_res=\$$4
 +	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 +$as_echo "$ac_res" >&6; }
 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
 +
 +} # ac_fn_c_check_member
 +
++=======
++>>>>>>> MERGE-SOURCE
  # ac_fn_c_check_type LINENO TYPE VAR INCLUDES
  # -------------------------------------------
  # Tests whether TYPE exists after having included INCLUDES, setting cache
@@@ -8300,8 -8171,11 +8397,16 @@@ esa
  
  
  
++<<<<<<< TREE
 +<<<<<<< TREE
 +=======
++=======
+ cat >>confdefs.h <<_ACEOF
+ #define SYSTEM_TYPE "$SYSTEM_TYPE"
+ _ACEOF
+ 
+ 
++>>>>>>> MERGE-SOURCE
  crt_files=
  
  for file in x $LIB_STANDARD $START_FILES; do
@@@ -9054,20 -8905,6 +9159,23 @@@ f
  
  done
  
++<<<<<<< TREE
 +for ac_func in getifaddrs freeifaddrs
 +do :
 +  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
 +eval as_val=\$$as_ac_var
 +   if test "x$as_val" = x""yes; then :
 +  cat >>confdefs.h <<_ACEOF
 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +_ACEOF
 +
 +fi
 +done
 +
++>>>>>>> MERGE-SOURCE
++=======
 +>>>>>>> MERGE-SOURCE
  
  ac_fn_c_check_member "$LINENO" "struct ifreq" "ifr_flags" "ac_cv_member_struct_ifreq_ifr_flags" "$ac_includes_default
  #if HAVE_SYS_SOCKET_H
@@@ -13381,20 -13331,9 +13585,12 @@@ $as_echo "#define GETPGRP_VOID 1" >>con
  fi
  
  
 +<<<<<<< TREE
 +# Configure gnulib.
 +=======
  # UNIX98 PTYs.
- for ac_func in grantpt
- do :
-   ac_fn_c_check_func "$LINENO" "grantpt" "ac_cv_func_grantpt"
- if test "x$ac_cv_func_grantpt" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_GRANTPT 1
- _ACEOF
  
- fi
- done
+ 
  
  
  # PTY-related GNU extensions.
diff --cc lisp/emacs-lisp/cl-loaddefs.el
index aa577577a20,6148ec71548..f0554342a09
--- a/lisp/emacs-lisp/cl-loaddefs.el
+++ b/lisp/emacs-lisp/cl-loaddefs.el
@@@ -277,19 -254,23 +254,36 @@@ Remove from SYMBOL's plist the propert
  
  ;;;***
  
++<<<<<<< TREE
 +;;;### (autoloads (defsubst* compiler-macroexpand define-compiler-macro
 +;;;;;;  assert check-type typep deftype cl-struct-setf-expander defstruct
 +;;;;;;  define-modify-macro callf2 callf letf* letf rotatef shiftf
 +;;;;;;  remf cl-do-pop psetf setf get-setf-method defsetf define-setf-method
 +;;;;;;  declare the locally multiple-value-setq multiple-value-bind
 +;;;;;;  lexical-let* lexical-let symbol-macrolet macrolet labels
 +;;;;;;  flet progv psetq do-all-symbols do-symbols dotimes dolist
 +;;;;;;  do* do loop return-from return block etypecase typecase ecase
 +;;;;;;  case load-time-value eval-when destructuring-bind function*
 +;;;;;;  defmacro* defun* gentemp gensym) "cl-macs" "cl-macs.el" "d19555cbac873fe90a312b8977a8ebff")
++=======
+ ;;;### (autoloads (cl--compiler-macro-cXXr cl--compiler-macro-list*
+ ;;;;;;  cl--compiler-macro-adjoin cl-defsubst cl-compiler-macroexpand
+ ;;;;;;  cl-define-compiler-macro cl-assert cl-check-type cl-typep
+ ;;;;;;  cl-deftype cl-struct-setf-expander cl-defstruct cl-define-modify-macro
+ ;;;;;;  cl-callf2 cl-callf cl-letf* cl-letf cl-rotatef cl-shiftf
+ ;;;;;;  cl-remf cl-do-pop cl-psetf cl-setf cl-get-setf-method cl-defsetf
+ ;;;;;;  cl-define-setf-expander cl-declare cl-the cl-locally cl-multiple-value-setq
+ ;;;;;;  cl-multiple-value-bind cl-symbol-macrolet cl-macrolet cl-labels
+ ;;;;;;  cl-flet cl-progv cl-psetq cl-do-all-symbols cl-do-symbols
+ ;;;;;;  cl-dotimes cl-dolist cl-do* cl-do cl-loop cl-return-from
+ ;;;;;;  cl-return cl-block cl-etypecase cl-typecase cl-ecase cl-case
+ ;;;;;;  cl-load-time-value cl-eval-when cl-destructuring-bind cl-function
+ ;;;;;;  cl-defmacro cl-defun cl-gentemp cl-gensym) "cl-macs" "cl-macs.el"
+ ;;;;;;  "32abce1bd6f38339285a6071e1be5e59")
++>>>>>>> MERGE-SOURCE
  ;;; Generated autoloads from cl-macs.el
  
- (autoload 'gensym "cl-macs" "\
+ (autoload 'cl-gensym "cl-macs" "\
  Generate a new uninterned symbol.
  The name is made by appending a number to PREFIX, default \"G\".
  
diff --cc lisp/emacs-lisp/cl-macs.el
index f1469766437,bc90898ad00..244e2f18cea
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@@ -3199,5 -3090,6 +3090,7 @@@ surrounded by (cl-block NAME ...)
  ;; generated-autoload-file: "cl-loaddefs.el"
  ;; End:
  
+ (provide 'cl-macs)
+ 
  ;;; cl-macs.el ends here
 +