From mboxrd@z Thu Jan  1 00:00:00 1970
From: Sam Steingold <dick.r.chiang@gmail.com>
Subject: bug#38592: 27.0.50; org mode insinuates itself into calendar
Date: Mon, 17 Feb 2020 07:51:54 -0500
Message-ID: <87sgj9pead.fsf@dick>
References: <m14ky4jpq7.fsf@gnu.org> <83sglo70fu.fsf@gnu.org>
 <87eeuykhc4.fsf@gnu.org>
 <CAFsbZ7aA1tjGYXrV0nDtO+xrV18SyLUREVBx9bidm95vTtJSqw@mail.gmail.com>
 <8736bebim1.fsf@gnu.org>
 <CAFsbZ7bOf7mMR69Fp-3VduXqTxu6SCsdB6krR1UiVm_J3qMhBA@mail.gmail.com>
 <87k14pqyeq.fsf@bzg.fr>
 <CAFsbZ7Y2FPaJgEpMHL7xvErOHawPW6bsB1r7C6ggpPciEqRm7Q@mail.gmail.com>
 <871rqtk6bd.fsf@bzg.fr>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane-mx.org@gnu.org>
Received: from eggs.gnu.org ([2001:470:142:3::10]:49598)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1j3ftX-0005WS-4H
 for emacs-orgmode@gnu.org; Mon, 17 Feb 2020 07:53:03 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1j3ftW-0004Yl-7o
 for emacs-orgmode@gnu.org; Mon, 17 Feb 2020 07:53:03 -0500
Received: from debbugs.gnu.org ([209.51.188.43]:60363)
 by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
 (Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1j3ftW-0004Ya-4m
 for emacs-orgmode@gnu.org; Mon, 17 Feb 2020 07:53:02 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1j3ftW-0001AC-47
 for emacs-orgmode@gnu.org; Mon, 17 Feb 2020 07:53:02 -0500
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-Message-ID: <handler.38592.B38592.15819439234404@debbugs.gnu.org>
In-Reply-To: <871rqtk6bd.fsf@bzg.fr> (Bastien's message of "Mon, 17 Feb 2020
 08:43:02 +0100")
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-orgmode>,
 <mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
 <mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane-mx.org@gnu.org
Sender: "Emacs-orgmode"
 <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane-mx.org@gnu.org>
To: Bastien <bzg@gnu.org>
Cc: Sam Steingold <sds@gnu.org>, 38592@debbugs.gnu.org

--=-=-=
Content-Type: text/plain

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:


--=-=-=
Content-Type: text/x-diff
Content-Disposition: inline; filename=patch.diff
Content-Description: patch

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)))
 

--=-=-=
Content-Type: text/plain


I suspect other assumptions are made that `ob` cannot be required without `org`.

--=-=-=--