emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/dash ffa37bf 425/439: Merge pull request #129 from holo


From: Phillip Lord
Subject: [elpa] externals/dash ffa37bf 425/439: Merge pull request #129 from holomorph/docs
Date: Tue, 04 Aug 2015 20:31:40 +0000

branch: externals/dash
commit ffa37bf5b9df62bd7feffff9314c009572f92bb7
Merge: 2db56f5 a803dd5
Author: Matus Goljer <address@hidden>
Commit: Matus Goljer <address@hidden>

    Merge pull request #129 from holomorph/docs
    
    docs
---
 README.md          |   50 +++++++++++++++++++++++++-------------------------
 dash-template.texi |    6 ++++++
 dash.texi          |    6 ++++++
 readme-template.md |    6 +++---
 4 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/README.md b/README.md
index 584fcf7..0e727f5 100644
--- a/README.md
+++ b/README.md
@@ -34,6 +34,31 @@ Include this in your emacs settings to get syntax 
highlighting:
 
 ## Functions
 
+All functions and constructs in the library are prefixed with a dash (-).
+
+There are also anaphoric versions of functions where that makes sense,
+prefixed with two dashes instead of one.
+
+While `-map` takes a function to map over the list, you can also use
+the anaphoric form with double dashes - which will then be executed
+with `it` exposed as the list item. Here's an example:
+
+```el
+(-map (lambda (n) (* n n)) '(1 2 3 4)) ;; normal version
+
+(--map (* it it) '(1 2 3 4)) ;; anaphoric version
+```
+
+of course the original can also be written like
+
+```el
+(defun square (n) (* n n))
+
+(-map 'square '(1 2 3 4))
+```
+
+which demonstrates the usefulness of both versions.
+
 
 ### Maps
 
@@ -264,31 +289,6 @@ These combinators require Emacs 24 for its lexical scope. 
So they are offered in
 * [-fixfn](#-fixfn-fn-optional-equal-test-halt-test) `(fn &optional equal-test 
halt-test)`
 * [-prodfn](#-prodfn-rest-fns) `(&rest fns)`
 
-## Anaphoric functions
-
-There are also anaphoric versions of functions where that makes sense,
-prefixed with two dashes instead of one.
-
-While `-map` takes a function to map over the list, you can also use
-the anaphoric form with double dashes - which will then be executed
-with `it` exposed as the list item. Here's an example:
-
-```el
-(-map (lambda (n) (* n n)) '(1 2 3 4)) ;; normal version
-
-(--map (* it it) '(1 2 3 4)) ;; anaphoric version
-```
-
-of course the original can also be written like
-
-```el
-(defun square (n) (* n n))
-
-(-map 'square '(1 2 3 4))
-```
-
-which demonstrates the usefulness of both versions.
-
 
 ## Maps
 
diff --git a/dash-template.texi b/dash-template.texi
index 58bb139..0e7dfc2 100644
--- a/dash-template.texi
+++ b/dash-template.texi
@@ -433,6 +433,12 @@ script for generating documentation.
 @item
 @uref{https://github.com/holomorph,Mark Oteiza} contributed the
 script to create an info manual.
address@hidden
address@hidden://github.com/wasamasa,Vasilij Schneidermann} contributed
address@hidden
address@hidden
address@hidden://github.com/occidens,William West} made @code{-fixfn}
+more robust at handling floats.
 @end itemize
 
 Thanks!
diff --git a/dash.texi b/dash.texi
index 67bfee1..f47b7b5 100644
--- a/dash.texi
+++ b/dash.texi
@@ -3784,6 +3784,12 @@ script for generating documentation.
 @item
 @uref{https://github.com/holomorph,Mark Oteiza} contributed the
 script to create an info manual.
address@hidden
address@hidden://github.com/wasamasa,Vasilij Schneidermann} contributed
address@hidden
address@hidden
address@hidden://github.com/occidens,William West} made @code{-fixfn}
+more robust at handling floats.
 @end itemize
 
 Thanks!
diff --git a/readme-template.md b/readme-template.md
index 5351fe7..b0cabc1 100644
--- a/readme-template.md
+++ b/readme-template.md
@@ -34,9 +34,7 @@ Include this in your emacs settings to get syntax 
highlighting:
 
 ## Functions
 
-[[ function-list ]]
-
-## Anaphoric functions
+All functions and constructs in the library are prefixed with a dash (-).
 
 There are also anaphoric versions of functions where that makes sense,
 prefixed with two dashes instead of one.
@@ -61,6 +59,8 @@ of course the original can also be written like
 
 which demonstrates the usefulness of both versions.
 
+[[ function-list ]]
+
 [[ function-docs ]]
 
 ## Contribute



reply via email to

[Prev in Thread] Current Thread [Next in Thread]