diff options
author | Kyle Meyer <kyle@kyleam.com> | 2020-11-27 01:35:31 -0500 |
---|---|---|
committer | Kyle Meyer <kyle@kyleam.com> | 2020-11-27 01:35:31 -0500 |
commit | b3b29e1d59b9d64a67f3cad2124b7d57afabf551 (patch) | |
tree | ab897136900579b432c14b9deb9943979b629d5d | |
parent | b2d38a822d2269df02b4ccf39116f8f7001e8e69 (diff) | |
parent | ccf81be2a2887457969e60035c342426d8423ba2 (diff) | |
download | org-mode-b3b29e1d59b9d64a67f3cad2124b7d57afabf551.tar.gz |
Merge branch 'maint'
-rw-r--r-- | doc/org-manual.org | 2 | ||||
-rw-r--r-- | lisp/ob-picolisp.el | 6 | ||||
-rw-r--r-- | lisp/ob-screen.el | 4 | ||||
-rw-r--r-- | lisp/org-agenda.el | 1 | ||||
-rw-r--r-- | lisp/org-capture.el | 4 | ||||
-rw-r--r-- | lisp/org-table.el | 5 | ||||
-rw-r--r-- | lisp/org.el | 1 |
7 files changed, 10 insertions, 13 deletions
diff --git a/doc/org-manual.org b/doc/org-manual.org index 97018d0..5a84a6d 100644 --- a/doc/org-manual.org +++ b/doc/org-manual.org @@ -7746,7 +7746,7 @@ Now lets look at the elements of a template definition. Each entry in Use ~week~ to make a week tree instead of the month-day tree, i.e., place the headings for each day under a heading with the - current ISO week. Use @code{month} to group entries by month + current ISO week. Use ~month~ to group entries by month only. Default is to group entries by day. - ~:unnarrowed~ :: diff --git a/lisp/ob-picolisp.el b/lisp/ob-picolisp.el index 1b09f37..96fee36 100644 --- a/lisp/ob-picolisp.el +++ b/lisp/ob-picolisp.el @@ -111,11 +111,11 @@ This function is called by `org-babel-execute-src-block'." (cond ((or (member "code" result-params) (member "pp" result-params)) - (format "(pretty (out \"/dev/null\" %s))" full-body)) + (format "(pretty (out \"%s\" %s))" null-device full-body)) ((and (member "value" result-params) (not session)) - (format "(print (out \"/dev/null\" %s))" full-body)) + (format "(print (out \"%s\" %s))" null-device full-body)) ((member "value" result-params) - (format "(out \"/dev/null\" %s)" full-body)) + (format "(out \"%s\" %s)" null-device full-body)) (t full-body))) (result (if (not (string= session-name "none")) diff --git a/lisp/ob-screen.el b/lisp/ob-screen.el index affdfdc..d0e4051 100644 --- a/lisp/ob-screen.el +++ b/lisp/ob-screen.el @@ -41,8 +41,8 @@ In case you want to use a different screen than one selected by your $PATH") (defvar org-babel-default-header-args:screen - '((:results . "silent") (:session . "default") (:cmd . "sh") - (:terminal . "xterm") (:screenrc . "/dev/null")) + `((:results . "silent") (:session . "default") (:cmd . "sh") + (:terminal . "xterm") (:screenrc . ,null-device)) "Default arguments to use when running screen source blocks.") (defun org-babel-execute:screen (body params) 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-capture.el b/lisp/org-capture.el index 020feb4..8bd233d 100644 --- a/lisp/org-capture.el +++ b/lisp/org-capture.el @@ -270,7 +270,9 @@ properties are: :time-prompt Prompt for a date/time to be used for date/week trees and when filling the template. - :tree-type When `week', make a week tree instead of the month tree. + :tree-type When `week', make a week tree instead of the month-day + tree. When `month', make a month tree instead of the + month-day tree. :unnarrowed Do not narrow the target buffer, simply show the full buffer. Default is to narrow it so that you diff --git a/lisp/org-table.el b/lisp/org-table.el index c138190..5d8a713 100644 --- a/lisp/org-table.el +++ b/lisp/org-table.el @@ -3322,7 +3322,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 @@ -5153,15 +5152,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 8d35539..bf3f23d 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -4757,7 +4757,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) |