# HG changeset patch
# User Dan Nicolaescu <dann@ics.uci.edu>
# Date 1197227986 0
# Node ID f81c00b9c0ff6025336c87e5d57c90f9ed67fa5d
# Parent  23c53aca1e84b26f95350bfbf7782e757d422f81
* progmodes/perl-mode.el (perl-continued-statement-offset)
(perl-continued-brace-offset, perl-brace-offset)
(perl-brace-imaginary-offset, perl-label-offset):
* progmodes/cperl-mode.el (cperl-brace-offset)
(cperl-continued-brace-offset, cperl-label-offset)
(cperl-continued-statement-offset)
(cperl-extra-newline-before-brace, cperl-merge-trailing-else): Add
safe-local-variable properties.

diff -r 23c53aca1e84 -r f81c00b9c0ff lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Dec 09 07:24:51 2007 +0000
+++ b/lisp/ChangeLog	Sun Dec 09 19:19:46 2007 +0000
@@ -1,3 +1,14 @@
+2007-12-09  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* progmodes/perl-mode.el (perl-continued-statement-offset)
+	(perl-continued-brace-offset, perl-brace-offset)
+	(perl-brace-imaginary-offset, perl-label-offset):
+	* progmodes/cperl-mode.el (cperl-brace-offset)
+	(cperl-continued-brace-offset, cperl-label-offset)
+	(cperl-continued-statement-offset)
+	(cperl-extra-newline-before-brace, cperl-merge-trailing-else): Add
+	safe-local-variable properties.
+
 2007-12-08  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* progmodes/verilog-mode.el (verilog-mode-map)
@@ -5,6 +16,11 @@
 	(verilog-colorize-include-files): Use only overlay functions so
 	that it can work on both emacs and XEmacs.
 	(set-extent-keymap): Remove unused defun.
+	(verilog-kill-existing-comment, verilog-insert-date)
+	(verilog-insert-year): Rename in order not to pollute the global
+	namespace from kill-existing-comment, insert-date and
+	insert-year, respectively.
+	(verilog-set-auto-endcomments, verilog-header): Update callers.
 
 	* files.el (auto-mode-alist): Recognize verilog files.
 
diff -r 23c53aca1e84 -r f81c00b9c0ff lisp/progmodes/cperl-mode.el
--- a/lisp/progmodes/cperl-mode.el	Sun Dec 09 07:24:51 2007 +0000
+++ b/lisp/progmodes/cperl-mode.el	Sun Dec 09 19:19:46 2007 +0000
@@ -234,12 +234,18 @@
   :type 'integer
   :group 'cperl-indentation-details)
 
-;; Is is not unusual to put both perl-indent-level and
+;; Is is not unusual to put both things like 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
+;; about the variable. Autoload these here, so that no warning is
 ;; issued when using either perl-mode or cperl-mode.
 ;;;###autoload(put 'cperl-indent-level 'safe-local-variable 'integerp)
+;;;###autoload(put 'cperl-brace-offset 'safe-local-variable 'integerp)
+;;;###autoload(put 'cperl-continued-brace-offset 'safe-local-variable 'integerp)
+;;;###autoload(put 'cperl-label-offset 'safe-local-variable 'integerp)
+;;;###autoload(put 'cperl-continued-statement-offset 'safe-local-variable 'integerp)
+;;;###autoload(put 'cperl-extra-newline-before-brace 'safe-local-variable 'booleanp)
+;;;###autoload(put 'cperl-merge-trailing-else 'safe-local-variable 'booleanp)
 
 (defcustom cperl-lineup-step nil
   "*`cperl-lineup' will always lineup at multiple of this number.
diff -r 23c53aca1e84 -r f81c00b9c0ff lisp/progmodes/perl-mode.el
--- a/lisp/progmodes/perl-mode.el	Sun Dec 09 07:24:51 2007 +0000
+++ b/lisp/progmodes/perl-mode.el	Sun Dec 09 19:19:46 2007 +0000
@@ -402,12 +402,17 @@
   :type 'integer
   :group 'perl)
 
-;; Is is not unusual to put both perl-indent-level and
+;; Is is not unusual to put both things like 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
+;; about the variable. Autoload these here, so that no warning is
 ;; issued when using either perl-mode or cperl-mode.
 ;;;###autoload(put 'perl-indent-level 'safe-local-variable 'integerp)
+;;;###autoload(put 'perl-continued-statement-offset 'safe-local-variable 'integerp)
+;;;###autoload(put 'perl-continued-brace-offset 'safe-local-variable 'integerp)
+;;;###autoload(put 'perl-brace-offset 'safe-local-variable 'integerp)
+;;;###autoload(put 'perl-brace-imaginary-offset 'safe-local-variable 'integerp)
+;;;###autoload(put 'perl-label-offset 'safe-local-variable 'integerp)
 
 (defcustom perl-continued-statement-offset 4
   "*Extra indent for lines not starting new statements."