diff options
Diffstat (limited to 'lisp/org/org.el')
| -rw-r--r-- | lisp/org/org.el | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/lisp/org/org.el b/lisp/org/org.el index a6155c1382a..df708a2159d 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el @@ -82,8 +82,8 @@ (or (eq this-command 'eval-buffer) (condition-case nil (load (concat (file-name-directory load-file-name) - "org-loaddefs.el") - nil t t t) + "org-loaddefs") + nil t nil t) (error (message "WARNING: No org-loaddefs.el file could be found from where org.el is loaded.") (sit-for 3) @@ -1357,7 +1357,7 @@ Possible values for the file identifier are: to open [[file:document.pdf::5]] with evince at page 5. `directory' Matches a directory - `remote' Matches a remote file, accessible through tramp or efs. + `remote' Matches a remote file, accessible through tramp. Remote files most likely should be visited through Emacs because external applications cannot handle such paths. `auto-mode' Matches files that are matched by any entry in `auto-mode-alist', @@ -3807,10 +3807,6 @@ This is needed for font-lock setup.") (declare-function dired-get-filename "dired" (&optional localp no-error-if-not-filep)) -(declare-function iswitchb-read-buffer - "iswitchb" - (prompt &optional - default require-match _predicate start matches-set)) (declare-function org-agenda-change-all-lines "org-agenda" (newhead hdmarker &optional fixface just-this)) @@ -3844,7 +3840,6 @@ This is needed for font-lock setup.") (defvar calc-embedded-open-formula) (defvar calc-embedded-open-mode) (defvar font-lock-unfontify-region-function) -(defvar iswitchb-temp-buflist) (defvar org-agenda-tags-todo-honor-ignore-options) (defvar remember-data-file) (defvar texmathp-why) @@ -9319,6 +9314,7 @@ TYPE is the dynamic block type, as a string." "List all defined dynamic block types." (mapcar #'car org-dynamic-block-alist)) +;;;###org-autoload (defun org-dynamic-block-define (type func) "Define dynamic block TYPE with FUNC. TYPE is a string. FUNC is the function creating the dynamic @@ -12160,7 +12156,7 @@ This works in the agenda, and also in an Org buffer." (progn (message "[s]et or [r]emove? ") (equal (read-char-exclusive) ?r)))) - (when (fboundp 'deactivate-mark) (deactivate-mark)) + (deactivate-mark) (let ((agendap (equal major-mode 'org-agenda-mode)) l1 l2 m buf pos newhead (cnt 0)) (goto-char end) @@ -16486,7 +16482,7 @@ INCLUDE-LINKED is passed to `org-display-inline-images'." (org-toggle-inline-images))) ;; For without-x builds. -(declare-function image-refresh "image" (spec &optional frame)) +(declare-function image-flush "image" (spec &optional frame)) (defcustom org-display-remote-inline-images 'skip "How to display remote inline images. @@ -16627,7 +16623,7 @@ buffer boundaries with possible narrowing." (org-element-property :begin link) 'org-image-overlay))) (if (and (car-safe old) refresh) - (image-refresh (overlay-get (cdr old) 'display)) + (image-flush (overlay-get (cdr old) 'display)) (let ((image (org--create-inline-image file width))) (when image (let ((ov (make-overlay |