diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4d9c16b1744..0817515d8cd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2011-04-29  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* progmodes/pascal.el: Use lexical binding.
+	(pascal-mode-map): Remove author preferences.
+
 	* pcomplete.el (pcomplete-std-complete): Don't abuse
 	completion-at-point.
 
diff --git a/lisp/progmodes/pascal.el b/lisp/progmodes/pascal.el
index 2a243a99ffc..e28bb14bb9a 100644
--- a/lisp/progmodes/pascal.el
+++ b/lisp/progmodes/pascal.el
@@ -1,4 +1,4 @@
-;;; pascal.el --- major mode for editing pascal source in Emacs
+;;; pascal.el --- major mode for editing pascal source in Emacs -*- lexical-binding: t -*-
 
 ;; Copyright (C) 1993-2011  Free Software Foundation, Inc.
 
@@ -76,8 +76,9 @@
     (define-key map ":"        'electric-pascal-colon)
     (define-key map "="        'electric-pascal-equal)
     (define-key map "#"        'electric-pascal-hash)
-    (define-key map "\r"       'electric-pascal-terminate-line)
-    (define-key map "\t"       'electric-pascal-tab)
+    ;; These are user preferences, so not to set by default.
+    ;;(define-key map "\r"       'electric-pascal-terminate-line)
+    ;;(define-key map "\t"       'electric-pascal-tab)
     (define-key map "\M-\t"    'pascal-complete-word)
     (define-key map "\M-?"     'pascal-show-completions)
     (define-key map "\177"     'backward-delete-char-untabify)