Skip to content

Commit

Permalink
Obsolete literate data analysis functionality
Browse files Browse the repository at this point in the history
Closes emacs-ess#98, closes emacs-ess#114, closes emacs-ess#136, closes emacs-ess#159, closes emacs-ess#215,
closes emacs-ess#260, closes emacs-ess#338, closes emacs-ess#354, closes emacs-ess#338, closes emacs-ess#405,
closes emacs-ess#438, and closes emacs-ess#487.
  • Loading branch information
jabranham committed Oct 31, 2018
1 parent 9bdf835 commit 0ad228f
Show file tree
Hide file tree
Showing 11 changed files with 44 additions and 105 deletions.
18 changes: 0 additions & 18 deletions LDA/README

This file was deleted.

34 changes: 0 additions & 34 deletions LDA/ex1.nw

This file was deleted.

8 changes: 8 additions & 0 deletions doc/newfeat.texi
Expand Up @@ -59,6 +59,14 @@ The following have been made obsolete, see their documentation for more detail:

@itemize @bullet

@item Libraries for literate data analysis are obsolete and not loaded by default.
This includes @code{ess-noweb}, @code{ess-swv}, and related
functionality like @code{Rnw-mode}. Users are encouraged to switch to
one of several other packages that deal with these modes. For example,
polymode @url{https://github.com/polymode/poly-R/},
@url{https://polymode.github.io/}, or markdown-mode with edit-indirect
@url{https://jblevins.org/projects/markdown-mode}.

@item User options for controlling display of buffers.
This includes @code{ess-show-buffer-action},
@code{inferior-ess-same-window}, @code{inferior-ess-own-frame}, and
Expand Down
22 changes: 10 additions & 12 deletions lisp/Makefile
@@ -1,5 +1,4 @@
### Makefile - for compiled e-lisp of ESS distribution.
###

## Before making changes here, please take a look at Makeconf
include ../Makeconf
Expand All @@ -21,18 +20,20 @@ NOWEAVE=noweave
# Have to preload the files that contain macro definitions or the byte compiler
# will compile everything that references them incorrectly. Also preload a file
# that sets byte compiler options.
COMPILE = $(EMACSBATCH) --directory . -f batch-byte-compile
COMPILE = $(EMACSBATCH) --directory . --directory obsolete/ -f batch-byte-compile

ELS = $(wildcard *.el obsolete/*.el)
ELS = $(wildcard *.el)
ELS := $(filter-out ess-autoloads.el, $(ELS))
ELC = $(ELS:.el=.elc)
obsolete-el = $(wildcard obsolete/*.el)
obsolete-elc = $(obsolete-el:.el=.elc)

# ESSR_VER =`cat ../etc/ESSR-VERSION`
##ESSR_VER = $(shell cat ../etc/ESSR-VERSION)

### Targets

all: julia-mode.el $(ELC) ess-custom.el ess-autoloads.el
all: julia-mode.el $(ELC) ess-custom.el ess-autoloads.el $(obsolete-elc)

.PHONY: dist
dist: all
Expand All @@ -55,6 +56,7 @@ uninstall:

clean:
rm -f $(ELC)
rm -f $(obsolete-elc)
rm -f ess-autoloads.el

distclean: clean
Expand All @@ -77,6 +79,10 @@ julia-mode.el:

ess-julia.elc: julia-mode.elc

$(obsolete-elc): $(obsolete-el)
cd obsolete/
$(COMPILE) $<

ess-autoloads.el:
@printf "\nGenerating $@\n"
$(EMACSBATCH) --eval "(progn\
Expand Down Expand Up @@ -117,16 +123,8 @@ ess-s-lang.elc : ess-s-lang.el ess.elc

ess-sas-d.elc : ess-sas-d.el ess.elc

ess-s3-d.elc : ess-s3-d.el ess-s-lang.elc ess.elc

ess-sp3-d.elc : ess-sp3-d.el ess-s-lang.elc ess.elc

ess-s4-d.elc : ess-s4-d.el ess-s-lang.elc ess.elc

ess-r-mode.elc : ess-r-mode.el ess-s-lang.elc ess.elc

ess-swv.elc: ess-swv.el ess-noweb.elc

## SAS

ess-sas-l.elc : ess-sas-l.el ess-sas-a.el ess.elc
Expand Down
26 changes: 0 additions & 26 deletions lisp/ess-r-mode.el
Expand Up @@ -929,32 +929,6 @@ use \"bin/Rterm.exe\"."
(if (file-exists-p R-path) R-path)))
R-ver))))

;;;###autoload
(defun Rnw-mode ()
"Major mode for editing Sweave(R) source.
See `ess-noweb-mode' and `R-mode' for more help."
(interactive)
(require 'ess-noweb);; << probably someplace else
(setq ess--make-local-vars-permanent t)
(ess-noweb-mode 1); turn it on
(ess-noweb-set-doc-mode 'latex-mode)
(ess-noweb-set-code-mode 'R-mode)
(setq ess--local-handy-commands
(append '(("weave" . ess-swv-weave)
("tangle" . ess-swv-tangle))
ess-handy-commands)
ess-dialect "R"
ess-language "S")
(put 'ess--local-handy-commands 'permanent-local t)
(run-mode-hooks 'Rnw-mode-hook))

(fset 'Snw-mode 'Rnw-mode); just a synonym (for now or ever)

;;;###autoload
(add-to-list 'auto-mode-alist '("\\.[rR]nw\\'" . Rnw-mode))
;;;###autoload
(add-to-list 'auto-mode-alist '("\\.[sS]nw\\'" . Snw-mode))

;;;###autoload
(defun R-transcript-mode ()
"Does the right thing."
Expand Down
12 changes: 0 additions & 12 deletions lisp/ess-site.el
Expand Up @@ -110,18 +110,6 @@ for ESS, such as icons.")
(require 'ess-bugs-d)
(require 'ess-jags-d)

(ess-write-to-dribble-buffer
(format "[ess-site.el]: ess-customize-alist=%s \n"
ess-customize-alist))

;;; Literate Data Analysis
(require 'ess-noweb)
(require 'ess-swv)

(ess-write-to-dribble-buffer
(format "[ess-site.el _2_]: ess-customize-alist=%s \n"
ess-customize-alist))

;;; Speedbar and mouse
(require 'ess-mouse)

Expand Down
3 changes: 0 additions & 3 deletions lisp/ess.el
Expand Up @@ -49,9 +49,6 @@
(require 'ess-generics)
(require 'ess-inf)

;; FIXME: should this be optional?
(require 'ess-noweb-mode)

;; Silence the byte compiler
(declare-function run-ess-r "ess-r-mode")
(declare-function S+ "ess-sp6w-d")
Expand Down
File renamed without changes.
26 changes: 26 additions & 0 deletions lisp/ess-noweb-mode.el → lisp/obsolete/ess-noweb-mode.el
Expand Up @@ -1789,6 +1789,32 @@ thread."
(ess-noweb-tangle-thread chunk-name buffer))))
;menu functions

;;;###autoload
(defun Rnw-mode ()
"Major mode for editing Sweave(R) source.
See `ess-noweb-mode' and `R-mode' for more help."
(interactive)
(require 'ess-noweb);; << probably someplace else
(setq ess--make-local-vars-permanent t)
(ess-noweb-mode 1); turn it on
(ess-noweb-set-doc-mode 'latex-mode)
(ess-noweb-set-code-mode 'R-mode)
(setq ess--local-handy-commands
(append '(("weave" . ess-swv-weave)
("tangle" . ess-swv-tangle))
ess-handy-commands)
ess-dialect "R"
ess-language "S")
(put 'ess--local-handy-commands 'permanent-local t)
(run-mode-hooks 'Rnw-mode-hook))

(fset 'Snw-mode 'Rnw-mode); just a synonym (for now or ever)

;;;###autoload
(add-to-list 'auto-mode-alist '("\\.[rR]nw\\'" . Rnw-mode))
;;;###autoload
(add-to-list 'auto-mode-alist '("\\.[sS]nw\\'" . Snw-mode))


;;; Finale

Expand Down
File renamed without changes.
File renamed without changes.

0 comments on commit 0ad228f

Please sign in to comment.