[elpa] externals/org 2d965df: Merge branch 'maint'

[ELPA Syncer]

branch: externals/org
commit 2d965df01a7a7b18e50326dd66d6f89b178e5acf
Merge: 586eaea 94837fc
Author: Kyle Meyer <kyle@kyleam.com>
Commit: Kyle Meyer <kyle@kyleam.com>

    Merge branch 'maint'
---
 lisp/ob-C.el       | 10 +++++-----
 lisp/org-agenda.el |  7 ++++++-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/lisp/ob-C.el b/lisp/ob-C.el
index c44aedb..fdfe332 100644
--- a/lisp/ob-C.el
+++ b/lisp/ob-C.el
@@ -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)
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index d316f32..c15da2b 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -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