[Pkg-octave-commit] rev 281 - in trunk/packages/octave/debian: . in

[Rafael Laboissiere]

Author: rafael
Date: 2005-10-19 20:07:54 +0000 (Wed, 19 Oct 2005)
New Revision: 281

Modified:
   trunk/packages/octave/debian/changelog
   trunk/packages/octave/debian/in/PACKAGE-emacsen.emacsen-startup
Log:
Commented code that fiddles with user preferences


Modified: trunk/packages/octave/debian/changelog
===================================================================
--- trunk/packages/octave/debian/changelog	2005-10-15 10:48:51 UTC (rev 280)
+++ trunk/packages/octave/debian/changelog	2005-10-19 20:07:54 UTC (rev 281)
@@ -1,3 +1,14 @@
+octave2.1 (2.1.71-6) unstable; urgency=low
+
+   NOT YET RELEASED!
+
+   +++ Changes by Rafael Laboissiere
+
+  * debian/in/PACKAGE-emacsen.emacsen-startup: Commented out code that
+    fiddles with user preferences (closes: #334347)
+
+ --
+
 octave2.1 (2.1.71-5) unstable; urgency=low
 
    +++ Changes by Rafael Laboissiere

Modified: trunk/packages/octave/debian/in/PACKAGE-emacsen.emacsen-startup
===================================================================
--- trunk/packages/octave/debian/in/PACKAGE-emacsen.emacsen-startup	2005-10-15 10:48:51 UTC (rev 280)
+++ trunk/packages/octave/debian/in/PACKAGE-emacsen.emacsen-startup	2005-10-19 20:07:54 UTC (rev 281)
@@ -5,9 +5,9 @@
 ;; Originally contributed by Nils Naumann <naumann at unileoben.ac.at>
 ;; Modified by Dirk Eddelbuettel <edd at debian.org>
 
-;; The Octave package follows the Debian/GNU Linux 'emacsen' policy and 
+;; The Octave package follows the Debian/GNU Linux 'emacsen' policy and
 ;; byte-compiles its elisp files for each 'emacs flavour' ({,x}emacs{19,20}).
-;; The compiled code is then installed in a subdirectory of the of the 
+;; The compiled code is then installed in a subdirectory of the of the
 ;; respective site-lisp directory. We have to add this back to the load-path:
 ;; Modified per Rafael's patch to only execute for emacs19
 
@@ -22,13 +22,14 @@
 (autoload 'octave-help "octave-hlp" nil t)
 
 (setq auto-mode-alist (cons '("\\.m$" . octave-mode) auto-mode-alist))
-(add-hook 'octave-mode-hook
-          (lambda ()
-            (abbrev-mode 1)
-            (auto-fill-mode 1)
-            (if (eq window-system 'x)
-		(font-lock-mode 1))))
 
+; (add-hook 'octave-mode-hook
+;           (lambda ()
+;             (abbrev-mode 1)
+;             (auto-fill-mode 1)
+;             (if (eq window-system 'x)
+; 		(font-lock-mode 1))))
+
 (autoload 'run-octave "octave-inf" nil t)
 (autoload 'inferior-octave "octave-inf" nil t)
 (add-hook 'inferior-octave-mode-hook