[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 7be8d8a 2/4: Merge branch 'master' of git.savannah.gnu.org:/srv/g
From: |
Eli Zaretskii |
Subject: |
master 7be8d8a 2/4: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs |
Date: |
Mon, 9 Nov 2020 09:57:15 -0500 (EST) |
branch: master
commit 7be8d8a801d0e4ec38b8ec79ef29d87b5fdf35b7
Merge: a5867dd e8f5657
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
---
lisp/emacs-lisp/lisp-mode.el | 7 +++++--
test/lisp/custom-tests.el | 9 +++++++++
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index 2689922..daf4967 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -178,13 +178,16 @@
(defun lisp--match-hidden-arg (limit)
(let ((res nil))
+ (forward-line 0)
(while
- (let ((ppss (parse-partial-sexp (line-beginning-position)
+ (let ((ppss (parse-partial-sexp (point)
(line-end-position)
-1)))
(skip-syntax-forward " )")
(if (or (>= (car ppss) 0)
- (looking-at ";\\|$"))
+ (eolp)
+ (looking-at ";")
+ (nth 8 (syntax-ppss))) ;Within a string or comment.
(progn
(forward-line 1)
(< (point) limit))
diff --git a/test/lisp/custom-tests.el b/test/lisp/custom-tests.el
index a1451cf..7691f16 100644
--- a/test/lisp/custom-tests.el
+++ b/test/lisp/custom-tests.el
@@ -156,4 +156,13 @@
(load custom-test-admin-cus-test)
(should (null (cus-test-opts t))))
+(ert-deftest custom-test-enable-theme-keeps-settings ()
+ "Test that enabling a theme doesn't change its settings."
+ (let* ((custom-theme-load-path `(,(ert-resource-directory)))
+ settings)
+ (load-theme 'custom--test 'no-confirm 'no-enable)
+ (setq settings (get 'custom--test 'theme-settings))
+ (enable-theme 'custom--test)
+ (should (equal settings (get 'custom--test 'theme-settings)))))
+
;;; custom-tests.el ends here