ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Stefan Kangas 2020-11-24 17:39:11 +01:00 committed by Kyle Meyer
parent 2d23d55ac5
commit 00bc3097cd
3 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lisp/org-agenda.el
View File

@ -2269,7 +2269,6 @@ The following commands are available:
(setq mode-name "Org-Agenda") (setq mode-name "Org-Agenda")
(setq indent-tabs-mode nil) (setq indent-tabs-mode nil)
(use-local-map org-agenda-mode-map) (use-local-map org-agenda-mode-map)
(easy-menu-add org-agenda-menu)
(when org-startup-truncated (setq truncate-lines t)) (when org-startup-truncated (setq truncate-lines t))
(setq-local line-move-visual nil) (setq-local line-move-visual nil)
(add-hook 'post-command-hook 'org-agenda-update-agenda-type nil 'local) (add-hook 'post-command-hook 'org-agenda-update-agenda-type nil 'local)

5
lisp/org-table.el
View File

@ -3342,7 +3342,6 @@ Parameters get priority."
(setq-local org-selected-window sel-win) (setq-local org-selected-window sel-win)
(use-local-map org-table-fedit-map) (use-local-map org-table-fedit-map)
(add-hook 'post-command-hook #'org-table-fedit-post-command t t) (add-hook 'post-command-hook #'org-table-fedit-post-command t t)
(easy-menu-add org-table-fedit-menu)
(setq startline (org-current-line)) (setq startline (org-current-line))
(dolist (entry eql) (dolist (entry eql)
(let* ((type (cond (let* ((type (cond
@ -5173,15 +5172,13 @@ When LOCAL is non-nil, show references for the table at point."
orgtbl-line-start-regexp)) orgtbl-line-start-regexp))
(when (fboundp 'font-lock-add-keywords) (when (fboundp 'font-lock-add-keywords)
(font-lock-add-keywords nil orgtbl-extra-font-lock-keywords) (font-lock-add-keywords nil orgtbl-extra-font-lock-keywords)
(org-restart-font-lock)) (org-restart-font-lock)))
(easy-menu-add orgtbl-mode-menu))
(t (t
(setq auto-fill-inhibit-regexp org-old-auto-fill-inhibit-regexp) (setq auto-fill-inhibit-regexp org-old-auto-fill-inhibit-regexp)
(remove-hook 'before-change-functions 'org-before-change-function t) (remove-hook 'before-change-functions 'org-before-change-function t)
(when (fboundp 'font-lock-remove-keywords) (when (fboundp 'font-lock-remove-keywords)
(font-lock-remove-keywords nil orgtbl-extra-font-lock-keywords) (font-lock-remove-keywords nil orgtbl-extra-font-lock-keywords)
(org-restart-font-lock)) (org-restart-font-lock))
(easy-menu-remove orgtbl-mode-menu)
(force-mode-line-update 'all)))) (force-mode-line-update 'all))))
(defun orgtbl-make-binding (fun n &rest keys) (defun orgtbl-make-binding (fun n &rest keys)

1
lisp/org.el
View File

@ -4756,7 +4756,6 @@ This is for getting out of special buffers like capture.")
(require 'time-date) (require 'time-date)
(unless (fboundp 'time-subtract) (defalias 'time-subtract 'subtract-time)) (unless (fboundp 'time-subtract) (defalias 'time-subtract 'subtract-time))
(require 'easymenu) (require 'easymenu)
(autoload 'easy-menu-add "easymenu")
(require 'overlay) (require 'overlay)
(require 'org-entities) (require 'org-entities)