Adding release tag

-----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCgAdFiEEG+FaXQip1ZWVgUdrFDesAvc/kaIFAl/WdTcACgkQFDesAvc/
 kaIm9wf+Kuj2AXFhsIyqMF6nkF6wGh7Tn1tyPV5aV/KWp8+uk5l+ID1IZWAsscvx
 eIBugpAjUARLjrHrj1vVbqz0Y+Ey9/SoSJyCiGsUEhDJdeAKywky7JGQrJtPMHqJ
 vC/SWPsZVb6vbAOfOdz20dEqkxF451A9n/IBoqdadwsGQ7NVkibpo4CeoimqidBy
 vk86Ar9p9VlnQOXzrOSnLaIzpMEH/trPIH35W8vkLM6BAmHuzVyr2L8XMw6uE0/m
 39eMbbAGgFA0/juBaACy1cg9cWPN6tbXtHYeabeEneiO3UQ4EP8gv2B4wOC9DWZj
 Q8DknDrKENFfJZfe9Gi7QUeKwbLnQw==
 =kOmv
 -----END PGP SIGNATURE-----

Merge tag 'release_9.4.2' into emacs-sync
This commit is contained in:
Kyle Meyer 2020-12-13 15:22:54 -05:00
commit 7b7f6c154c
10 changed files with 23 additions and 6 deletions

View File

@ -159,13 +159,16 @@ If there is not a current inferior-process-buffer in SESSION
then create one. Return the initialized session."
(unless (string= session "none")
(require 'inf-ruby)
(let* ((cmd (cdr (or (assq :ruby params)
(assoc inf-ruby-default-implementation
inf-ruby-implementations))))
(let* ((command (cdr (or (assq :ruby params)
(assoc inf-ruby-default-implementation
inf-ruby-implementations))))
(buffer (get-buffer (format "*%s*" session)))
(session-buffer (or buffer (save-window-excursion
(run-ruby-or-pop-to-buffer
cmd (or session "ruby")
(if (functionp command)
(funcall command)
command)
(or session "ruby")
(unless session
(inf-ruby-buffer)))
(current-buffer)))))

View File

@ -137,6 +137,8 @@
(declare-function org-set-property "org" (property value))
(declare-function org-toggle-tag "org" (tag &optional onoff))
(declare-function org-search-view "org-agenda" (&optional todo-only string edit-at))
;;; Bibtex data
(defvar org-bibtex-types

View File

@ -63,10 +63,12 @@
(declare-function org-insert-heading "org" (&optional arg invisible-ok top))
(declare-function org-load-modules-maybe "org" (&optional force))
(declare-function org-mark-ring-push "org" (&optional pos buffer))
(declare-function org-mode "org" ())
(declare-function org-occur "org" (regexp &optional keep-previous callback))
(declare-function org-open-file "org" (path &optional in-emacs line search))
(declare-function org-overview "org" ())
(declare-function org-restart-font-lock "org" ())
(declare-function org-run-like-in-org-mode "org" (cmd))
(declare-function org-show-context "org" (&optional key))
(declare-function org-src-coderef-format "org-src" (&optional element))
(declare-function org-src-coderef-regexp "org-src" (fmt &optional label))

View File

@ -34,7 +34,9 @@
(declare-function org-agenda-diary-entry "org-agenda")
(declare-function org-agenda-maybe-redo "org-agenda" ())
(declare-function org-agenda-set-restriction-lock "org-agenda" (&optional type))
(declare-function org-agenda-remove-restriction-lock "org-agenda" (&optional noupdate))
(declare-function org-calendar-goto-agenda "org-agenda" ())
(declare-function org-align-tags "org" (&optional all))
(declare-function org-at-heading-p "org" (&optional ignored))
(declare-function org-at-table.el-p "org" ())

View File

@ -27,6 +27,7 @@
;;; Code:
(declare-function org-mode "org" ())
(declare-function org-toggle-pretty-entities "org" ())
(declare-function org-table-align "org-table" ())

View File

@ -132,6 +132,7 @@
(declare-function org-inlinetask-in-task-p "org-inlinetask" ())
(declare-function org-inlinetask-outline-regexp "org-inlinetask" ())
(declare-function org-level-increment "org" ())
(declare-function org-mode "org" ())
(declare-function org-narrow-to-subtree "org" ())
(declare-function org-outline-level "org" ())
(declare-function org-previous-line-empty-p "org" ())

View File

@ -34,6 +34,7 @@
(require 'cl-lib)
(require 'format-spec)
(declare-function org-mode "org" ())
(declare-function org-show-context "org" (&optional key))
(declare-function org-string-collate-lessp "org-compat" (s1 s2 &optional locale ignore-case))

View File

@ -37,6 +37,7 @@
(require 'org-compat)
(require 'org-keys)
(declare-function org-mode "org" ())
(declare-function org-element-at-point "org-element" ())
(declare-function org-element-class "org-element" (datum &optional parent))
(declare-function org-element-context "org-element" (&optional element))

View File

@ -44,6 +44,9 @@
(declare-function face-remap-add-relative "face-remap" (face &rest specs))
(declare-function org-at-timestamp-p "org" (&optional extended))
(declare-function org-delete-backward-char "org" (N))
(declare-function org-mode "org" ())
(declare-function org-duration-p "org-duration" (duration &optional canonical))
(declare-function org-duration-to-minutes "org-duration" (duration &optional canonical))
(declare-function org-element-at-point "org-element" ())
(declare-function org-element-contents "org-element" (element))
(declare-function org-element-extract-element "org-element" (element))

View File

@ -8,7 +8,7 @@
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: https://orgmode.org
;; Version: 9.4.1
;; Version: 9.4.2
;; This file is part of GNU Emacs.
;;
@ -149,6 +149,7 @@ Stars are put in group 1 and the trimmed body in group 2.")
(declare-function org-columns-quit "org-colview" ())
(declare-function org-columns-insert-dblock "org-colview" ())
(declare-function org-duration-from-minutes "org-duration" (minutes &optional fmt canonical))
(declare-function org-duration-to-minutes "org-duration" (duration &optional canonical))
(declare-function org-element-at-point "org-element" ())
(declare-function org-element-cache-refresh "org-element" (pos))
(declare-function org-element-cache-reset "org-element" (&optional all))
@ -4179,7 +4180,7 @@ After a match, the following groups carry important information:
"Variable associated with STARTUP options for Org.
Each element is a list of three items: the startup options (as written
in the #+STARTUP line), the corresponding variable, and the value to set
this variable to if the option is found. An optional forth element PUSH
this variable to if the option is found. An optional fourth element PUSH
means to push this value onto the list in the variable.")
(defcustom org-group-tags t