mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-27 02:10:52 -08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs

Browse source
This commit is contained in:
Eli Zaretskii 2020-11-07 17:26:45 +02:00
commit 7be8d8a801
2 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lisp/emacs-lisp/lisp-mode.el
View file

@ -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))

9
test/lisp/custom-tests.el
View file

@ -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