mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-09-29 19:07:52 +00:00
Code Releases Activity

Merge branch 'maint'

Browse source
This commit is contained in:
Kyle Meyer 2021-05-01 15:49:24 -04:00
parent 586eaeae8d 94837fc6b5
commit 2d965df01a
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lisp/ob-C.el
View file

@ -481,11 +481,11 @@ specifying a variable with the name of the table."
(let ((table (car head))
(headers (cdr head))
(typename (pcase type
('integerp "int")
('floatp "double")
('stringp (pcase org-babel-c-variant
((or 'c 'cpp) "const char*")
('d "string"))))))
(`integerp "int")
(`floatp "double")
(`stringp (pcase org-babel-c-variant
((or `c `cpp) "const char*")
(`d "string"))))))
(concat
(pcase org-babel-c-variant
((or `c `cpp)

7
lisp/org-agenda.el
View file

@ -9798,7 +9798,12 @@ When called programmatically, FORCE-DIRECTION can be `set', `up',
(line-end-position)
'(display nil))
(org-move-to-column
(- (/ (window-width nil t) (window-font-width)) (length stamp)) t)
(- (if (fboundp 'window-font-width)
(/ (window-width nil t) (window-font-width))
;; Fall back to pre-9.3.3 behavior on Emacs <25.
(window-width))
(length stamp))
t)
(add-text-properties
(1- (point)) (point-at-eol)
(list 'display (org-add-props stamp nil