Merge branch 'maint'

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)

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