diff options
| author | Stefan Kangas <stefan@marxist.se> | 2020-11-24 17:39:11 +0100 |
|---|---|---|
| committer | Kyle Meyer <kyle@kyleam.com> | 2020-11-26 19:31:48 -0500 |
| commit | 00bc3097cd2ccfc714bca1825cc5af0428ed58b0 (patch) | |
| tree | 7c14da6387757c30ddb0329b13341f9b300fc89b | |
| parent | 2d23d55ac5f03b31ebbd4ba1272a336f9c72b5d7 (diff) | |
| download | org-mode-00bc3097cd2ccfc714bca1825cc5af0428ed58b0.tar.gz | |
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
| -rw-r--r-- | lisp/org-agenda.el | 1 | ||||
| -rw-r--r-- | lisp/org-table.el | 5 | ||||
| -rw-r--r-- | lisp/org.el | 1 |
3 files changed, 1 insertions, 6 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index b6168d4..a482b3d 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 112b1e1..8dd3f39 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 32d404a..b9be343 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) |