[prev in list] [next in list] [prev in thread] [next in thread]
List: ess-bugs
Subject: [ESS-bugs] ess-5.2.3 debian bug fixes -- FWD from Camm Maguire
From: Martin Maechler <maechler () stat ! math ! ethz ! ch>
Date: 2004-10-27 6:42:29
Message-ID: 16767.17237.737415.985100 () gargle ! gargle ! HOWL
[Download RAW message or body]
This should have gone to ESS-bugs anyway;
more on this in a 2nd message.
MM
MIME-Version: 1.0 (generated by SEMI 1.14.3 - "Ushinoya")
Content-Type: text/plain; charset=US-ASCII
Return-Path: <camm@enhanced.com>
User-Agent: SEMI/1.14.3 (Ushinoya) FLIM/1.14.3 (=?ISO-8859-4?Q?Unebigory?=
=?ISO-8859-4?Q?=F2mae?=) APEL/10.3 Emacs/21.2 (i386-debian-linux-gnu)
MULE/5.0 (SAKAKI)
Message-Id: <E1CMWWj-0002m2-00@intech19.enhanced.com>
Received-SPF: none (hypatia: domain of camm@enhanced.com does not designate
permitted sender hosts)
From: Camm Maguire <camm@enhanced.com>
To: <rossini@biostat.washington.edu>, <maechler@stat.math.ethz.ch>,
<hornik@ci.tuwien.ac.at>, <rmh@fisher.stat.temple.edu>
Subject: ess-5.2.3 items
Date: Tue, 26 Oct 2004 14:58:37 -0400
Greetings, and thank you all for your work on this!
1) The source tarball contains files with permissions which, once
unpacked, cannot be removed with rm -rf without a chmod first.
2) Here are my current diffs for the Debian package, which you might
find useful in your upstream development. Feel free to write if
they are not self explanatory -- they are the result of fairly
detailed Debian bug reports in recent months and years. You can
peruse these at bugs.debian.org if desired.
=============================================================================
--- ess-5.2.3.orig/doc/ess.texi
+++ ess-5.2.3/doc/ess.texi
@@ -48,6 +48,7 @@
@ifnottex
@majorheading ESS --- Emacs Speaks Statistics
+@dircategory Emacs
@direntry
* ESS: (ess). Emacs Speaks Statistics (S/S+/R, SAS, BUGS, Stata, XLisp-Stat).
@end direntry
--- ess-5.2.3.orig/lisp/essd-sp6.el
+++ ess-5.2.3/lisp/essd-sp6.el
@@ -87,7 +87,7 @@
(ess-function-template . " <- \n#\nfunction()\n{\n\n}\n")
(ess-loop-timeout . ess-S-loop-timeout)
- (ess-dump-filename-template . (replace-regexp-in-string
+ (ess-dump-filename-template . (ess-replace-regexp-in-string
"S$" ess-suffix ; in the one from custom:
ess-dump-filename-template-proto))
(ess-object-name-db-file . "ess-sp6-namedb.el")
--- ess-5.2.3.orig/lisp/ess-help.el
+++ ess-5.2.3/lisp/ess-help.el
@@ -227,15 +227,15 @@
;;; THIS WORKS!
;;(require 'w3)
-(defun ess-display-w3-help-on-object-other-window (object)
- "Display R-documentation for OBJECT using W3"
- (interactive "s Help on :")
- (let* ((ess-help-url (concat ess-help-w3-url-prefix
- ess-help-w3-url-funs
- object
- ".html")))
+;(defun ess-display-w3-help-on-object-other-window (object)
+; "Display R-documentation for OBJECT using W3"
+; (interactive "s Help on :")
+; (let* ((ess-help-url (concat ess-help-w3-url-prefix
+; ess-help-w3-url-funs
+; object
+; ".html")))
;;(w3-fetch-other-window ess-help-url)
- ))
+; ))
;;*;; Major mode definition
--- ess-5.2.3.orig/lisp/ess-utils.el
+++ ess-5.2.3/lisp/ess-utils.el
@@ -148,8 +148,8 @@
;; '(lambda ()
;; (add-hook 'local-write-file-hooks 'nuke-trailing-whitespace)))
-(defvar nuke-trailing-whitespace-p nil;disabled by default 'ask
- "*[Dis]activates (nuke-trailing-whitespace).
+(defvar ess-nuke-trailing-whitespace-p nil;disabled by default 'ask
+ "*[Dis]activates (ess-nuke-trailing-whitespace).
Disabled if `nil'; if `t', it works unconditionally, otherwise,
the user is queried.
Note that setting the default to `t' may not be a good idea when you edit
@@ -157,12 +157,12 @@
;;; MM: Newer Emacsen now have delete-trailing-whitespace
;;; -- but no customization like nuke-trailing-whitespace-p ..
-(defun nuke-trailing-whitespace ()
+(defun ess-nuke-trailing-whitespace ()
"Nuke all trailing whitespace in the buffer.
Whitespace in this case is just spaces or tabs.
This is a useful function to put on write-file-hooks.
-If the variable `nuke-trailing-whitespace-p' is `nil', this function is
+If the variable `ess-nuke-trailing-whitespace-p' is `nil', this function is
disabled. If `t', unreservedly strip trailing whitespace.
If not `nil' and not `t', query for each instance."
(interactive)
@@ -174,13 +174,13 @@
(t
(and (not buffer-read-only)
- nuke-trailing-whitespace-p
+ ess-nuke-trailing-whitespace-p
(save-match-data
(save-excursion
(save-restriction
(widen)
(goto-char (point-min))
- (cond ((eq nuke-trailing-whitespace-p t)
+ (cond ((eq ess-nuke-trailing-whitespace-p t)
(while (re-search-forward "[ \t]+$" (point-max) t)
(delete-region (match-beginning 0)
(match-end 0))))
--- ess-5.2.3.orig/lisp/ess.el
+++ ess-5.2.3/lisp/ess.el
@@ -132,7 +132,7 @@
(autoload 'ess-time-string "ess-utils" "Return time-stamp string." t)
-(autoload 'nuke-trailing-whitespace "ess-utils"
+(autoload 'ess-nuke-trailing-whitespace "ess-utils"
"Maybe get rid of trailing blanks." t)
; ess-transcript-mode: editing ``outputs'
--- ess-5.2.3.orig/lisp/ess-latex.el
+++ ess-5.2.3/lisp/ess-latex.el
@@ -484,14 +484,15 @@
(setq mode (concat
(downcase (buffer-substring beg end))
"-mode"))
- (if (and (>= (length mode) 11)
+ (if ;(and
+ (>= (length mode) 11)
(progn
(if
(equal (substring mode -10 -5) "-mode")
(setq mode (substring mode 0 -5)))
(if
(equal (substring mode 0 5) "mode:")
- (setq mode (substring mode 6))))))
+ (setq mode (substring mode 6)))))
(intern mode))))))
(defun ess-latex-find-chunk-index-buffer ()
--- ess-5.2.3.orig/lisp/ess-emcs.el
+++ ess-5.2.3/lisp/ess-emcs.el
@@ -88,14 +88,15 @@
(provide 'xemacs))
;; XEmacs 21.x and Emacs 20.x need this
-(if (not (fboundp 'replace-regexp-in-string))
- (if (featurep 'xemacs)
- (defun replace-regexp-in-string(regexp replace string)
+(cond ((fboundp 'replace-regexp-in-string)
+ (defalias 'ess-replace-regexp-in-string 'replace-regexp-in-string))
+ ((featurep 'xemacs)
+ (defun ess-replace-regexp-in-string(regexp replace string)
"Mimic GNU Emacs function replace-regexp-in-string with XEmacs' replace-in-string"
- (replace-in-string string regexp replace))
+ (replace-in-string string regexp replace)))
;; GNU emacs <= 20 -- take Emacs' 21(.3)'s definition:
- (defun replace-regexp-in-string (regexp rep string &optional
+ (t (defun ess-replace-regexp-in-string (regexp rep string &optional
fixedcase literal subexp start)
"Replace all matches for REGEXP with REP in STRING.
=============================================================================
3) I suppose the best strategy in a free software system like debian
is to autoload on M-x R and M-x XLS. Some object to (require
'ess-site) in the emacs startup as it turns on font-lock mode in
unrelated instances. Thoughts on this appreciated.
Take care,
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic