From 0ab9bc138f531a70ebacf98e1f205313d6a35ce6 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Sun, 15 Jan 2023 02:10:32 +0100 Subject: [PATCH 1/2] Backport commit 920a7d38e from Emacs ; Fix typos 920a7d38e96134289393b7bfcc3a7b88be73925b Stefan Kangas Sun Jan 15 02:14:19 2023 +0100 [km] These were likely not typos but intended as an abbreviation for "if and only if". However, using "if" works fine in these spots, so let's just go along with the change. (These may end up being reverted on Emacs's side; see emacs-devel <83a62k72lx.fsf@gnu.org>, 01-15.) --- lisp/org-mouse.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/org-mouse.el b/lisp/org-mouse.el index 6a733f09d..3b2c4cba6 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. From ebaf1c9c0468bfb06b8499b374beb5c3702b2258 Mon Sep 17 00:00:00 2001 From: Dmitry Gutov Date: Fri, 20 Jan 2023 23:32:21 +0200 Subject: [PATCH 2/2] Backport commit 347933377 from Emacs * lisp/ob-ruby.el: Fix outdated comments. lisp/org/ob-ruby.el: Fix outdated comments. 34793337783489297313c67d4a56682514877597 Dmitry Gutov Fri Jan 20 23:32:21 2023 +0200 --- lisp/ob-ruby.el | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lisp/ob-ruby.el b/lisp/ob-ruby.el index 03c94b1ba..b94bc73dd 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: