Package: maxima-emacs User: [email protected] Usertags: origin-ubuntu maverick ubuntu-patch Version: 5.21.1-1 Severity: minor Tags: patch
In Ubuntu, we've applied the attached patch to achieve the following:
- debian/maxima-emacs.emacsen-install:
+ Install symlinks for source files rather than copying them. This
makes find-function work.
+ Install symlink for *.lisp so that we don't need to add
/usr/share/emacs/site-lisp/maxima to load-path.
- debian/maxima-emacs.emacsen-startup:
+ Remove use of /usr/share/emacs/site-lisp/maxima, since this
causes load-path shadows and is not needed anymore.
- Comment out backward-delete-char-untabify in maxima.el.
We thought you might be interested in doing the same.
These changes originated (a while ago) in this report:
https://bugs.launchpad.net/ubuntu/+source/maxima/+bug/124415
SR
PS: I can't comment on the content of this patch as I didn't author it
and am not an emacs user.
--
Stefano Rivera
http://tumbleweed.org.za/
H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127
diff -u maxima-5.21.1/debian/maxima-emacs.emacsen-startup maxima-5.21.1/debian/maxima-emacs.emacsen-startup
--- maxima-5.21.1/debian/maxima-emacs.emacsen-startup
+++ maxima-5.21.1/debian/maxima-emacs.emacsen-startup
@@ -25,11 +25,6 @@
(autoload 'maxima "maxima" "" t)
-
-; For emaxima.lisp to be found and tex update mode to be enabled.
-;
-(debian-pkg-add-load-path-item "/usr/share/emacs/site-lisp/maxima")
-;
(autoload 'emaxima-mode "emaxima" "" t)
(autoload 'imaxima "imaxima" "" t)
diff -u maxima-5.21.1/debian/changelog maxima-5.21.1/debian/changelog
diff -u maxima-5.21.1/debian/maxima-emacs.emacsen-install maxima-5.21.1/debian/maxima-emacs.emacsen-install
--- maxima-5.21.1/debian/maxima-emacs.emacsen-install
+++ maxima-5.21.1/debian/maxima-emacs.emacsen-install
@@ -34,12 +34,12 @@
cd ${ELDIR}
FILES=`echo *.el`
-cp ${FILES} ${ELCDIR}
cd ${ELCDIR}
+ln -sf ${ELDIR}/*.el ${ELDIR}/*.lisp .
cat << EOF > path.el
(setq load-path (cons "." load-path) byte-compile-warnings nil)
EOF
${FLAVOR} ${FLAGS} ${FILES}
-rm -f *.el path.el
+rm -f path.el
exit 0
only in patch2:
unchanged:
--- maxima-5.21.1.orig/interfaces/emacs/emaxima/maxima.el
+++ maxima-5.21.1/interfaces/emacs/emaxima/maxima.el
@@ -2494,7 +2494,7 @@
(define-key map "\C-c\)" 'maxima-check-parens)
(define-key map [(control c) (control \))] 'maxima-check-form-parens)
; (define-key map "\C-cC-\)" 'maxima-check-form-parens)
- (define-key map "\177" 'backward-delete-char-untabify)
+; (define-key map "\177" 'backward-delete-char-untabify)
(setq maxima-mode-map map)))
;;;; Menu
@@ -3321,7 +3321,7 @@
(define-key inferior-maxima-mode-map [(meta control tab)]
'inferior-maxima-input-complete)
(define-key inferior-maxima-mode-map "\e\t" 'inferior-maxima-complete)
-(define-key inferior-maxima-mode-map "\177" 'backward-delete-char-untabify)
+;(define-key inferior-maxima-mode-map "\177" 'backward-delete-char-untabify)
(define-key inferior-maxima-mode-map "\C-c\C-k" 'maxima-stop)
(define-key inferior-maxima-mode-map "\C-c\C-d" maxima-help-map)
signature.asc
Description: Digital signature
