From: Sam Steingold <dick.r.chiang@gmail.com>
To: Bastien <bzg@gnu.org>
Cc: Sam Steingold <sds@gnu.org>, 38592@debbugs.gnu.org
Subject: bug#38592: 27.0.50; org mode insinuates itself into calendar
Date: Mon, 17 Feb 2020 07:51:54 -0500 [thread overview]
Message-ID: <87sgj9pead.fsf@dick> (raw)
In-Reply-To: <871rqtk6bd.fsf@bzg.fr> (Bastien's message of "Mon, 17 Feb 2020 08:43:02 +0100")
[-- Attachment #1: Type: text/plain, Size: 253 bytes --]
To reproduce:
emacs -Q -f package-initialize --eval "(require 'ob)" --eval "(and (cl-assert (featurep 'ob)) (cl-assert (not (featurep 'org))))" --eval "(call-interactively 'calendar)"
The emacs needs to be at least 165f738382.
How about, minimally:
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: patch --]
[-- Type: text/x-diff, Size: 559 bytes --]
diff --git a/lisp/org/org-compat.el b/lisp/org/org-compat.el
index 4446a169d7..ea66bb82be 100644
--- a/lisp/org/org-compat.el
+++ b/lisp/org/org-compat.el
@@ -1043,7 +1043,7 @@ org--setup-calendar-bindings
((guard (not (lookup-key calendar-mode-map "c")))
(local-set-key "c" #'org-calendar-goto-agenda))
(_ nil))
- (unless (eq org-agenda-diary-file 'diary-file)
+ (unless (and (boundp 'org-agenda-diary-file) (eq org-agenda-diary-file 'diary-file))
(local-set-key org-calendar-insert-diary-entry-key
#'org-agenda-diary-entry)))
[-- Attachment #3: Type: text/plain, Size: 82 bytes --]
I suspect other assumptions are made that `ob` cannot be required without `org`.
next prev parent reply other threads:[~2020-02-17 12:53 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <m14ky4jpq7.fsf@gnu.org>
[not found] ` <83sglo70fu.fsf@gnu.org>
2020-02-13 8:43 ` bug#38592: 27.0.50; org mode insinuates itself into calendar Bastien
2020-02-13 14:31 ` Sam Steingold
2020-02-13 15:40 ` Bastien
2020-02-13 16:45 ` Sam Steingold
2020-02-14 10:02 ` Bastien
2020-02-17 4:12 ` Sam Steingold
2020-02-17 7:43 ` Bastien
2020-02-17 12:51 ` Sam Steingold [this message]
2020-02-17 13:54 ` Bastien
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87sgj9pead.fsf@dick \
--to=dick.r.chiang@gmail.com \
--cc=38592@debbugs.gnu.org \
--cc=bzg@gnu.org \
--cc=sds@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).