Revert "merged with ChangeLog and inst/NEWS.Rd"

This reverts commit 6728a2d, reversing
changes made to 5ecbbd0.

Author: eddelbuettel

.gitignore

@@ -1,6 +1,2 @@
 inst/lib
-*.Rproj
-.Rproj.user
-src/*.o
-src/*.so
-src/*.dll
+

ChangeLog

@@ -2,16 +2,6 @@
 
 	* inst/include/Rcpp/exceptions.h: Move stop() into Rcpp namespace
 
-2014-01-03  JJ Allaire <jj@rstudio.org>
-
-        * .gitignore: Added src/<object-files>, *.Rproj, and .Rproj.user
-        * inst/include/Rcpp/Interrupt.h: New checkUserInterrupt function
-        that provides a C++ friendly implementation of R_CheckUserInterrupt
-        * inst/include/RcppCommon.h: Include Rcpp/Interrupts.h
-        * inst/include/macros/macros.h: Check for interrupts in END_RCPP
-        * src/attributes.cpp: Handle interrupted-error in attribute
-        function envelope.
-
 2013-12-31  Dirk Eddelbuettel  <edd@debian.org>
 
 	* vignettes/Rcpp.bib: Updated CRAN package references

inst/NEWS.Rd

@@ -21,9 +21,6 @@
       and \code{NaN}.)
       \item Applied two bug fixes to Vector \code{sort()} and \code{RObject}
       definition spotted and corrected by Kevin Ushey
-      definition spotted and correct by Kevin Ushey
-      \item New \code{checkUserInterrupt()} function that provides a C++ friendly 
-      implementation of \code{R_CheckUserInterrupt}.
     }
     \item Changes in Rcpp documentation:
     \itemize{

inst/include/Rcpp/Interrupt.h

@@ -31,15 +31,15 @@
 #endif 
 
 #ifndef VOID_END_RCPP
-#define VOID_END_RCPP } catch( Rcpp::internal::InterruptedException& __ex__ ) { Rf_jump_to_toplevel(); } catch( std::exception& __ex__ ){ forward_exception_to_r( __ex__ ) ; } catch(...){ ::Rf_error( "c++ exception (unknown reason)" ) ; }
+#define VOID_END_RCPP } catch( std::exception& __ex__ ){ forward_exception_to_r( __ex__ ) ; } catch(...){ ::Rf_error( "c++ exception (unknown reason)" ) ; }
 #endif
 
 #ifndef END_RCPP
 #define END_RCPP VOID_END_RCPP return R_NilValue;
 #endif
 
 #ifndef END_RCPP_RETURN_ERROR
-#define END_RCPP_RETURN_ERROR } catch( Rcpp::internal::InterruptedException& __ex__ ) { return Rcpp::internal::interruptedError(); } catch( std::exception& __ex__ ){ return exception_to_try_error( __ex__ ) ; } catch(...){ return string_to_try_error( "c++ exception (unknown reason)" ) ; } return R_NilValue;
+#define END_RCPP_RETURN_ERROR } catch( std::exception& __ex__ ){ return exception_to_try_error( __ex__ ) ; } catch(...){ return string_to_try_error( "c++ exception (unknown reason)" ) ; } return R_NilValue;
 #endif
 
 #define Rcpp_error(MESSAGE) throw Rcpp::exception( MESSAGE, __FILE__, __LINE__ ) 

inst/include/Rcpp/macros/macros.h

@@ -139,8 +139,6 @@ namespace Rcpp{
 
 #include <Rcpp/exceptions.h>
 
-#include <Rcpp/Interrupt.h>
-
 namespace Rcpp{
     template <typename T> class object ;
     class String ;

inst/include/RcppCommon.h

@@ -1700,10 +1700,6 @@ namespace attributes {
                 ostr() << ");" << std::endl;
                 ostr() << "        }" << std::endl;
 
-                ostr() << "        if (__result.inherits(\"interrupted-error\"))" 
-                       << std::endl
-                       << "            throw Rcpp::internal::InterruptedException();"
-                       << std::endl;
                 ostr() << "        if (__result.inherits(\"try-error\"))" 
                        << std::endl
                        << "            throw Rcpp::exception(as<std::string>("
@@ -2226,13 +2222,7 @@ namespace attributes {
                 }
                 ostr << "));" << std::endl;
                 ostr << "    }" << std::endl;
-                ostr << "    Rboolean __isInterrupt = Rf_inherits(__result, \"interrupted-error\");"
-                     << std::endl
-                     << "    if (__isInterrupt) {" << std::endl
-                     << "        UNPROTECT(1);" << std::endl
-                     << "        Rcpp::internal::jumpToTop();" << std::endl
-                     << "    }" << std::endl
-                     << "    Rboolean __isError = Rf_inherits(__result, \"try-error\");"
+                ostr << "    Rboolean __isError = Rf_inherits(__result, \"try-error\");"
                      << std::endl
                      << "    if (__isError) {" << std::endl
                      << "        SEXP __msgSEXP = Rf_asChar(__result);" << std::endl