summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/subr.el17
1 files changed, 10 insertions, 7 deletions
diff --git a/lisp/subr.el b/lisp/subr.el
index 252154c7b0f..4046b915368 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1969,13 +1969,16 @@ If there is no plausible default, return nil."
(re-search-forward "\\(\\sw\\|\\s_\\)+"
(save-excursion (end-of-line) (point))
t))
- (progn (goto-char (match-end 0))
- (buffer-substring-no-properties
- (point)
- (progn (forward-sexp -1)
- (while (looking-at "\\s'")
- (forward-char 1))
- (point))))
+ (progn
+ (goto-char (match-end 0))
+ (condition-case nil
+ (buffer-substring-no-properties
+ (point)
+ (progn (forward-sexp -1)
+ (while (looking-at "\\s'")
+ (forward-char 1))
+ (point)))
+ (error nil)))
nil)))
(defmacro with-syntax-table (table &rest body)