branch: elpa/casual
commit e449b84da7adb16ff9ed7b10e260ecdea41ed806
Merge: acfade1585 472aca6f50
Author: Charles Choi <[email protected]>
Commit: GitHub <[email protected]>
Merge pull request #1 from kickingvegas/cc/preliminary-elpa-review
Changes per feedback from pkal ELPA review.
---
lisp/casual-calc-labels.el | 1 +
lisp/casual-lib.el | 5 ++++-
lisp/casual.el | 2 +-
scripts/read-version.sh | 2 +-
4 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/lisp/casual-calc-labels.el b/lisp/casual-calc-labels.el
index 466817e133..9b6a322fc1 100644
--- a/lisp/casual-calc-labels.el
+++ b/lisp/casual-calc-labels.el
@@ -25,6 +25,7 @@
;;; Code:
(require 'calc)
(require 'calc-math)
+(require 'casual-calc-utils)
;; !!! While not a label function, it is called from modules that call labels.
(defun casual-calc-open-settings-file ()
diff --git a/lisp/casual-lib.el b/lisp/casual-lib.el
index 0696d7d6d9..244180aca9 100644
--- a/lisp/casual-lib.el
+++ b/lisp/casual-lib.el
@@ -32,6 +32,9 @@
;;; Code:
(require 'transient)
+(defgroup casual nil
+ "Settings for Casual user interfaces."
+ :group 'convenience)
(defcustom casual-lib-hide-navigation nil
"If non-nil then hide navigation controls.
@@ -80,7 +83,7 @@ plain ASCII-range string."
;; Predicates
(defun casual-lib-display-line-numbers-mode-p ()
"Predicate to test if `display-line-numbers-mode' is enabled."
- (if display-line-numbers t nil))
+ (bound-and-true-p display-line-numbers))
(defun casual-lib-buffer-writeable-p ()
"Predicate to test if buffer is writeable."
diff --git a/lisp/casual.el b/lisp/casual.el
index b3fc34d592..c640dec00f 100644
--- a/lisp/casual.el
+++ b/lisp/casual.el
@@ -6,7 +6,7 @@
;; URL: https://github.com/kickingvegas/casual
;; Keywords: tools, wp
;; Version: 0.1.1-rc.1
-;; Package-Requires: ((emacs "29.1") (transient "0.6.0") (org "9.7.1"))
+;; Package-Requires: ((emacs "28.1") (transient "0.6.0"))
;; 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
diff --git a/scripts/read-version.sh b/scripts/read-version.sh
index f58f0ce36d..ded2cf2b41 100755
--- a/scripts/read-version.sh
+++ b/scripts/read-version.sh
@@ -15,4 +15,4 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
-grep 'Version: ' $1 | awk '{print $3}'
+awk '/Version: / {print $3}' $1
