[nongnu] elpa/lorem-ipsum a2a45dd401 06/30: Merge pull request #1 from jschaf/tweaks

[ELPA Syncer]

branch: elpa/lorem-ipsum
commit a2a45dd4018585f3978ead20c8dcf8d899c33a53
Merge: 60045e7d1d 65b486c051
Author: Joe Schafer <joe@jschaf.com>
Commit: Joe Schafer <joe@jschaf.com>

    Merge pull request #1 from jschaf/tweaks
    
    Tweaks
---
 README.md      |  8 ++++++++
 lorem-ipsum.el | 17 +++++++----------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index e69de29bb2..0222820755 100644
--- a/README.md
+++ b/README.md
@@ -0,0 +1,8 @@
+# Lorem Ipsum for Emacs #
+
+Add filler lorem ipsum text to Emacs
+
+## Installation
+
+
+## Setup
diff --git a/lorem-ipsum.el b/lorem-ipsum.el
index bc627b7b7c..45872525e1 100644
--- a/lorem-ipsum.el
+++ b/lorem-ipsum.el
@@ -4,8 +4,7 @@
 ;;                 and Marcus Tullius Cicero
 ;;
 ;; version :
-(defconst lorem-ipsum-version "0.1")
-;; last update: 16/09/2003
+(defconst lorem-ipsum-version "0.2")
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Copyright (c) 2003 Jean-Philippe Theberge
@@ -119,9 +118,8 @@
       (progn
        (insert (concat
                 (mapconcat 'identity
-                           (nth (if (interactive-p) 0 (random (length 
Lorem-ipsum-text)))
-                                Lorem-ipsum-text) " ")
-                Lorem-ipsum-paragraph-separator))
+                           (nth (random (length Lorem-ipsum-text))
+                                Lorem-ipsum-text) 
Lorem-ipsum-sentence-separator) Lorem-ipsum-paragraph-separator))
        (Lorem-ipsum-insert-paragraphs (- num 1)))))
 
 (defun Lorem-ipsum-insert-sentences (&optional num)
@@ -130,8 +128,8 @@
   (if (> num 0)
       (progn
        (let ((para
-              (nth (if (interactive-p) 0 (random (length Lorem-ipsum-text))) 
Lorem-ipsum-text)))
-         (insert (concat (nth (if (interactive-p) 0 (random (length para))) 
para) Lorem-ipsum-sentence-separator)))
+              (nth (random (length Lorem-ipsum-text)) Lorem-ipsum-text)))
+         (insert (concat (nth (random (length para)) para) 
Lorem-ipsum-sentence-separator)))
        (Lorem-ipsum-insert-sentences (- num 1)))))
 
 (defun Lorem-ipsum-insert-list (&optional num)
@@ -139,10 +137,9 @@
   (if (not num)(setq num 1))
   (if (> num 0)
       (progn
-       (if (interactive-p) (insert Lorem-ipsum-list-beginning))
-       (let ((para (nth (if (interactive-p) 0 (random (length 
Lorem-ipsum-text))) Lorem-ipsum-text)))
+       (let ((para (nth (random (length Lorem-ipsum-text)) Lorem-ipsum-text)))
          (insert (concat Lorem-ipsum-list-bullet
-                         (nth (if (interactive-p) 0 (random (length para))) 
para)
+                         (nth (random (length para)) para)
                          Lorem-ipsum-list-item-end)))
        (Lorem-ipsum-insert-list (- num 1)))
     (insert Lorem-ipsum-list-end)))