branch: master commit c42c9ec79bc4ee7337439a47bd0842a15b3d5f2d Author: Michael Heerdegen <michael_heerde...@web.de> Commit: Michael Heerdegen <michael_heerde...@web.de>
Work around more manifestations of Emacs bug #24542 Not only the symbol `@' but all symbols with names of the form "@+" cause trouble. We need to avoid to call `scan-sexps' from the beginning of any of these symbols. --- packages/el-search/el-search.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/el-search/el-search.el b/packages/el-search/el-search.el index 86214ae..085976d 100644 --- a/packages/el-search/el-search.el +++ b/packages/el-search/el-search.el @@ -7,7 +7,7 @@ ;; Created: 29 Jul 2015 ;; Keywords: lisp ;; Compatibility: GNU Emacs 25 -;; Version: 1.2.2 +;; Version: 1.2.3 ;; Package-Requires: ((emacs "25") (stream "2.2.3")) @@ -604,8 +604,8 @@ matches the (only) argument (that should be a string)." ;; point instead. (when read (setq expression (save-excursion (read (current-buffer))))) (cond - ((eq '@ expression) ;bug#24542 - (forward-char)) + ((and (symbolp expression)) (string-match-p "\\`@+\\'" (symbol-name expression)) ;bug#24542 + (forward-char (length (symbol-name expression)))) ((or (null expression) (equal [] expression) (not (or (listp expression) (vectorp expression))))