dot/emacs, el/dot-emacs.el: Don't alias `perl-mode' = `cperl-mode'.

This was a mistake and makes it hard to compare the two.  Instead, just
use `cperl-mode' by default and leave the other one as a backup plan.

diff --git a/dot/emacs b/dot/emacs
index 583cb96c4323f544cfafbed8d679339da32c1e14..e7ba08656c1361485b9ec8f8762ecbad9b9be93e 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -530,7 +530,7 @@
 ;; Recognising types of files.
 
 (setq auto-mode-alist
 ;; Recognising types of files.
 
 (setq auto-mode-alist

-      (append `(("\\.p[lm]$" . perl-mode)
+      (append `(("\\.p[lm]$" . cperl-mode)

                ("\\.m$" . objc-mode)
                ("\\.mxd$" . c-mode)
                ("\\.cs$" . csharp-mode)
                ("\\.m$" . objc-mode)
                ("\\.mxd$" . c-mode)
                ("\\.cs$" . csharp-mode)


@@ -572,7 +572,7 @@
       (append `(("runlisp" . lisp-mode)
                ("@BASH@" . sh-mode)
                ("@PYTHON@" . python-mode)
       (append `(("runlisp" . lisp-mode)
                ("@BASH@" . sh-mode)
                ("@PYTHON@" . python-mode)

-               ("@PERL@" . perl-mode)
+               ("@PERL@" . cperl-mode)

                ("@TCLSH@" . tcl-mode)
                ("@WISH@" . tcl-mode)
                ("/tclsh" . tcl-mode)
                ("@TCLSH@" . tcl-mode)
                ("@WISH@" . tcl-mode)
                ("/tclsh" . tcl-mode)


@@ -610,7 +610,6 @@
        arm-assembler-mode-hook))
 
 (global-font-lock-mode t)
        arm-assembler-mode-hook))
 
 (global-font-lock-mode t)

-(defalias 'perl-mode 'cperl-mode)

 
 ;;;--------------------------------------------------------------------------
 ;;; Rootly editingness.
 
 ;;;--------------------------------------------------------------------------
 ;;; Rootly editingness.

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index 7d7484eca0dcccd14ebc5570f5a15bf5a6fa582d..8bb88c3f40f3d84fe49bb02b0938364ab363c6ed 100644 (file)
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -1944,7 +1944,6 @@ (defun mdw-fontify-awk ()
 
 ;; Perl indentation style.
 
 
 ;; Perl indentation style.
 

-(fset 'perl-mode 'cperl-mode)

 (setq cperl-indent-level 2)
 (setq cperl-continued-statement-offset 2)
 (setq cperl-continued-brace-offset 0)
 (setq cperl-indent-level 2)
 (setq cperl-continued-statement-offset 2)
 (setq cperl-continued-brace-offset 0)