date:20171227

[elpa] master 3efbb84 2/2: Merge commit 'dca9cb6d19f9e28ad8fa267a84710703ff38e006'

2017-12-27 Thread Ian Dunn

branch: master
commit 3efbb84e2a49bd4bb65accbed42ebfd82b53f068
Merge: 93e9009 dca9cb6
Author: Ian Dunn 
Commit: Ian Dunn 

Merge commit 'dca9cb6d19f9e28ad8fa267a84710703ff38e006'
---
 packages/org-edna/org-edna-tests.el | 193 ++--
 packages/org-edna/org-edna.el   |  34 +--
 packages/org-edna/org-edna.info | 180 +++--
 packages/org-edna/org-edna.org  |   4 +
 4 files changed, 236 insertions(+), 175 deletions(-)

diff --git a/packages/org-edna/org-edna-tests.el 
b/packages/org-edna/org-edna-tests.el
index a6b3554..83c05a3 100644
--- a/packages/org-edna/org-edna-tests.el
+++ b/packages/org-edna/org-edna-tests.el
@@ -151,39 +151,39 @@
  (sexp (org-edna-string-form-to-sexp-form input-string 'condition)))
 (should (equal
  sexp
- '((self)
-   (!done?))
+ '(((self)
+(!done?)))
 
 (ert-deftest org-edna-form-to-sexp-arguments ()
   (let* ((input-string "match(\"checklist\") todo!(TODO)")
  (sexp (org-edna-string-form-to-sexp-form input-string 'action)))
 (should (equal
  sexp
- '((match "checklist")
-   (todo! TODO))
+ '(((match "checklist")
+   (todo! TODO)))
 
 (ert-deftest org-edna-form-to-sexp-if-no-else ()
   (let* ((input-string "if match(\"checklist\") done? then self todo!(TODO) 
endif")
  (sexp (org-edna-string-form-to-sexp-form input-string 'action)))
 (should (equal
  sexp
- '((if ((match "checklist")
-(done?))
-   ((self)
-(todo! TODO))
- nil))
+ '(((if ((match "checklist")
+ (done?))
+((self)
+ (todo! TODO))
+  nil)))
 
 (ert-deftest org-edna-form-to-sexp-if-else ()
   (let* ((input-string "if match(\"checklist\") done? then self todo!(TODO) 
else siblings todo!(DONE) endif")
  (sexp (org-edna-string-form-to-sexp-form input-string 'action)))
 (should (equal
  sexp
- '((if ((match "checklist")
-(done?))
-   ((self)
-(todo! TODO))
- ((siblings)
-  (todo! DONE
+ '(((if ((match "checklist")
+  (done?))
+((self)
+ (todo! TODO))
+  ((siblings)
+   (todo! DONE)
 
 (ert-deftest org-edna-expand-sexp-form ()
   ;; Override cl-gentemp so we have a repeatable test
@@ -224,21 +224,24 @@
  (consideration1 nil)
  (blocking-entry1 nil))
  ;; Don't need a new set of variables
- (progn
-   (setq targets1
- (org-edna--add-targets targets1
+ (let ((targets2 targets1)
+   (consideration2 consideration1)
+   (blocking-entry2 blocking-entry1))
+   (setq targets2
+ (org-edna--add-targets targets2
 (org-edna-finder/match 
"checklist")))
(org-edna--handle-action 'org-edna-action/todo!
-targets1
+targets2
 (point-marker)
 '(DONE)))
- ;; No new set of variables here either
- (progn
-   (setq targets1
- (org-edna--add-targets targets1
+ (let ((targets5 targets1)
+   (consideration5 consideration1)
+   (blocking-entry5 blocking-entry1))
+   (setq targets5
+ (org-edna--add-targets targets5
 (org-edna-finder/siblings)))
(org-edna--handle-action 'org-edna-action/todo!
-targets1
+targets5
 (point-marker)
 '(TODO)
  (output-form (org-edna--expand-sexp-form input-sexp)))
@@ -263,45 +266,46 @@
 (todo! TODO))
  ((siblings)
   (todo! DONE)
- (expected-form '(let
- ((targets1 nil)
-  (consideration1 nil)
-  (blocking-entry1 nil))
-   (if
-   ;; No inheritance in the conditional scope
-   (not
-

[elpa] master dca9cb6 1/2: Fixed bugs in parsing multiple forms

2017-12-27 Thread Ian Dunn

branch: master
commit dca9cb6d19f9e28ad8fa267a84710703ff38e006
Author: Ian Dunn 
Commit: Ian Dunn 

Fixed bugs in parsing multiple forms

* org-edna.el (org-edna--normalize-all-forms): New defun to parse all forms.
  (org-edna-string-form-to-sexp-form): Use it.
  (org-edna--expand-sexp-form): Fix scoping for form lists.
---
 org-edna-tests.el | 193 --
 org-edna.el   |  34 +++---
 org-edna.info | 180 ++
 org-edna.org  |   4 ++
 4 files changed, 236 insertions(+), 175 deletions(-)

diff --git a/org-edna-tests.el b/org-edna-tests.el
index a6b3554..83c05a3 100644
--- a/org-edna-tests.el
+++ b/org-edna-tests.el
@@ -151,39 +151,39 @@
  (sexp (org-edna-string-form-to-sexp-form input-string 'condition)))
 (should (equal
  sexp
- '((self)
-   (!done?))
+ '(((self)
+(!done?)))
 
 (ert-deftest org-edna-form-to-sexp-arguments ()
   (let* ((input-string "match(\"checklist\") todo!(TODO)")
  (sexp (org-edna-string-form-to-sexp-form input-string 'action)))
 (should (equal
  sexp
- '((match "checklist")
-   (todo! TODO))
+ '(((match "checklist")
+   (todo! TODO)))
 
 (ert-deftest org-edna-form-to-sexp-if-no-else ()
   (let* ((input-string "if match(\"checklist\") done? then self todo!(TODO) 
endif")
  (sexp (org-edna-string-form-to-sexp-form input-string 'action)))
 (should (equal
  sexp
- '((if ((match "checklist")
-(done?))
-   ((self)
-(todo! TODO))
- nil))
+ '(((if ((match "checklist")
+ (done?))
+((self)
+ (todo! TODO))
+  nil)))
 
 (ert-deftest org-edna-form-to-sexp-if-else ()
   (let* ((input-string "if match(\"checklist\") done? then self todo!(TODO) 
else siblings todo!(DONE) endif")
  (sexp (org-edna-string-form-to-sexp-form input-string 'action)))
 (should (equal
  sexp
- '((if ((match "checklist")
-(done?))
-   ((self)
-(todo! TODO))
- ((siblings)
-  (todo! DONE
+ '(((if ((match "checklist")
+  (done?))
+((self)
+ (todo! TODO))
+  ((siblings)
+   (todo! DONE)
 
 (ert-deftest org-edna-expand-sexp-form ()
   ;; Override cl-gentemp so we have a repeatable test
@@ -224,21 +224,24 @@
  (consideration1 nil)
  (blocking-entry1 nil))
  ;; Don't need a new set of variables
- (progn
-   (setq targets1
- (org-edna--add-targets targets1
+ (let ((targets2 targets1)
+   (consideration2 consideration1)
+   (blocking-entry2 blocking-entry1))
+   (setq targets2
+ (org-edna--add-targets targets2
 (org-edna-finder/match 
"checklist")))
(org-edna--handle-action 'org-edna-action/todo!
-targets1
+targets2
 (point-marker)
 '(DONE)))
- ;; No new set of variables here either
- (progn
-   (setq targets1
- (org-edna--add-targets targets1
+ (let ((targets5 targets1)
+   (consideration5 consideration1)
+   (blocking-entry5 blocking-entry1))
+   (setq targets5
+ (org-edna--add-targets targets5
 (org-edna-finder/siblings)))
(org-edna--handle-action 'org-edna-action/todo!
-targets1
+targets5
 (point-marker)
 '(TODO)
  (output-form (org-edna--expand-sexp-form input-sexp)))
@@ -263,45 +266,46 @@
 (todo! TODO))
  ((siblings)
   (todo! DONE)
- (expected-form '(let
- ((targets1 nil)
-  (consideration1 nil)
-  (blocking-entry1 nil))
-   (if
-   ;; No inheritance in the conditional scope
-

[elpa] externals/dash 8a145ca: Fix compilation issues in elpa.git

2017-12-27 Thread Stefan Monnier

branch: externals/dash
commit 8a145cacf872cf2f292337a67516cdc4e29a02ba
Author: Stefan Monnier 
Commit: Stefan Monnier 

Fix compilation issues in elpa.git

* dev/examples.el: Require examples-to-tests to make it compilable.
* .gitignore: Add a general .elc rule to also catch dev/*.elc.
---
 .gitignore  | 3 +--
 dev/examples.el | 5 -
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4ec8ea2..d6d59bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-/dash.elc
-/dash-functional.elc
+*.elc
 /dash-autoloads.el
 /dash-pkg.el
diff --git a/dev/examples.el b/dev/examples.el
index 22ea314..08961bb 100644
--- a/dev/examples.el
+++ b/dev/examples.el
@@ -1,6 +1,6 @@
 ;;; examples.el --- Examples/tests for dash.el's API  -*- lexical-binding: t 
-*-
 
-;; Copyright (C) 2015 Free Software Foundation, Inc.
+;; Copyright (C) 2015, 2017 Free Software Foundation, Inc.
 
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -23,6 +23,9 @@
 ;;; Code:
 
 (require 'dash)
+(eval-when-compile
+  (unless (fboundp 'def-example-group)
+(require 'examples-to-tests "dev/examples-to-tests")))
 
 (defun even? (num) (= 0 (% num 2)))
 (defun square (num) (* num num))

[elpa] master b8c5937: * stream/tests/stream-tests.el: Require 'generator'

2017-12-27 Thread Stefan Monnier

branch: master
commit b8c593718184366ec952d59ff082aeac1cac622f
Author: Stefan Monnier 
Commit: Stefan Monnier 

* stream/tests/stream-tests.el: Require 'generator'
---
 packages/stream/tests/stream-tests.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/stream/tests/stream-tests.el 
b/packages/stream/tests/stream-tests.el
index 896c729..021ed65 100644
--- a/packages/stream/tests/stream-tests.el
+++ b/packages/stream/tests/stream-tests.el
@@ -1,6 +1,6 @@
 ;;; stream-tests.el --- Unit tests for stream.el  -*- lexical-binding: t -*-
 
-;; Copyright (C) 2015 Free Software Foundation, Inc.
+;; Copyright (C) 2015, 2017 Free Software Foundation, Inc.
 
 ;; Author: Nicolas Petton 
 
@@ -26,6 +26,7 @@
 
 (require 'ert)
 (require 'stream)
+(require 'generator)
 (require 'cl-lib)
 
 (defun stream-to-list (stream)

[elpa] externals/bbdb b959fdd: * bbdb-vm.el: Don't require VM when compiled.

2017-12-27 Thread Stefan Monnier

branch: externals/bbdb
commit b959fdd06d234a60b02079cd836ed1d50197d48e
Author: Stefan Monnier 
Commit: Stefan Monnier 

* bbdb-vm.el: Don't require VM when compiled.

Trim the list of required packages from VM.

* bbdb-gnus.el (bbdb-insinuate-gnus):
* bbdb-vm.el (bbdb-insinuate-vm): Use defalias.
---
 bbdb-gnus.el | 18 +-
 bbdb-vm.el   | 59 +--
 2 files changed, 42 insertions(+), 35 deletions(-)

diff --git a/bbdb-gnus.el b/bbdb-gnus.el
index c279c58..c2ac987 100644
--- a/bbdb-gnus.el
+++ b/bbdb-gnus.el
@@ -51,17 +51,17 @@ Do not call this in your init file.  Use `bbdb-initialize'."
   ;; Set up user field for use in `gnus-summary-line-format'
   ;; (1) Big solution: use whole name
   (if bbdb-mua-summary-unify-format-letter
-  (fset (intern (concat "gnus-user-format-function-"
-bbdb-mua-summary-unify-format-letter))
-(lambda (header)
-  (bbdb-mua-summary-unify (mail-header-from header)
+  (defalias (intern (concat "gnus-user-format-function-"
+bbdb-mua-summary-unify-format-letter))
+(lambda (header)
+  (bbdb-mua-summary-unify (mail-header-from header)
 
-  ;; (2) Small solution: a mark for messages whos sender is in BBDB.
+  ;; (2) Small solution: a mark for messages whose sender is in BBDB.
   (if bbdb-mua-summary-mark-format-letter
-  (fset (intern (concat "gnus-user-format-function-"
-bbdb-mua-summary-mark-format-letter))
-(lambda (header)
-  (bbdb-mua-summary-mark (mail-header-from header))
+  (defalias (intern (concat "gnus-user-format-function-"
+bbdb-mua-summary-mark-format-letter))
+(lambda (header)
+  (bbdb-mua-summary-mark (mail-header-from header))
 
 (provide 'bbdb-gnus)
 
diff --git a/bbdb-vm.el b/bbdb-vm.el
index 07f158f..6fb9156 100644
--- a/bbdb-vm.el
+++ b/bbdb-vm.el
@@ -18,22 +18,29 @@
 ;; along with BBDB.  If not, see .
 
 ;;; Commentary:
-;;; This file contains the BBDB interface to VM.
-;;; See the BBDB info manual for documentation.
+;; This file contains the BBDB interface to VM.
+;; See the BBDB info manual for documentation.
 
 ;;; Code:
 
 (require 'bbdb)
 (require 'bbdb-com)
 (require 'bbdb-mua)
-(require 'vm-autoloads)
-(require 'vm-motion)
-(require 'vm-summary)
-(require 'vm-mime)
-(require 'vm-vars)
-(require 'vm-macro)
-(require 'vm-message)
-(require 'vm-misc)
+
+(when t ;Don't require during compilation, since VM might not be installed!
+  (require 'vm-autoloads)
+  (require 'vm-summary)
+  (require 'vm-mime)
+  (require 'vm-vars))
+
+(declare-function vm-get-header-contents "vm-summary"
+  (message header-name-regexp &optional clump-sep))
+(declare-function vm-decode-mime-encoded-words-in-string "vm-mime"
+  (string))
+(declare-function vm-su-interesting-full-name "vm-summary" (m))
+(declare-function vm-su-from "vm-summary" (m))
+(defvar vm-message-pointer) ;In vm-vars
+(defvar vm-mode-map);In vm-vars
 
 ;;;###autoload
 (defun bbdb/vm-header (header)
@@ -61,25 +68,25 @@ Do not call this in your init file.  Use `bbdb-initialize'."
   ;; Set up user field for use in `vm-summary-format'
   ;; (1) Big solution: use whole name
   (if bbdb-mua-summary-unify-format-letter
-  (fset (intern (concat "vm-summary-function-"
-bbdb-mua-summary-unify-format-letter))
-(lambda (m) (bbdb-mua-summary-unify
- ;; VM does not give us the original From header.
- ;; So we have to work backwards.
- (let ((name (vm-decode-mime-encoded-words-in-string
-  (vm-su-interesting-full-name m)))
-   (mail (vm-su-from m)))
-   (if (string= name mail) mail
- (format "\"%s\" <%s>" name mail)))
+  (defalias (intern (concat "vm-summary-function-"
+bbdb-mua-summary-unify-format-letter))
+(lambda (m) (bbdb-mua-summary-unify
+;; VM does not give us the original From header.
+;; So we have to work backwards.
+(let ((name (vm-decode-mime-encoded-words-in-string
+ (vm-su-interesting-full-name m)))
+  (mail (vm-su-from m)))
+  (if (string= name mail) mail
+(format "\"%s\" <%s>" name mail)))
 
   ;; (2) Small solution: a mark for messages whos sender is in BBDB.
   (if bbdb-mua-summary-mark-format-letter
-  (fset (intern (concat "vm-summary-function-"
-bbdb-mua-summary-mark-format-letter))
-;; VM does not give us the original From header.
-

[elpa] master 3efbb84 2/2: Merge commit 'dca9cb6d19f9e28ad8fa267a84710703ff38e006'

[elpa] master dca9cb6 1/2: Fixed bugs in parsing multiple forms

[elpa] externals/dash 8a145ca: Fix compilation issues in elpa.git

[elpa] master b8c5937: * stream/tests/stream-tests.el: Require 'generator'

[elpa] externals/bbdb b959fdd: * bbdb-vm.el: Don't require VM when compiled.

5 matches

Site Navigation

Mail list logo

Footer information