emacs: lisp/progmodes/cperl-mode.el comparison

comparison lisp/progmodes/cperl-mode.el @ 91015:b83d0dadb2a7

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 857-865) - Update from CVS - Merge from emacs--rel--22 - Update from CVS: lisp/emacs-lisp/avl-tree.el: New file. - Remove RCS keywords * emacs--rel--22 (patch 97-100) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 246-247) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-252

author	Miles Bader <miles@gnu.org>
date	Wed, 29 Aug 2007 05:03:40 +0000
parents	aaccdab0ee26 92ccd83174e6
children	bdb3fe0ba9fa

comparison

equal deleted inserted replaced

-:2392e6a45952
+:b83d0dadb2a7
 (or (fboundp 'defgroup)
 	  (defmacro defgroup (name val doc &rest arr)
 	    nil))
 (or (fboundp 'custom-declare-variable)
 	  (defmacro defcustom (name val doc &rest arr)
-	    (` (defvar (, name) (, val) (, doc)))))
+	    `(defvar ,name ,val ,doc)))
 (or (and (fboundp 'custom-declare-variable)
 	       (string< "19.31" emacs-version))	;  Checked with 19.30: defface does not work
 	  (defmacro defface (&rest arr)
 	    nil))
 ;; Avoid warning (tmp definitions)
 (or (fboundp 'x-color-defined-p)
 	  (defmacro x-color-defined-p (col)
-	    (cond ((fboundp 'color-defined-p) (` (color-defined-p (, col))))
+	    (cond ((fboundp 'color-defined-p) `(color-defined-p ,col))
 		  ;; XEmacs >= 19.12
-		  ((fboundp 'valid-color-name-p) (` (valid-color-name-p (, col))))
+		  ((fboundp 'valid-color-name-p) `(valid-color-name-p ,col))
 		  ;; XEmacs 19.11
-		  ((fboundp 'x-valid-color-name-p) (` (x-valid-color-name-p (, col))))
+		  ((fboundp 'x-valid-color-name-p) `(x-valid-color-name-p ,col))
 		  (t '(error "Cannot implement color-defined-p")))))
 (defmacro cperl-is-face (arg)	; Takes quoted arg
 	(cond ((fboundp 'find-face)
-	       (` (find-face (, arg))))
+	       `(find-face ,arg))
 	      (;;(and (fboundp 'face-list)
 	       ;;	(face-list))
 	       (fboundp 'face-list)
-	       (` (member (, arg) (and (fboundp 'face-list)
+	       `(member ,arg (and (fboundp 'face-list)
-				       (face-list)))))
+(face-list))))
 	      (t
-	       (` (boundp (, arg))))))
+	       `(boundp ,arg))))
 (defmacro cperl-make-face (arg descr) ; Takes unquoted arg
 	(cond ((fboundp 'make-face)
-	       (` (make-face (quote (, arg)))))
+	       `(make-face (quote ,arg)))
 	      (t
-	       (` (defvar (, arg) (quote (, arg)) (, descr))))))
+	       `(defvar ,arg (quote ,arg) ,descr))))
 (defmacro cperl-force-face (arg descr) ; Takes unquoted arg
-	(` (progn
+	`(progn
-	     (or (cperl-is-face (quote (, arg)))
+	     (or (cperl-is-face (quote ,arg))
-		 (cperl-make-face (, arg) (, descr)))
+		 (cperl-make-face ,arg ,descr))
-	     (or (boundp (quote (, arg))) ; We use unquoted variants too
+	     (or (boundp (quote ,arg)) ; We use unquoted variants too
-		 (defvar (, arg) (quote (, arg)) (, descr))))))
+		 (defvar ,arg (quote ,arg) ,descr))))
 (if cperl-xemacs-p
 	  (defmacro cperl-etags-snarf-tag (file line)
-	    (` (progn
+	    `(progn
-		 (beginning-of-line 2)
+(beginning-of-line 2)
-		 (list (, file) (, line)))))
+(list ,file ,line)))
 	(defmacro cperl-etags-snarf-tag (file line)
-	  (` (etags-snarf-tag))))
+	  `(etags-snarf-tag)))
 (if cperl-xemacs-p
 	  (defmacro cperl-etags-goto-tag-location (elt)
-	    (`;;(progn
+	    ;;(progn
-	     ;; (switch-to-buffer (get-file-buffer (elt (, elt) 0)))
+;; (switch-to-buffer (get-file-buffer (elt ,elt 0)))
-	     ;; (set-buffer (get-file-buffer (elt (, elt) 0)))
+;; (set-buffer (get-file-buffer (elt ,elt 0)))
-	     ;; Probably will not work due to some save-excursion???
+;; Probably will not work due to some save-excursion???
-	     ;; Or save-file-position?
+;; Or save-file-position?
-	     ;; (message "Did I get to line %s?" (elt (, elt) 1))
+;; (message "Did I get to line %s?" (elt ,elt 1))
-	     (goto-line (string-to-int (elt (, elt) 1)))))
+`(goto-line (string-to-int (elt ,elt 1))))
 	;;)
 	(defmacro cperl-etags-goto-tag-location (elt)
-	  (` (etags-goto-tag-location (, elt))))))
+	  `(etags-goto-tag-location ,elt))))
 (defconst cperl-xemacs-p (string-match "XEmacs\\|Lucid" emacs-version))
 (defvar cperl-can-font-lock
 (or cperl-xemacs-p
 (defcustom cperl-indent-level 2
 "*Indentation of CPerl statements with respect to containing block."
 :type 'integer
 :group 'cperl-indentation-details)
-(put 'cperl-indent-level 'safe-local-variable 'integerp)
+;; Is is not unusual to put both perl-indent-level and
+;; cperl-indent-level in the local variable section of a file. If only
+;; one of perl-mode and cperl-mode is in use, a warning will be issued
+;; about the variable. Autoload this here, so that no warning is
+;; issued when using either perl-mode or cperl-mode.
+;;;###autoload(put 'cperl-indent-level 'safe-local-variable 'integerp)
 (defcustom cperl-lineup-step nil
 "*`cperl-lineup' will always lineup at multiple of this number.
 If nil, the value of `cperl-indent-level' will be used."
 :type '(choice (const nil) integer)
 (make-local-variable 'vc-sccs-header)
 (set 'vc-sccs-header cperl-vc-sccs-header)
 ;; This one is obsolete...
 (make-local-variable 'vc-header-alist)
 (set 'vc-header-alist (or cperl-vc-header-alist ; Avoid warning
-			    (` ((SCCS (, (car cperl-vc-sccs-header)))
+			    `((SCCS ,(car cperl-vc-sccs-header))
-				     (RCS (, (car cperl-vc-rcs-header)))))))
+(RCS ,(car cperl-vc-rcs-header)))))
 (cond ((boundp 'compilation-error-regexp-alist-alist);; xemacs 20.x
 	 (make-local-variable 'compilation-error-regexp-alist-alist)
 	 (set 'compilation-error-regexp-alist-alist
 	      (cons (cons 'cperl (car cperl-compilation-error-regexp-alist))
 		    (symbol-value 'compilation-error-regexp-alist-alist)))
 				   (1 font-lock-variable-name-face)
 				   (2 '(restart 2 nil) nil t)))
 			nil t)))	; local variables, multiple
 		  (font-lock-anchored
 		   ;; 1=my_etc, 2=white? 3=(+white? 4=white? 5=var
-		   (` ((, (concat "\\<\\(my\\|local\\|our\\)"
+		   `(,(concat "\\<\\(my\\|local\\|our\\)"
 				  cperl-maybe-white-and-comment-rex
 				  "\\(("
 				     cperl-maybe-white-and-comment-rex
-				  "\\)?\\([$@%*]\\([a-zA-Z0-9_:]+\\|[^a-zA-Z0-9_]\\)\\)"))
+				  "\\)?\\([$@%*]\\([a-zA-Z0-9_:]+\\|[^a-zA-Z0-9_]\\)\\)")
-		       (5 (, (if cperl-font-lock-multiline
+		       (5 ,(if cperl-font-lock-multiline
 				 'font-lock-variable-name-face
 			       '(progn  (setq cperl-font-lock-multiline-start
 					      (match-beginning 0))
-					'font-lock-variable-name-face))))
+					'font-lock-variable-name-face)))
-		       ((, (concat "\\="
+		       (,(concat "\\="
 				   cperl-maybe-white-and-comment-rex
 				   ","
 				   cperl-maybe-white-and-comment-rex
-				   "\\([$@%*]\\([a-zA-Z0-9_:]+\\|[^a-zA-Z0-9_]\\)\\)"))
+				   "\\([$@%*]\\([a-zA-Z0-9_:]+\\|[^a-zA-Z0-9_]\\)\\)")
 			;; Bug in font-lock: limit is used not only to limit
 			;; searches, but to set the "extend window for
 			;; facification" property.  Thus we need to minimize.
-			(, (if cperl-font-lock-multiline
+			,(if cperl-font-lock-multiline
 			     '(if (match-beginning 3)
 				  (save-excursion
 				    (goto-char (match-beginning 3))
 				    (condition-case nil
 					(forward-sexp 1)
 					 (error nil)))) ; typeahead
 				    (1- (point))) ; report limit
 				(forward-char -2)) ; disable continued expr
 			     '(if (match-beginning 3)
 				  (point-max) ; No limit for continuation
-				(forward-char -2)))) ; disable continued expr
+				(forward-char -2))) ; disable continued expr
-			(, (if cperl-font-lock-multiline
+			,(if cperl-font-lock-multiline
 			       nil
 			     '(progn	; Do at end
 				;; "my" may be already fontified (POD),
 				;; so cperl-font-lock-multiline-start is nil
 				(if (or (not cperl-font-lock-multiline-start)
 					      (point))))
 				    nil
 				  (put-text-property
 				   (1+ cperl-font-lock-multiline-start) (point)
 				   'syntax-type 'multiline))
-				(setq cperl-font-lock-multiline-start nil))))
+				(setq cperl-font-lock-multiline-start nil)))
-			(3 font-lock-variable-name-face)))))
+			(3 font-lock-variable-name-face))))
 		  (t '("^[ \t{}]*\\(my\\|local\\|our\\)[ \t]*\\(([ \t]*\\)?\\([$@%*][a-zA-Z0-9_:]+\\)"
 		       3 font-lock-variable-name-face)))
 	    '("\\<for\\(each\\)?\\([ \t]+\\(my\\|local\\|our\\)\\)?[ \t]*\\(\\$[a-zA-Z_][a-zA-Z_0-9]*\\)[ \t]*("
 	      4 font-lock-variable-name-face)
 	    ;; Avoid $!, and s!!, qq!! etc. when not fontifying syntaxically

Mercurial > emacs

comparison lisp/progmodes/cperl-mode.el @ 91015:b83d0dadb2a7