From 00bc3097cd2ccfc714bca1825cc5af0428ed58b0 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Tue, 24 Nov 2020 17:39:11 +0100 Subject: [PATCH] Backport commit affe9b225 from Emacs * lisp/org-agenda.el (org-agenda-mode): * lisp/org-table.el (org-table-edit-formulas, orgtbl-mode): * lisp/org.el: Don't call easy-menu-add, an obsolete XEmacs compat alias. Make XEmacs compat aliases easy-menu-{add,remove} obsolete affe9b225de711429248a73f920dc9f38b15c932 Stefan Kangas Tue Nov 24 18:06:05 2020 +0100 --- lisp/org-agenda.el | 1 - lisp/org-table.el | 5 +---- lisp/org.el | 1 - 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index b6168d45c..a482b3db4 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -2269,7 +2269,6 @@ The following commands are available: (setq mode-name "Org-Agenda") (setq indent-tabs-mode nil) (use-local-map org-agenda-mode-map) - (easy-menu-add org-agenda-menu) (when org-startup-truncated (setq truncate-lines t)) (setq-local line-move-visual nil) (add-hook 'post-command-hook 'org-agenda-update-agenda-type nil 'local) diff --git a/lisp/org-table.el b/lisp/org-table.el index 112b1e171..8dd3f392d 100644 --- a/lisp/org-table.el +++ b/lisp/org-table.el @@ -3342,7 +3342,6 @@ Parameters get priority." (setq-local org-selected-window sel-win) (use-local-map org-table-fedit-map) (add-hook 'post-command-hook #'org-table-fedit-post-command t t) - (easy-menu-add org-table-fedit-menu) (setq startline (org-current-line)) (dolist (entry eql) (let* ((type (cond @@ -5173,15 +5172,13 @@ When LOCAL is non-nil, show references for the table at point." orgtbl-line-start-regexp)) (when (fboundp 'font-lock-add-keywords) (font-lock-add-keywords nil orgtbl-extra-font-lock-keywords) - (org-restart-font-lock)) - (easy-menu-add orgtbl-mode-menu)) + (org-restart-font-lock))) (t (setq auto-fill-inhibit-regexp org-old-auto-fill-inhibit-regexp) (remove-hook 'before-change-functions 'org-before-change-function t) (when (fboundp 'font-lock-remove-keywords) (font-lock-remove-keywords nil orgtbl-extra-font-lock-keywords) (org-restart-font-lock)) - (easy-menu-remove orgtbl-mode-menu) (force-mode-line-update 'all)))) (defun orgtbl-make-binding (fun n &rest keys) diff --git a/lisp/org.el b/lisp/org.el index 32d404a08..b9be34371 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -4756,7 +4756,6 @@ This is for getting out of special buffers like capture.") (require 'time-date) (unless (fboundp 'time-subtract) (defalias 'time-subtract 'subtract-time)) (require 'easymenu) -(autoload 'easy-menu-add "easymenu") (require 'overlay) (require 'org-entities)