procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Mark some diff tests as failing in nonascii directories

Browse source 
* test/lisp/vc/diff-mode-tests.el (diff-mode-test-font-lock)
(diff-mode-test-font-lock-syntax-one-line):
Expect failure in non-ascii directories.

; * lisp/vc/diff-mode.el (diff-hunk-file-names): Comment.
This commit is contained in:
Glenn Morris 2020-09-12 19:44:06 -07:00
parent 854855ec68
commit 5e7733694e
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/vc/diff-mode.el
View file

@ -931,8 +931,12 @@ If the OLD prefix arg is passed, tell the file NAME of the old file."
(progn (diff-hunk-prev) (point))
(error (point-min)))))
(header-files
;; handle filenames with spaces;
;; handle file names with spaces;
;; cf. diff-font-lock-keywords / diff-file-header
;; FIXME if there are nonascii characters in the file names,
;; GNU diff displays them as octal escapes.
;; This function should undo that, so as to return file names
;; that are usable in Emacs.
(if (looking-at "[-*][-*][-*] \\([^\t\n]+\\).*\n[-+][-+][-+] \\([^\t\n]+\\)")
(list (if old (match-string 1) (match-string 2))
(if old (match-string 2) (match-string 1)))

9
test/lisp/vc/diff-mode-tests.el
View file

@ -206,6 +206,11 @@ youthfulness
(ert-deftest diff-mode-test-font-lock ()
"Check font-locking of diff hunks."
;; See comments in diff-hunk-file-names about nonascii.
;; In such cases, the diff-font-lock-syntax portion of this fails.
:expected-result (if (string-match-p "[[:nonascii:]]"
diff-mode-tests--datadir)
:failed :passed)
(skip-unless (executable-find shell-file-name))
(skip-unless (executable-find diff-command))
(let ((default-directory diff-mode-tests--datadir)
@ -244,6 +249,7 @@ youthfulness
111 124 (face diff-context)
124 127 (face diff-context))))
;; Test diff-font-lock-syntax.
(should (equal (mapcar (lambda (o)
(list (- (overlay-start o) diff-beg)
(- (overlay-end o) diff-beg)
@ -267,6 +273,9 @@ youthfulness
(ert-deftest diff-mode-test-font-lock-syntax-one-line ()
"Check diff syntax highlighting for one line with no newline at end."
:expected-result (if (string-match-p "[[:nonascii:]]"
diff-mode-tests--datadir)
:failed :passed)
(skip-unless (executable-find shell-file-name))
(skip-unless (executable-find diff-command))
(let ((default-directory diff-mode-tests--datadir)