mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-07-16 01:16:27 +00:00
Code Releases Activity

org.el: Remove org-link-display-descriptive' and use org-descriptive-links'.

Browse source 
* org.el (org-link-display-descriptive): Remove this option
and rely on the existing `org-descriptive-links' instead.
(org-toggle-link-display): Use `org-descriptive-links'.

Without this change, both options are redundant.  This also
fixes a bug about using `org-descriptive-links' in the `org-mode'
function, that initialize the display using `org-descriptive-links'
instead of `org-link-display-descriptive'.

Thanks to Thomas S. Dye for spotting this.
This commit is contained in:
Bastien Guerry 2011-08-23 16:55:48 +02:00
parent f893659b27
commit 7475d7da1f
1 changed files with 13 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
lisp/org.el
View file

@ -1268,10 +1268,14 @@ See the manual for examples."
(function)))))
(defcustom org-descriptive-links t
"Non-nil means hide link part and only show description of bracket links.
Bracket links are like [[link][description]]. This variable sets the initial
state in new org-mode buffers. The setting can then be toggled on a
per-buffer basis from the Org->Hyperlinks menu."
"Non-nil means Org will display descriptive links.
E.g. [[http://orgmode.org][Org website]] will be displayed as
\"Org Website\", hiding the link itself and just displaying its
description. When set to `nil', Org will display the full links
literally.
You can interactively set the value of this variable by calling
`org-toggle-link-display' or from the menu Org>Hyperlinks menu."
:group 'org-link
:type 'boolean)
@ -1327,18 +1331,6 @@ description to use."
:group 'org-link
:type 'function)
(defcustom org-link-display-descriptive t
"Non-nil means Org will display descriptive links.
E.g. [[http://orgmode.org][Org website]] will be displayed as
\"Org Website\", hiding the link itself and just displaying its
description. When set to `nil', Org will display the full links
literally.
You can interactively set the value of this variable using the
`org-toggle-link-display'."
:group 'org-link
:type 'boolean)
(defgroup org-link-store nil
"Options concerning storing links in Org-mode."
:tag "Org Store Link"
@ -18458,12 +18450,12 @@ See the individual commands for more information."
["Descriptive Links"
org-toggle-link-display
:style radio
:selected org-link-display-descriptive
:selected org-descriptive-links
]
["Literal Links"
org-toggle-link-display
:style radio
:selected (not org-link-display-descriptive)])
:selected (not org-descriptive-links)])
"--"
("TODO Lists"
["TODO/DONE/-" org-todo t]
@ -20524,13 +20516,13 @@ if no description is present"
(defun org-toggle-link-display ()
"Toggle the literal or descriptive display of links."
(interactive)
(if org-link-display-descriptive
(if org-descriptive-links
(progn (org-remove-from-invisibility-spec '(org-link))
(org-restart-font-lock)
(setq org-link-display-descriptive nil))
(setq org-descriptive-links nil))
(progn (add-to-invisibility-spec '(org-link))
(org-restart-font-lock)
(setq org-link-display-descriptive t))))
(setq org-descriptive-links t))))
;; Speedbar support