Skip to content

Commit 8d35246

Browse files
eddelbuetteleddelbuettel
committed
updated .dir-locals.el and ChangeLog with it
1 parent 85e6b97 commit 8d35246

File tree

2 files changed

+47
-43
lines changed

2 files changed

+47
-43
lines changed

‎.dir-locals.el

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
;; -*- emacs-lisp -*-
22
((nil .
33
(
4-
(tab-width . 4)
4+
(tab-width . 8)
55
(indent-tabs-mode . nil)
66
(fill-column . 80)
77
))
88
(c++-mode .
99
(
1010
(indent-tabs-mode . nil)
11-
(tab-width . 4)
11+
(tab-width . 8)
1212
(show-trailing-whitespace . t)
1313
(indicate-empty-lines . t)
1414
(c-basic-offset . 4)

‎ChangeLog

Lines changed: 45 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -2,46 +2,50 @@
22

33
* R/Module.R (new_dummyObject): Remove erraneous quotes
44

5+
* .dir-locals.el: Setting tab-width to 8
6+
57
2014-05-18 Kevin Ushey <[email protected]>
68

7-
* inst/include/Rcpp/vector/Vector.h: Safer casting to fix #146
8-
* inst/include/Rcpp/Environment.h: Idem
9-
* inst/include/Rcpp/api/meat/Environment.h: Idem
10-
* inst/include/Rcpp/vector/Vector.h: Idem
9+
* inst/include/Rcpp/vector/Vector.h: Safer casting to fix #146
10+
* inst/include/Rcpp/Environment.h: Idem
11+
* inst/include/Rcpp/api/meat/Environment.h: Idem
12+
* inst/include/Rcpp/vector/Vector.h: Idem
13+
14+
* .dir-locals.el: Added for project-local Emacs settings
1115

1216
2014-05-10 Dirk Eddelbuettel <[email protected]>
1317

14-
* R/Attributes.R (compileAttributes): Read Imports: as well
18+
* R/Attributes.R (compileAttributes): Read Imports: as well
1519

1620
2014-05-07 Kevin Ushey <[email protected]>
1721

18-
* R/Attributes.R (.plugins[["cpp11"]]): Set USE_CXX1X to more
19-
reasonable non-empty value
22+
* R/Attributes.R (.plugins[["cpp11"]]): Set USE_CXX1X to more
23+
reasonable non-empty value
2024

2125
2014-05-06 Kevin Ushey <[email protected]>
2226

23-
* R/Attributes.R (.plugins[["cpp11"]]): Set USE_CXX1X to non-empty
24-
value
27+
* R/Attributes.R (.plugins[["cpp11"]]): Set USE_CXX1X to non-empty
28+
value
2529

2630
2014-04-30 Dirk Eddelbuettel <[email protected]>
2731

28-
* R/Attributes.R: Add plugins for C++0x and C++1y
32+
* R/Attributes.R: Add plugins for C++0x and C++1y
2933

3034
2014-04-30 JJ Allaire <[email protected]>
3135

3236
* R/Attributes.R: Use USE_CXX1X for cpp11 plugin when R >= 3.1
3337

3438
2014-04-02 Dirk Eddelbuettel <[email protected]>
3539

36-
* tests/doRUnit.R: Better RUnit error report with thanks to Murray
40+
* tests/doRUnit.R: Better RUnit error report with thanks to Murray
3741

3842
2014-03-18 JJ Allaire <[email protected]>
3943

4044
* man/cppFunction.Rd: Correct package header file example to use .h
4145

4246
2014-03-14 Dirk Eddelbuettel <[email protected]>
4347

44-
* inst/include/Rcpp/DataFrame.h: Add missing return in Impl method
48+
* inst/include/Rcpp/DataFrame.h: Add missing return in Impl method
4549

4650
2014-03-13 Dirk Eddelbuettel <[email protected]>
4751

@@ -52,20 +56,20 @@
5256

5357
2014-03-09 Kevin Ushey <[email protected]>
5458

55-
* inst/include/Rcpp/vector/const_string_proxy.h: Workaround for issue
56-
with constructing proxies from CHARSXPs
59+
* inst/include/Rcpp/vector/const_string_proxy.h: Workaround for issue
60+
with constructing proxies from CHARSXPs
5761

5862
2014-03-08 Kevin Ushey <[email protected]>
5963

60-
* inst/include/Rcpp/proxy/proxy.h: Make sure proxies know about the
61-
const char* wrap shortcut
64+
* inst/include/Rcpp/proxy/proxy.h: Make sure proxies know about the
65+
const char* wrap shortcut
6266

6367
2014-03-08 Dirk Eddelbuettel <[email protected]>
6468

65-
* inst/include/Rcpp/proxy/Binding.h: Remove spurious ';' [g++ -pedantic]
66-
* inst/include/Rcpp/proxy/ProtectedProxy.h: Idem
67-
* inst/include/Rcpp/proxy/TagProxy.h: Idem
68-
* inst/include/Rcpp/proxy/AttributeProxy.h: Idem
69+
* inst/include/Rcpp/proxy/Binding.h: Remove spurious ';' [g++ -pedantic]
70+
* inst/include/Rcpp/proxy/ProtectedProxy.h: Idem
71+
* inst/include/Rcpp/proxy/TagProxy.h: Idem
72+
* inst/include/Rcpp/proxy/AttributeProxy.h: Idem
6973

7074
2014-03-05 Kevin Ushey <[email protected]>
7175

@@ -107,12 +111,12 @@
107111

108112
2014-02-07 Kevin Ushey <[email protected]>
109113

110-
* inst/include/Rcpp/Reference.h: Add default ctor
114+
* inst/include/Rcpp/Reference.h: Add default ctor
111115

112116
2014-02-03 Kevin Ushey <[email protected]>
113117

114-
* inst/include/Rcpp/vector/Vector.h: Enable conversion from
115-
Rcpp vectors to RObject
118+
* inst/include/Rcpp/vector/Vector.h: Enable conversion from
119+
Rcpp vectors to RObject
116120

117121
2014-02-02 Dirk Eddelbuettel <[email protected]>
118122

@@ -127,11 +131,11 @@
127131

128132
2014-02-01 Dirk Eddelbuettel <[email protected]>
129133

130-
* tests/doRUnit.R: Simplified following pattern in RProtoBuf
134+
* tests/doRUnit.R: Simplified following pattern in RProtoBuf
131135

132-
* vignettes/Rcpp-unitTests.Rnw: Remove a now superfluous global var
136+
* vignettes/Rcpp-unitTests.Rnw: Remove a now superfluous global var
133137

134-
* vignettes/Rcpp.bib: Updated references to current packages
138+
* vignettes/Rcpp.bib: Updated references to current packages
135139

136140
2014-02-01 JJ Allaire <[email protected]>
137141

@@ -140,40 +144,40 @@
140144

141145
2014-01-31 Dirk Eddelbuettel <[email protected]>
142146

143-
* vignettes/Rcpp-FAQ.Rnw: Render code with background boxen
144-
* vignettes/Rcpp-package.Rnw: Idem
145-
* vignettes/Rcpp-modules.Rnw: Idem
146-
* vignettes/Rcpp-extending.Rnw: Idem
147-
* vignettes/Rcpp-sugar.Rnw: Idem
147+
* vignettes/Rcpp-FAQ.Rnw: Render code with background boxen
148+
* vignettes/Rcpp-package.Rnw: Idem
149+
* vignettes/Rcpp-modules.Rnw: Idem
150+
* vignettes/Rcpp-extending.Rnw: Idem
151+
* vignettes/Rcpp-sugar.Rnw: Idem
148152

149-
* vignettes/Rcpp-attributes.Rnw: Switched to highlight driver
153+
* vignettes/Rcpp-attributes.Rnw: Switched to highlight driver
150154

151-
* inst/include/Rcpp/Benchmark/Timer.h: Reverted back to using
152-
iterators via use of anonymous namespace for accessors
155+
* inst/include/Rcpp/Benchmark/Timer.h: Reverted back to using
156+
iterators via use of anonymous namespace for accessors
153157

154-
* inst/announce/ANNOUNCE-0.11.0.txt: Updated
158+
* inst/announce/ANNOUNCE-0.11.0.txt: Updated
155159

156160
2014-01-31 Dirk Eddelbuettel <[email protected]>
157161

158-
* man/Rcpp.package.skeleton.Rd: Also updated
162+
* man/Rcpp.package.skeleton.Rd: Also updated
159163

160164
2014-01-31 JJ Allaire <[email protected]>
161165

162166
* R/Attributes.R: Embedded R code chunks in sourceCpp are now
163-
executed within the working directory of the C++ source file.
167+
executed within the working directory of the C++ source file.
164168

165169
2014-01-30 Dirk Eddelbuettel <[email protected]>
166170

167-
* vignettes/Rcpp-package.Rnw: Updates for upcoming release
171+
* vignettes/Rcpp-package.Rnw: Updates for upcoming release
168172

169173
2014-01-28 Dirk Eddelbuettel <[email protected]>
170174

171-
* vignettes/Rcpp-FAQ.Rnw: Some updates for upcoming release
175+
* vignettes/Rcpp-FAQ.Rnw: Some updates for upcoming release
172176

173177
2014-01-25 Dirk Eddelbuettel <[email protected]>
174178

175-
* inst/include/Rcpp/Benchmark/Timer.h: Simplified -- Rcpp Gallery
176-
example using it was not building any longer under g++
179+
* inst/include/Rcpp/Benchmark/Timer.h: Simplified -- Rcpp Gallery
180+
example using it was not building any longer under g++
177181

178182
2014-01-23 Dirk Eddelbuettel <[email protected]>
179183

0 commit comments

Comments
 (0)