diff options
| author | Yuuki Harano <masm+github@masm11.me> | 2021-04-06 00:11:36 +0900 |
|---|---|---|
| committer | Yuuki Harano <masm+github@masm11.me> | 2021-04-06 00:11:36 +0900 |
| commit | 8c7453632e8f45ed65ce814eafc0a1af637774c1 (patch) | |
| tree | a7248619441ffb6a77a81a7b76ade2b7294f7719 /lisp/org | |
| parent | 5d2f319eec33fea2cb29a02210952ee590b4b21b (diff) | |
| parent | 0342354c155728f8d55005bd34a66e1ab3179cc7 (diff) | |
| download | emacs-8c7453632e8f45ed65ce814eafc0a1af637774c1.tar.gz emacs-8c7453632e8f45ed65ce814eafc0a1af637774c1.tar.bz2 emacs-8c7453632e8f45ed65ce814eafc0a1af637774c1.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk
Diffstat (limited to 'lisp/org')
| -rw-r--r-- | lisp/org/ob-clojure.el | 2 | ||||
| -rw-r--r-- | lisp/org/ob-ocaml.el | 2 | ||||
| -rw-r--r-- | lisp/org/org-install.el | 2 | ||||
| -rw-r--r-- | lisp/org/org-macs.el | 3 | ||||
| -rw-r--r-- | lisp/org/org-version.el | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/lisp/org/ob-clojure.el b/lisp/org/ob-clojure.el index df2d691f68b..9834509fb03 100644 --- a/lisp/org/ob-clojure.el +++ b/lisp/org/ob-clojure.el @@ -38,7 +38,7 @@ ;; For SLIME, the best way to install these components is by following ;; the directions as set out by Phil Hagelberg (Technomancy) on the -;; web page: http://technomancy.us/126 +;; web page: https://technomancy.us/126 ;;; Code: (require 'ob) diff --git a/lisp/org/ob-ocaml.el b/lisp/org/ob-ocaml.el index 0aa91afdb24..5fd6d1e09ff 100644 --- a/lisp/org/ob-ocaml.el +++ b/lisp/org/ob-ocaml.el @@ -32,7 +32,7 @@ ;;; Requirements: -;; - tuareg-mode :: http://www-rocq.inria.fr/~acohen/tuareg/ +;; - tuareg-mode :: https://www-rocq.inria.fr/~acohen/tuareg/ ;;; Code: (require 'ob) diff --git a/lisp/org/org-install.el b/lisp/org/org-install.el index 58359597363..d521d819db2 100644 --- a/lisp/org/org-install.el +++ b/lisp/org/org-install.el @@ -1,4 +1,4 @@ -;;; org-install.el --- backward compatibility file for obsolete configuration +;;; org-install.el --- backward compatibility file for obsolete configuration -*- lexical-binding: t -*- ;; ;;; Code: ;; diff --git a/lisp/org/org-macs.el b/lisp/org/org-macs.el index ac6691db0d5..58d3fd39922 100644 --- a/lisp/org/org-macs.el +++ b/lisp/org/org-macs.el @@ -869,7 +869,8 @@ delimiting S." (let ((width (plist-get props :width))) (and (wholenump width) width))) (`(image . ,_) - (ceiling (car (image-size spec)))) + (and (fboundp 'image-size) + (ceiling (car (image-size spec))))) ((pred stringp) ;; Displayed string could contain invisible parts, ;; but no nested display. diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el index 25b3354bdd7..8871ef798d5 100644 --- a/lisp/org/org-version.el +++ b/lisp/org/org-version.el @@ -1,4 +1,4 @@ -;;; org-version.el --- autogenerated file, do not edit +;;; org-version.el --- autogenerated file, do not edit -*- lexical-binding: t -*- ;; ;;; Code: ;;;###autoload |