From: Leo Liu <sdl.web@gmail.com>
Date: Thu, 14 Mar 2013 11:48:05 +0000 (+0800)
Subject: * thingatpt.el (end-of-sexp): Fix bug#13952.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1943^2~36
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=00094c26f3140609f43276673908530fe3390cfc;p=emacs.git

* thingatpt.el (end-of-sexp): Fix bug#13952.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b853399e462..85d0d5e9c39 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-14  Leo Liu  <sdl.web@gmail.com>
+
+	* thingatpt.el (end-of-sexp): Fix bug#13952.
+
 2013-03-11  Glenn Morris  <rgm@gnu.org>
 
 	* Version 24.3 released.
diff --git a/lisp/thingatpt.el b/lisp/thingatpt.el
index e1e3e8e1e46..4fd9e2e83b2 100644
--- a/lisp/thingatpt.el
+++ b/lisp/thingatpt.el
@@ -182,7 +182,7 @@ The bounds of THING are determined by `bounds-of-thing-at-point'."
 (defun end-of-sexp ()
   "Move point to the end of the current sexp.
 \[This is an internal function.]"
-  (let ((char-syntax (char-syntax (char-after))))
+  (let ((char-syntax (and (char-after) (char-syntax (char-after)))))
     (if (or (eq char-syntax ?\))
 	    (and (eq char-syntax ?\") (in-string-p)))
 	(forward-char 1)