2 files changed, 8 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5c8237ee4aa..e71240efd97 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-31  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/pascal.el (pascal-mode-syntax-table): Accept //..\n comments
+        (bug#13585).
+
 2013-01-30  Juri Linkov  <juri@jurta.org>
 
         * frame.el (toggle-frame-maximized, toggle-frame-fullscreen):
diff --git a/lisp/progmodes/pascal.el b/lisp/progmodes/pascal.el
index de8a4355cd3..829ecda5150 100644
--- a/lisp/progmodes/pascal.el
+++ b/lisp/progmodes/pascal.el
@@ -138,6 +138,9 @@
     ;; find about the syntax of Pascal's comments said that (* ... } is
     ;; a valid comment, just as { ... *) or (* ... *) or { ... }.
     (modify-syntax-entry ?* ". 23" st)
+    ;; Allow //...\n comments as accepted by Free Pascal (bug#13585).
+    (modify-syntax-entry ?/ ". 12c" st)
+    (modify-syntax-entry ?\n "> c" st)
     (modify-syntax-entry ?{ "<"    st)
     (modify-syntax-entry ?} ">"    st)
     (modify-syntax-entry ?+ "."    st)