summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/emacs-lisp/lisp-mode.el3
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8a3d790509c..fdaf4f1d9e2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-01 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * emacs-lisp/lisp-mode.el (lisp--match-hidden-arg): Only highlight past
+ the last consecutive closing paren (bug#17345).
+
2014-04-30 Reuben Thomas <rrt@sc3d.org>
* dired.el (dired-mode): make terminology for eXpunge command
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index 7e00d0b2cf9..690aa3d7460 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -163,8 +163,9 @@ It has `lisp-mode-abbrev-table' as its parent."
(let ((ppss (parse-partial-sexp (line-beginning-position)
(line-end-position)
-1)))
+ (skip-syntax-forward " )")
(if (or (>= (car ppss) 0)
- (looking-at "[]) \t]*\\(;\\|$\\)"))
+ (looking-at ";\\|$"))
(progn
(forward-line 1)
(< (point) limit))