← Back to branch summary

~ubuntu-branches/ubuntu/raring/ess/raring-proposed

« back to all changes in this revision

Viewing changes to debian/emacsen-startup

  • Committer: Bazaar Package Importer
  • Author(s): Dirk Eddelbuettel
  • Date: 2010-11-08 16:52:27 UTC
  • mfrom: (1.2.18 upstream)
  • Revision ID: james.westby@ubuntu.com-20101108165227-u844l0tlegcdn89k
Tags: 5.12-1
http://bugs.debian.org/594750
* New upstream version released today

* debian/emacen-startup: Follow suggestion by Kevin Ryde in #594750 and
  use debian-pkg-add-load-path-item as well; also improved emacsen-install
  script by using soft links instead of copies  (Closes: #594750)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/emacsen-startup
25
25
  ;; xemacs19, emacs20, xemacs20...).  The compiled code is then
26
26
  ;; installed in a subdirectory of the respective site-lisp directory.
27
27
  ;; We have to add this to the load-path:
28
 
  (setq load-path (cons  (concat "/usr/share/"
29
 
                                 (symbol-name debian-emacs-flavor)
30
 
                                 "/site-lisp/ess") load-path ))
31
 
                                        ;(if (assoc "\\.[rR]\\'" auto-mode-alist) nil
32
 
                                        ;  (setq auto-mode-alist
33
 
                                        ;       (append
34
 
                                        ;        '(("\\.sp\\'"    . S-mode) ;; re: Don MacQueen <macq@llnl.gov>
35
 
                                        ;          ("\\.[qsS]\\'" . S-mode) ;; q,s,S [see ess-restore-asm-extns above!]
36
 
                                        ;          ("\\.ssc\\'"   . S-mode) ;; Splus 4.x script files.
37
 
                                        ;          ("\\.[rR]\\'"  . R-mode)
38
 
                                        ;          ("\\.[rR]nw\\'"  . Rnw-mode)
39
 
                                        ;          ("\\.[rR]profile\\'" . R-mode)
40
 
                                        ;          ("NAMESPACE\\'" . R-mode)
41
 
                                        ;          ("\\.omg\\'"         . omegahat-mode)
42
 
                                        ;          ("\\.hat\\'"         . omegahat-mode) ;; Duncan's pref'd...
43
 
                                        ;          ("\\.lsp\\'"         . XLS-mode)
44
 
                                        ;          ("\\.do\\'"          . STA-mode)
45
 
                                        ;          ("\\.ado\\'"         . STA-mode)
46
 
                                        ;          ("\\.sas\\'"         . SAS-mode)
47
 
                                        ;          ("\\.SAS\\'"         . SAS-mode)
48
 
                                        ;          ;;("\\.lst\\'"               . SAS-listing-mode);sasl
49
 
                                        ;          ;; Too many *.log files, not only SAS :
50
 
                                        ;          ;;("\\.log\\'"       . SAS-log-mode);sasl
51
 
                                        ;          ("\\.[Ss]t\\'"       . S-transcript-mode)
52
 
                                        ;          ("\\.[Ss]out"        . S-transcript-mode)
53
 
                                        ;          ("\\.[Rr]t\\'"       . R-transcript-mode)
54
 
                                        ;          ("\\.[Rr]out"        . R-transcript-mode)
55
 
                                        ;          ("\\.Rd\\'"          . Rd-mode)
56
 
                                        ;          ("\\.[Bb][Uu][Gg]\\'"         . ess-bugs-mode)
57
 
                                        ;          ("\\.[Bb][Oo][Gg]\\'"         . ess-bugs-mode)
58
 
                                        ;          ("\\.[Bb][Mm][Dd]\\'"         . ess-bugs-mode)
59
 
                                        ;          )
60
 
                                        ;        auto-mode-alist)))
 
28
  (debian-pkg-add-load-path-item
 
29
   (concat "/usr/share/" (symbol-name debian-emacs-flavor) "/site-lisp/ess"))
61
30
 
62
 
                                        ;(dolist (l '(R XLS S Splus R-mode S-mode SAS-mode STA-mode
63
 
                                        ;              Rnw-mode omegahat-mode S-transcript-mode R-transcript-mode
64
 
                                        ;              Rd-mode ess-bugs-mode SAS-liting-mode SAS-log-mode))
65
 
                                        ;  (autoload l "ess-site" "" t))
 
31
  ;; As ess_5.12-1 we also link the uncompiled code into that directory so no need to load it
 
32
  ;; Put the uncompiled code in the path too 
 
33
  ;; (setq load-path (cons  (concat "/usr/share/"
 
34
  ;;                             (symbol-name debian-emacs-flavor)
 
35
  ;;                             "/site-lisp/ess") load-path ))
66
36
  (require 'ess-site)
67
37
  )
68
38
 )