diff options
| author | Paul Eggert | 2017-09-25 11:16:05 -0700 |
|---|---|---|
| committer | Paul Eggert | 2017-09-25 11:16:05 -0700 |
| commit | 1bb8ac0c02d91c64ae14e37680fc90ff899da2b4 (patch) | |
| tree | f8a36a8338b59b5ffeaca8b3049c10e385ddf611 /test/src | |
| parent | 00a86a558ed3cde443b41c0e24934f61dea99236 (diff) | |
| parent | 48d39c39e822a792f7c20254c3d9f94aa298be31 (diff) | |
| download | emacs-1bb8ac0c02d91c64ae14e37680fc90ff899da2b4.tar.gz emacs-1bb8ac0c02d91c64ae14e37680fc90ff899da2b4.zip | |
Merge from origin/emacs-26
48d39c39e8 Search for Syntax section when viewing MDN
9d101376b4 Allow smerge-keep-current to work for empty hunks
13aba24add Call vc-setup-buffer in vc-git-log-{in,out}going
1d599df5e0 Fix last change to textmodes/page-ext.el
a726e09a9a * test/src/lcms-tests.el (lcms-cri-cam02-ucs): Skip if lcm...
Diffstat (limited to 'test/src')
| -rw-r--r-- | test/src/lcms-tests.el | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/test/src/lcms-tests.el b/test/src/lcms-tests.el index 962902eb100..3d0942c8d15 100644 --- a/test/src/lcms-tests.el +++ b/test/src/lcms-tests.el | |||
| @@ -51,6 +51,7 @@ B is considered the exact value." | |||
| 51 | 51 | ||
| 52 | (ert-deftest lcms-cri-cam02-ucs () | 52 | (ert-deftest lcms-cri-cam02-ucs () |
| 53 | "Test use of `lcms-cam02-ucs'." | 53 | "Test use of `lcms-cam02-ucs'." |
| 54 | (skip-unless (featurep 'lcms2)) | ||
| 54 | (should-error (lcms-cam02-ucs '(0 0 0) '(0 0 0) "error")) | 55 | (should-error (lcms-cam02-ucs '(0 0 0) '(0 0 0) "error")) |
| 55 | (should-error (lcms-cam02-ucs '(0 0 0) 'error)) | 56 | (should-error (lcms-cam02-ucs '(0 0 0) 'error)) |
| 56 | (should-not | 57 | (should-not |