[Emacs-diffs] Changes to emacs/lisp/textmodes/org.el

[Richard M . Stallman]

Index: emacs/lisp/textmodes/org.el
diff -c emacs/lisp/textmodes/org.el:1.27 emacs/lisp/textmodes/org.el:1.28
*** emacs/lisp/textmodes/org.el:1.27    Mon Jul  4 03:34:51 2005
--- emacs/lisp/textmodes/org.el Mon Jul  4 14:24:04 2005
***************
*** 999,1005 ****
    :group 'org-link
    :type 'boolean)
  
! (defconst org-file-apps-defaults-linux
    '((t        . emacs)
      ("jpg"    . "xv %s")
      ("gif"    . "xv %s")
--- 999,1005 ----
    :group 'org-link
    :type 'boolean)
  
! (defconst org-file-apps-defaults-gnu
    '((t        . emacs)
      ("jpg"    . "xv %s")
      ("gif"    . "xv %s")
***************
*** 1023,1029 ****
      ("html"   . "netscape -remote openURL(%s,new-window)")
      ("htm"    . "netscape -remote openURL(%s,new-window)")
      ("xs"     . "soffice %s"))
!   "Default file applications on a UNIX/LINUX system.
  See `org-file-apps'.")
  
  (defconst org-file-apps-defaults-macosx
--- 1023,1029 ----
      ("html"   . "netscape -remote openURL(%s,new-window)")
      ("htm"    . "netscape -remote openURL(%s,new-window)")
      ("xs"     . "soffice %s"))
!   "Default file applications on a GNU-like system.
  See `org-file-apps'.")
  
  (defconst org-file-apps-defaults-macosx
***************
*** 1067,1073 ****
  For more examples, see the system specific constants
  `org-file-apps-defaults-macosx'
  `org-file-apps-defaults-windowsnt'
! `org-file-apps-defaults-linux'."
    :group 'org-link
    :type '(repeat
            (cons (string :tag "Extension")
--- 1067,1073 ----
  For more examples, see the system specific constants
  `org-file-apps-defaults-macosx'
  `org-file-apps-defaults-windowsnt'
! `org-file-apps-defaults-gnu'."
    :group 'org-link
    :type '(repeat
            (cons (string :tag "Extension")
***************
*** 5388,5396 ****
      org-file-apps-defaults-macosx)
     ((eq system-type 'windows-nt)
      org-file-apps-defaults-windowsnt)
!    ((eq system-type 'linux)
!     org-file-apps-defaults-linux)
!    (t org-file-apps-defaults-linux)))
  
  (defun org-expand-file-name (path)
    "Replace special path abbreviations and expand the file name."
--- 5388,5394 ----
      org-file-apps-defaults-macosx)
     ((eq system-type 'windows-nt)
      org-file-apps-defaults-windowsnt)
!    (t org-file-apps-defaults-gnu)))
  
  (defun org-expand-file-name (path)
    "Replace special path abbreviations and expand the file name."
***************
*** 9048,9054 ****
  (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 "\C-c-"          'org-table-insert-hline)
! ;; The following line is e.g. necessary for German keyboards under Suse Linux
  (unless org-xemacs-p
    (define-key org-mode-map [S-iso-lefttab]  'org-shifttab))
  (define-key org-mode-map [(shift tab)]    'org-shifttab)
--- 9046,9052 ----
  (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 "\C-c-"          'org-table-insert-hline)
! ;; The following line is necessary for German keyboards under Suse GNU/Linux
  (unless org-xemacs-p
    (define-key org-mode-map [S-iso-lefttab]  'org-shifttab))
  (define-key org-mode-map [(shift tab)]    'org-shifttab)