ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve compatibility with XEmacs and Emacs 21.

This commit is contained in:
Carsten Dominik 2008-04-14 19:59:08 +02:00
parent 62db67e9eb
commit 3a1aff1362
2 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/org-macs.el
View File

@ -90,7 +90,6 @@ We use a macro so that the test can happen at compilation time."
(defmacro org-with-point-at (pom &rest body)
"Move to buffer and point of point-or-marker POM for the duration of BODY."
(declare (indent 1) (debug t))
`(save-excursion
(if (markerp pom) (set-buffer (marker-buffer pom)))
(save-excursion
@ -102,13 +101,11 @@ We use a macro so that the test can happen at compilation time."
(defmacro org-if-unprotected (&rest body)
"Execute BODY if there is no `org-protected' text property at point."
(declare (debug t))
`(unless (get-text-property (point) 'org-protected)
,@body))
(defmacro org-with-remote-undo (_buffer &rest _body)
"Execute BODY while recording undo information in two buffers."
(declare (indent 1) (debug t))
`(let ((_cline (org-current-line))
(_cmd this-command)
(_buf1 (current-buffer))
@ -200,7 +197,6 @@ we turn off invisibility temporarily. Use this in a `let' form."
(defun org-autoload (file functions)
"Establish autoload for all FUNCTIONS in FILE, if not boutd already."
(declare (indent 1) (debug t))
(let ((d (format "Documentation will be available after `%s.el' is loaded."
file))
f)

24
lisp/org.el
View File

@ -12303,19 +12303,13 @@ See the individual commands for more information."
(easy-menu-define org-org-menu org-mode-map "Org menu"
'("Org"
("Show/Hide"
["Cycle Visibility" org-cycle :active (or (bobp) (outline-on-heading-p))
:help "Cycle subtree visibility: folded->children->all->folded"]
["Cycle Global Visibility" org-shifttab :active (not (org-at-table-p))
:help "Cycle global visibility: overview->content->all"]
["Sparse Tree..." org-sparse-tree
:help "Create sparse trees using different search criteria"]
["Reveal Context" org-reveal :active t
:help "Show hidden context around point, including the outline hierarchy"]
["Show All" show-all :active t
:help "Show all text in the buffer, including drawers"]
["Cycle Visibility" org-cycle :active (or (bobp) (outline-on-heading-p))]
["Cycle Global Visibility" org-shifttab :active (not (org-at-table-p))]
["Sparse Tree..." org-sparse-tree t]
["Reveal Context" org-reveal t]
["Show All" show-all t]
"--"
["Subtree to indirect buffer" org-tree-to-indirect-buffer :active t
:help "Open the subtree at point in a separate window, using an indirect buffer"])
["Subtree to indirect buffer" org-tree-to-indirect-buffer t])
"--"
["New Heading" org-insert-heading t]
("Navigate Headings"
@ -12432,17 +12426,17 @@ See the individual commands for more information."
["Insert Link" org-insert-link t]
["Follow Link" org-open-at-point t]
"--"
["Next link" org-next-link :help "Move forward to next link in the buffer"]
["Next link" org-next-link t]
["Previous link" org-previous-link t]
"--"
["Descriptive Links"
(progn (org-add-to-invisibility-spec '(org-link)) (org-restart-font-lock))
:style radio :help "Hide link part of links, only show the description"
:style radio
:selected (member '(org-link) buffer-invisibility-spec)]
["Literal Links"
(progn
(org-remove-from-invisibility-spec '(org-link)) (org-restart-font-lock))
:style radio :help "Show full links without hiding anything"
:style radio
:selected (not (member '(org-link) buffer-invisibility-spec))])
"--"
["Export/Publish..." org-export t]