Commit ee53c9b7 authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(org-file-apps-defaults-gnu): Renamed from org-file-apps-defaults-linux.

(org-default-apps): Don't test system-type for `linux'.
(org-file-apps): Doc fix.
parent f2cb69d5
...@@ -999,7 +999,7 @@ The default is true, to keep new users from shooting into their own foot." ...@@ -999,7 +999,7 @@ The default is true, to keep new users from shooting into their own foot."
:group 'org-link :group 'org-link
:type 'boolean) :type 'boolean)
(defconst org-file-apps-defaults-linux (defconst org-file-apps-defaults-gnu
'((t . emacs) '((t . emacs)
("jpg" . "xv %s") ("jpg" . "xv %s")
("gif" . "xv %s") ("gif" . "xv %s")
...@@ -1023,7 +1023,7 @@ The default is true, to keep new users from shooting into their own foot." ...@@ -1023,7 +1023,7 @@ The default is true, to keep new users from shooting into their own foot."
("html" . "netscape -remote openURL(%s,new-window)") ("html" . "netscape -remote openURL(%s,new-window)")
("htm" . "netscape -remote openURL(%s,new-window)") ("htm" . "netscape -remote openURL(%s,new-window)")
("xs" . "soffice %s")) ("xs" . "soffice %s"))
"Default file applications on a UNIX/LINUX system. "Default file applications on a GNU-like system.
See `org-file-apps'.") See `org-file-apps'.")
(defconst org-file-apps-defaults-macosx (defconst org-file-apps-defaults-macosx
...@@ -1067,7 +1067,7 @@ and the corresponding command. Possible values for the command are: ...@@ -1067,7 +1067,7 @@ and the corresponding command. Possible values for the command are:
For more examples, see the system specific constants For more examples, see the system specific constants
`org-file-apps-defaults-macosx' `org-file-apps-defaults-macosx'
`org-file-apps-defaults-windowsnt' `org-file-apps-defaults-windowsnt'
`org-file-apps-defaults-linux'." `org-file-apps-defaults-gnu'."
:group 'org-link :group 'org-link
:type '(repeat :type '(repeat
(cons (string :tag "Extension") (cons (string :tag "Extension")
...@@ -5388,9 +5388,7 @@ If the file does not exist, an error is thrown." ...@@ -5388,9 +5388,7 @@ If the file does not exist, an error is thrown."
org-file-apps-defaults-macosx) org-file-apps-defaults-macosx)
((eq system-type 'windows-nt) ((eq system-type 'windows-nt)
org-file-apps-defaults-windowsnt) org-file-apps-defaults-windowsnt)
((eq system-type 'linux) (t org-file-apps-defaults-gnu)))
org-file-apps-defaults-linux)
(t org-file-apps-defaults-linux)))
(defun org-expand-file-name (path) (defun org-expand-file-name (path)
"Replace special path abbreviations and expand the file name." "Replace special path abbreviations and expand the file name."
...@@ -9048,7 +9046,7 @@ When LEVEL is non-nil, increase section numbers on that level." ...@@ -9048,7 +9046,7 @@ When LEVEL is non-nil, increase section numbers on that level."
(define-key org-mode-map (org-key 'S-left) 'org-timestamp-down-day) (define-key org-mode-map (org-key 'S-left) 'org-timestamp-down-day)
(define-key org-mode-map (org-key 'S-right) 'org-timestamp-up-day) (define-key org-mode-map (org-key 'S-right) 'org-timestamp-up-day)
(define-key org-mode-map "\C-c-" 'org-table-insert-hline) (define-key org-mode-map "\C-c-" 'org-table-insert-hline)
;; The following line is e.g. necessary for German keyboards under Suse Linux ;; The following line is necessary for German keyboards under Suse GNU/Linux
(unless org-xemacs-p (unless org-xemacs-p
(define-key org-mode-map [S-iso-lefttab] 'org-shifttab)) (define-key org-mode-map [S-iso-lefttab] 'org-shifttab))
(define-key org-mode-map [(shift tab)] 'org-shifttab) (define-key org-mode-map [(shift tab)] 'org-shifttab)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment