branch: externals/org
commit e84077ded30ef3b094b73765a7b895fa608960d3
Merge: a9ee43a124 e37e9b692e
Author: Kyle Meyer <k...@kyleam.com>
Commit: Kyle Meyer <k...@kyleam.com>
Merge branch 'bugfix'
---
lisp/ob-ruby.el | 5 ++---
lisp/org-mouse.el | 4 ++--
lisp/org-persist.el | 2 ++
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/lisp/ob-ruby.el b/lisp/ob-ruby.el
index 03c94b1ba9..b94bc73dd7 100644
--- a/lisp/ob-ruby.el
+++ b/lisp/ob-ruby.el
@@ -29,11 +29,10 @@
;; - ruby and irb executables :: https://www.ruby-lang.org/
;;
-;; - ruby-mode :: Can be installed through ELPA, or from
-;; https://github.com/eschulte/rinari/raw/master/util/ruby-mode.el
+;; - ruby-mode :: Comes with Emacs.
;;
;; - inf-ruby mode :: Can be installed through ELPA, or from
-;; https://github.com/eschulte/rinari/raw/master/util/inf-ruby.el
+;; https://raw.githubusercontent.com/nonsequitur/inf-ruby/master/inf-ruby.el
;;; Code:
diff --git a/lisp/org-mouse.el b/lisp/org-mouse.el
index 6a733f09db..3b2c4cba62 100644
--- a/lisp/org-mouse.el
+++ b/lisp/org-mouse.el
@@ -241,7 +241,7 @@ return `:middle'."
(t :middle)))
(defun org-mouse-empty-line ()
- "Return non-nil iff the line contains only white space."
+ "Return non-nil if the line contains only white space."
(save-excursion (beginning-of-line) (looking-at "[ \t]*$")))
(defun org-mouse-next-heading ()
@@ -283,7 +283,7 @@ keyword as the only argument.
If SELECTED is nil, then all items are normal menu items. If
SELECTED is a function, then each item is a checkbox, which is
-enabled for a given keyword iff (funcall SELECTED keyword) return
+enabled for a given keyword if (funcall SELECTED keyword) return
non-nil. If SELECTED is neither nil nor a function, then the
items are radio buttons. A radio button is enabled for the
keyword `equal' to SELECTED.
diff --git a/lisp/org-persist.el b/lisp/org-persist.el
index 385e118115..d1a28497c4 100644
--- a/lisp/org-persist.el
+++ b/lisp/org-persist.el
@@ -255,6 +255,8 @@
(declare-function org-next-visible-heading "org" (arg))
(declare-function org-at-heading-p "org" (&optional invisible-not-ok))
+;; Silence byte-compiler (used in `org-persist--write-elisp-file').
+(defvar pp-use-max-width)
(defconst org-persist--storage-version "3.2"
"Persistent storage layout version.")
