* lisp/emacs-lisp/lisp-mode.el (lisp-mode-variables): Don't bother with

syntax-begin-function.

Fixes: debbugs:16247

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index df00ef0bacf8a3773dc851dd83cf3760d3bffe19..c76eaceba7893b5185a1759d81849ee5d9c4986f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * emacs-lisp/lisp-mode.el (lisp-mode-variables): Don't bother with
+       syntax-begin-function (bug#16247).
+
 2014-01-03  Chong Yidong  <cyd@gnu.org>
 
        * emacs-lisp/nadvice.el (advice--make-docstring): Change args.

diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index 8431dc21b1542d3d0b8f82374f395e62c5fd3d0e..1e76ebb1873e3dd719f3c9df5514838c8f554dbf 100644 (file)
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -460,7 +460,7 @@ font-lock keywords will not be case sensitive."
   (setq-local comment-use-global-state t)
   (setq-local imenu-generic-expression lisp-imenu-generic-expression)
   (setq-local multibyte-syntax-as-symbol t)
-  (setq-local syntax-begin-function 'beginning-of-defun)
+  ;; (setq-local syntax-begin-function 'beginning-of-defun)  ;;Bug#16247.
   (setq font-lock-defaults
        `(,(if elisp '(lisp-el-font-lock-keywords
                        lisp-el-font-lock-keywords-1