[elpa] master 98b8507 4/4: Merge commit 'ce8b57131aaa038165445e6d2eb0f791b118afa6'

[Ian Dunn]

branch: master
commit 98b8507a71051fcb1087104f2ff7621e7c2ad0e0
Merge: 627d83b ce8b571
Author: Ian Dunn <address@hidden>
Commit: Ian Dunn <address@hidden>

    Merge commit 'ce8b57131aaa038165445e6d2eb0f791b118afa6'
---
 packages/paced/paced.el   | 28 ++++++++++++++++------------
 packages/paced/paced.info | 34 +++++++++++++++++-----------------
 packages/paced/paced.org  |  2 +-
 3 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/packages/paced/paced.el b/packages/paced/paced.el
index 6b8f2aa..53b7870 100644
--- a/packages/paced/paced.el
+++ b/packages/paced/paced.el
@@ -87,7 +87,7 @@ the user whether to save dictionaries here."
   :group 'paced
   :type 'directory)
 
-(defcustom paced-dictionary-directory-whitelist-regexp ".*"
+(defcustom paced-dictionary-directory-whitelist-regexp (rx (zero-or-more 
anything))
   "Regexp to match when reading from the dictionary directory.
 
 Any files that match this regexp will be loaded by
@@ -95,11 +95,10 @@ Any files that match this regexp will be loaded by
   :group 'paced
   :type 'regexp)
 
-(defcustom paced-dictionary-directory-blacklist-regexp "$^"
+(defcustom paced-dictionary-directory-blacklist-regexp (rx string-end 
string-start)
   "Regexp to match for files NOT to load with `paced-load-all-dictionaries'.
 
-This is the string \"$^\" by default, which matches nothing, thus
-allowing all files."
+This regexp by default matches nothing, thus allowing all files."
   :group 'paced
   :type 'regexp)
 
@@ -443,8 +442,7 @@ dictionary conditions."
       (paced-named-dictionary dictionary))))
 
 (defvar paced-throw-error-on-no-current nil
-  "Whether to throw an error when no current dictionary can be
-found.")
+  "Whether to throw an error when no current dictionary can be found.")
 
 (defmacro paced-operate-on-current-dictionary (&rest form)
   "Run FORM with the current dictionary bound to `dict'.
@@ -482,7 +480,10 @@ dictionary if found."
   "Save the dictionary for the current buffer.
 
 For how the current dictionary is determined, see
-`paced-current-dictionary'."
+`paced-current-dictionary'.
+
+With prefix argument FORCE, save the dictionary even if it hasn't
+been modified."
   (interactive "P")
   (paced-operate-on-current-dictionary
    (paced-dictionary-save dict force)))
@@ -495,7 +496,10 @@ For how the current dictionary is determined, see
     (paced-dictionary-register new-dict)))
 
 (defun paced-save-all-dictionaries (&optional force)
-  "Save all registered dictionaries."
+  "Save all registered dictionaries.
+
+With prefix argument FORCE, save the dictionaries regardless of
+whether they've been modified."
   (interactive "P")
   (map-apply
    (lambda (_ dict)
@@ -1175,7 +1179,7 @@ match a regular expression.")
   (paced--insert-file-contents source))
 
 (defun paced-new-population-command-custom ()
-  "Prompt for a population command type and creates a new command of that 
type."
+  "Prompt for a population command type and create a new command of that type."
   (let* ((type (completing-read "Command Type: "
                                 (eieio-class-children 
'paced-population-command))))
     (funcall (intern type))))
@@ -1207,7 +1211,7 @@ non-nil, confirmation will be requested before 
continuing."
    (list (paced-read-dictionary)))
   (paced-operate-on-named-dictionary key
     (when (or (not paced-populate-warn-about-reset)
-              (y-or-n-p "Warning: Repopulating dictionary will reset it.  
Continue?"))
+              (y-or-n-p "Warning: Repopulating dictionary will reset it.  
Continue? "))
       (paced-dictionary-repopulate dict))))
 
 (defun paced-repopulate-current-dictionary ()
@@ -1219,7 +1223,7 @@ non-nil, confirmation will be requested before 
continuing."
   (interactive)
   (paced-operate-on-current-dictionary
    (when (or (not paced-populate-warn-about-reset)
-             (y-or-n-p "Warning: Repopulating dictionary will reset it.  
Continue?"))
+             (y-or-n-p "Warning: Repopulating dictionary will reset it.  
Continue? "))
      (paced-dictionary-repopulate dict))))
 
 (cl-defmethod paced-dictionary-add-population-command ((dict paced-dictionary)
@@ -1255,7 +1259,7 @@ must be set with `paced-edit-named-dictionary' or
   (customize-object dict))
 
 (defun paced-edit-named-dictionary (name)
-  "Edit the paced-dictionary named NAME."
+  "Edit the `paced-dictionary' named NAME."
   (declare (interactive-only paced-dictionary-edit))
   (interactive (list (paced-read-dictionary)))
   (paced-operate-on-named-dictionary name
diff --git a/packages/paced/paced.info b/packages/paced/paced.info
index a39ac19..17249d1 100644
--- a/packages/paced/paced.info
+++ b/packages/paced/paced.info
@@ -599,7 +599,7 @@ code and drawers.
 
    The generator for file-list is easy:
 
-     (lambda nil org-agenda-files)
+     org-agenda-files
 
    Done.
 
@@ -1004,22 +1004,22 @@ Node: Custom Commands15807
 Node: Asynchronous Population18534
 Node: Example Setups19983
 Node: Org Agenda Files20284
-Node: Project Files22795
-Node: Markdown Files23931
-Node: Repopulating Dictionary After Saving25556
-Node: Repopulating Dictionary After Spellchecking the Buffer26484
-Node: Contributing27229
-Node: Bugs28003
-Node: Development28392
-Node: Documentation30153
-Node: Working with EDE30620
-Node: Changelog31663
-Node: 11331841
-Node: 11232034
-Node: 11132164
-Node: 1132403
-Node: 10133010
-Node: 1033218
+Node: Project Files22782
+Node: Markdown Files23918
+Node: Repopulating Dictionary After Saving25543
+Node: Repopulating Dictionary After Spellchecking the Buffer26471
+Node: Contributing27216
+Node: Bugs27990
+Node: Development28379
+Node: Documentation30140
+Node: Working with EDE30607
+Node: Changelog31650
+Node: 11331828
+Node: 11232021
+Node: 11132151
+Node: 1132390
+Node: 10132997
+Node: 1033205
 
 End Tag Table
 
diff --git a/packages/paced/paced.org b/packages/paced/paced.org
index 495f3cb..3ce0f44 100644
--- a/packages/paced/paced.org
+++ b/packages/paced/paced.org
@@ -456,7 +456,7 @@ to block out all of Org's extra features such as source 
code and drawers.
 The generator for file-list is easy:
 
 #+begin_src emacs-lisp
-(lambda nil org-agenda-files)
+org-agenda-files
 #+end_src
 
 Done.