branch: master commit e39d58c9efa153c0768d55eba9ab1c7fc516f0b2 Merge: a3e8207 50ee379 Author: Ian Dunn <du...@gnu.org> Commit: Ian Dunn <du...@gnu.org>
Merge commit '50ee379c866e02dc0c36bb4bf45dd5b4cab0e90d' --- packages/paced/Project.ede | 2 +- packages/paced/paced-async.el | 2 +- packages/paced/paced-tests.el | 2 +- packages/paced/paced.el | 32 +++++++++------ packages/paced/paced.info | 92 ++++++++++++++++++++++++++++++------------- packages/paced/paced.org | 13 +++++- packages/paced/test.mk | 2 +- 7 files changed, 100 insertions(+), 45 deletions(-) diff --git a/packages/paced/Project.ede b/packages/paced/Project.ede index 2db0080..b4c6ed3 100644 --- a/packages/paced/Project.ede +++ b/packages/paced/Project.ede @@ -1,6 +1,6 @@ ;; Object ede-proj-project -;; Copyright (C) 2017 Free Software Foundation, Inc. +;; Copyright (C) 2017-2018 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/packages/paced/paced-async.el b/packages/paced/paced-async.el index 3834a2e..0f239f9 100644 --- a/packages/paced/paced-async.el +++ b/packages/paced/paced-async.el @@ -1,6 +1,6 @@ ;;; paced-async.el --- Support for asynchronous population -*- lexical-binding: t; -*- -;; Copyright (C) 2017 Free Software Foundation, Inc. +;; Copyright (C) 2017-2018 Free Software Foundation, Inc. ;; Author: Ian Dunn <du...@gnu.org> ;; Maintainer: Ian Dunn <du...@gnu.org> diff --git a/packages/paced/paced-tests.el b/packages/paced/paced-tests.el index bc38f79..700af1c 100644 --- a/packages/paced/paced-tests.el +++ b/packages/paced/paced-tests.el @@ -1,6 +1,6 @@ ;;; paced-tests.el --- Tests for paced -*- lexical-binding: t; -*- -;; Copyright (C) 2017 Free Software Foundation, Inc. +;; Copyright (C) 2017-2018 Free Software Foundation, Inc. ;; Author: Ian Dunn <du...@gnu.org> ;; Maintainer: Ian Dunn <du...@gnu.org> diff --git a/packages/paced/paced.el b/packages/paced/paced.el index c9be86c..6309cdb 100644 --- a/packages/paced/paced.el +++ b/packages/paced/paced.el @@ -1,13 +1,13 @@ ;;; paced.el --- Predictive Abbreviation Completion and Expansion using Dictionaries -*- lexical-binding: t; -*- -;; Copyright (C) 2017 Free Software Foundation, Inc. +;; Copyright (C) 2017-2018 Free Software Foundation, Inc. ;; Author: Ian Dunn <du...@gnu.org> ;; Maintainer: Ian Dunn <du...@gnu.org> ;; Keywords: convenience, completion ;; Package-Requires: ((emacs "25.1") (async "1.9.1")) ;; URL: https://savannah.nongnu.org/projects/paced-el/ -;; Version: 1.0 +;; Version: 1.0.1 ;; Created: 22 Jan 2017 ;; Modified: 08 Dec 2017 @@ -391,19 +391,25 @@ be skipped." (when dictionary (paced-named-dictionary dictionary)))) -(cl-defmethod paced-dictionary-save ((dict paced-dictionary)) - "Save dictionary DICT according to its filename." - (when (oref dict updated) +(cl-defmethod paced-dictionary-save ((dict paced-dictionary) &optional force) + "Save dictionary DICT according to its filename. + +If FORCE is non-nil, ignore the `updated' flag in DICT and save +it anyway." + (when (or force (oref dict updated)) (eieio-persistent-save dict)) (oset dict updated nil)) -(defun paced-save-named-dictionary (key) - "Save dictionary named KEY." +(defun paced-save-named-dictionary (key force) + "Save dictionary named KEY. + +If FORCE is non-nil (given with a prefix arg), forcibly save the +dictionary if found." (declare (interactive-only paced-dictionary-save)) - (interactive (list (paced-read-dictionary))) + (interactive (list (paced-read-dictionary) current-prefix-arg)) (paced-ensure-registered key) (let ((dict (paced-named-dictionary key))) - (paced-dictionary-save dict))) + (paced-dictionary-save dict force))) (defun paced-load-dictionary-from-file (file) "Load dictionary from FILE." @@ -412,12 +418,12 @@ be skipped." (when-let* ((new-dict (eieio-persistent-read file 'paced-dictionary))) (paced-dictionary-register new-dict))) -(defun paced-save-all-dictionaries () +(defun paced-save-all-dictionaries (&optional force) "Save all registered dictionaries." - (interactive) + (interactive "P") (map-apply (lambda (_ dict) - (paced-dictionary-save dict)) + (paced-dictionary-save dict force)) paced--registered-dictionaries)) ;;;###autoload @@ -440,7 +446,7 @@ be skipped." (cl-defmethod eieio-done-customizing ((dict paced-dictionary)) (paced-dictionary-register dict) (paced--ensure-dictionary-directory) - (paced-dictionary-save dict)) + (paced-dictionary-save dict t)) diff --git a/packages/paced/paced.info b/packages/paced/paced.info index 6aa468a..1fb5c84 100644 --- a/packages/paced/paced.info +++ b/packages/paced/paced.info @@ -19,6 +19,7 @@ Paced * Population Commands:: The good stuff * Example Setups:: Some examples * Contributing:: I wanna help! +* Changelog:: List of changes by version — The Detailed Node Listing — @@ -60,6 +61,11 @@ Contributing * Documentation:: Improving the documentation * Working with EDE:: And all its quirks +Changelog + +* 1.0.1: 101. +* 1.0: 10. + File: paced.info, Node: Copying, Next: Introduction, Prev: Top, Up: Top @@ -67,7 +73,7 @@ File: paced.info, Node: Copying, Next: Introduction, Prev: Top, Up: Top Copying ******* -Copyright (C) 2017 Free Software Foundation, Inc. +Copyright (C) 2017-2018 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 @@ -599,7 +605,7 @@ dedicated solutions for almost everything, but it makes an excellent fallback. -File: paced.info, Node: Contributing, Prev: Example Setups, Up: Top +File: paced.info, Node: Contributing, Next: Changelog, Prev: Example Setups, Up: Top Contributing ************ @@ -707,35 +713,67 @@ documentation; and misc for tests. target. Consult with one of the paced devs for guidance, but usually selecting “none” and letting one of us handle it is a good way to go. + +File: paced.info, Node: Changelog, Prev: Contributing, Up: Top + +Changelog +********* + +* Menu: + +* 1.0.1: 101. +* 1.0: 10. + + +File: paced.info, Node: 101, Next: 10, Up: Changelog + +1.0.1 +===== + +Bug fix release + • Save dictionaries right after they’re created + • Added “force” parameter to save functions + + +File: paced.info, Node: 10, Prev: 101, Up: Changelog + +1.0 +=== + +Initial release. + Tag Table: Node: Top228 -Node: Copying1675 -Node: Introduction2489 -Node: Similar Packages3609 -Node: pabbrev3895 -Node: predictive5038 -Node: Installation6086 -Node: Basic Setup6551 -Node: Dictionaries7154 -Node: Creating a Dictionary7558 -Node: Editing a Dictionary8598 -Node: Selective Dictionaries9074 -Node: Dictionary Files10723 -Node: Population Commands11814 -Node: Built-in Commands12750 -Node: Properties13547 -Node: Custom Commands14409 -Node: Asynchronous Population17136 -Node: Example Setups18329 -Node: Org Agenda Files18511 -Node: Project Files19767 -Node: Contributing20880 -Node: Bugs21636 -Node: Development22025 -Node: Documentation22992 -Node: Working with EDE23459 +Node: Copying1772 +Node: Introduction2591 +Node: Similar Packages3711 +Node: pabbrev3997 +Node: predictive5140 +Node: Installation6188 +Node: Basic Setup6653 +Node: Dictionaries7256 +Node: Creating a Dictionary7660 +Node: Editing a Dictionary8700 +Node: Selective Dictionaries9176 +Node: Dictionary Files10825 +Node: Population Commands11916 +Node: Built-in Commands12852 +Node: Properties13649 +Node: Custom Commands14511 +Node: Asynchronous Population17238 +Node: Example Setups18431 +Node: Org Agenda Files18613 +Node: Project Files19869 +Node: Contributing20982 +Node: Bugs21756 +Node: Development22145 +Node: Documentation23112 +Node: Working with EDE23579 +Node: Changelog24622 +Node: 10124747 +Node: 1024944 End Tag Table diff --git a/packages/paced/paced.org b/packages/paced/paced.org index b212705..c3c4596 100644 --- a/packages/paced/paced.org +++ b/packages/paced/paced.org @@ -14,7 +14,7 @@ #+TEXINFO_DIR_DESC: Predictive Abbreviation Completion and Expansion using Dictionaries * Copying -Copyright (C) 2017 Free Software Foundation, Inc. +Copyright (C) 2017-2018 Free Software Foundation, Inc. #+BEGIN_QUOTE This program is free software: you can redistribute it and/or modify @@ -569,3 +569,14 @@ autoloads; aux for auxiliary files such as documentation; and misc for tests. When creating a new file, EDE will ask if you want to add it to a target. Consult with one of the paced devs for guidance, but usually selecting "none" and letting one of us handle it is a good way to go. + +* Changelog +:PROPERTIES: +:DESCRIPTION: List of changes by version +:END: +** 1.0.1 +Bug fix release +- Save dictionaries right after they're created +- Added "force" parameter to save functions +** 1.0 +Initial release. diff --git a/packages/paced/test.mk b/packages/paced/test.mk index fbd993e..392cb81 100644 --- a/packages/paced/test.mk +++ b/packages/paced/test.mk @@ -1,4 +1,4 @@ -# Copyright (C) 2017 Free Software Foundation, Inc. +# Copyright (C) 2017-2018 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