CVS update by scop packages/xemacs-packages/perl-modes ...

[xemacs-cvs at xemacs.org]

  User: scop    
  Date: 08/04/03 19:16:36

  Modified:    packages/xemacs-packages/perl-modes ChangeLog cperl-mode.el
Log:
Sync cperl-mode.el with upstream 6.1.

Revision  Changes    Path
1.31      +5 -0      XEmacs/packages/xemacs-packages/perl-modes/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/perl-modes/ChangeLog,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- ChangeLog	2008/04/01 21:05:19	1.30
+++ ChangeLog	2008/04/03 17:16:35	1.31
@@ -1,3 +1,8 @@
+2008-04-03  Ville Skyttä  <scop at xemacs.org>
+
+	* cperl-mode.el: Sync with upstream version 6.1; all our changes
+	except for one tiny auto-autoloads bit are now included upstream.
+
 2008-04-01  Norbert Koch  <viteno at xemacs.org>
 
 	* Makefile (VERSION): XEmacs package 1.12 released.



1.14      +15 -7     XEmacs/packages/xemacs-packages/perl-modes/cperl-mode.el

Index: cperl-mode.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/perl-modes/cperl-mode.el,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- cperl-mode.el	2008/04/01 16:25:07	1.13
+++ cperl-mode.el	2008/04/03 17:16:35	1.14
@@ -5,7 +5,7 @@
 ;;     Free Software Foundation, Inc.
 
 ;; Author: Ilya Zakharevich and Bob Olson
-;; Maintainer: XEmacs Development Team <xemacs at xemacs.org>
+;; Maintainer: Ilya Zakharevich <ilyaz at cpan.org>
 ;; Keywords: languages, Perl
 
 ;; This file is part of GNU Emacs.
@@ -48,7 +48,7 @@
 
 ;;; Commentary:
 
-;; $Id: cperl-mode.el,v 6.0 2008/03/31 23:07:24 vera Exp vera $
+;; $Id: cperl-mode.el,v 6.1 2008/04/03 01:04:08 vera Exp vera $
 
 ;;; If your Emacs does not default to `cperl-mode' on Perl files:
 ;;; To use this mode put the following into
@@ -1546,6 +1546,13 @@
 ;;; `cperl-highlight-charclass': New subst
 ;;; `cperl-tips-faces'		Correct literal backwacks, mention multipliers
 
+;;; After 6.0:
+;;;; Incorporate XEmacs changes:
+;;; `cperl-mode-map':		Bind 'delete 'backspace on XEmacs
+;;; `cperl-electric-delete':	New (unsupported) function for XEmacs bindings
+;;; toplevel:			Define obsolete alias for `pod-spell'
+;;;				autoload updates to `mode-alist's
+
 ;;; Code:
 
 (if (fboundp 'eval-when-compile)
@@ -4168,7 +4175,8 @@ Delete direction is controlled by the se
 	(skip-chars-backward " \t\n")
 	(delete-region (point) p))
     (if (fboundp 'backward-or-forward-delete-char)
-	(backward-or-forward-delete-char arg)
+	(let ((f 'backward-or-forward-delete-char))
+	  (funcall f arg))		; Avoid "not defined"
       (backward-delete-char-untabify arg))))
 
 (defun cperl-inside-parens-p ()		;; NOT USED????
@@ -6934,7 +6942,6 @@ conditional/loop constructs."
 	     (delete-char -1))))))
 
 ;; Stolen from lisp-mode with a lot of improvements
-
 (defun cperl-fill-paragraph (&optional justify iteration)
   "Like \\[fill-paragraph], but handle CPerl comments.
 If any of the current line is a comment, fill the comment or the
@@ -10590,13 +10597,14 @@ do extra unwind via `cperl-unwind-to-saf
 	  (cperl-fontify-syntaxically to)))))
 
 (defvar cperl-version
-  (let ((v  "$Revision: 6.0 $"))
+  (let ((v  "$Revision: 6.1 $"))
     (string-match ":\\s *\\([0-9.]+\\)" v)
     (substring v (match-beginning 1) (match-end 1)))
   "Version of IZ-supported CPerl package this file is based on.")
 
-;; XEmacs addition: backwards compatibility for our old POD spelling stuff
-(define-obsolete-function-alias 'pod-spell 'cperl-pod-spell)
+(if cperl-xemacs-p ;; backwards compatibility for XEmacs old POD spelling stuff
+    (let ((f 'define-obsolete-function-alias))
+      (funcall f 'pod-spell 'cperl-pod-spell)))		; Avoid "not defined"
 
 ;; XEmacs additions
 ;;;###autoload(add-to-list 'auto-mode-alist '("\\.\\([pP][LlMm]\\|al\\)\\'" . perl-mode))