From: Stefan Monnier Date: Fri, 4 May 2001 17:56:03 +0000 (+0000) Subject: (diff-nonexistent-face, diff-font-lock-keywords): X-Git-Tag: emacs-pretest-21.0.103~43 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7dfb000f42294f329cf85be99b9420f68ab0f6d9;p=emacs.git (diff-nonexistent-face, diff-font-lock-keywords): Typo `nonexistant' -> `nonexistent'. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 30b52da45b5..dae87dbd851 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,11 +1,16 @@ +2001-05-04 Stefan Monnier + + * diff-mode.el (diff-nonexistent-face, diff-font-lock-keywords): + Typo `nonexistant' -> `nonexistent'. + 2001-05-04 Martin Stjernholm - * cc-cmds.el (c-electric-delete, c-electric-delete-forward): Split - `c-electric-delete' into two functions where + * cc-cmds.el (c-electric-delete, c-electric-delete-forward): + Split `c-electric-delete' into two functions where `c-electric-delete-forward' always deletes forward and `c-electric-delete' only contains the code necessary for XEmacs to choose between backward and forward deletion. - + * cc-mode.el: `c-electric-delete-forward' is now bound to C-d to get the electric behavior on that key too. (c-fill-paragraph): Fixed bogus direct use of diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el index 894a221539d..f83b5f78d46 100644 --- a/lisp/diff-mode.el +++ b/lisp/diff-mode.el @@ -249,11 +249,11 @@ when editing big diffs)." :group 'diff-mode) (defvar diff-context-face 'diff-context-face) -(defface diff-nonexistant-face +(defface diff-nonexistent-face '((t (:inherit diff-file-header-face))) - "`diff-mode' face used to highlight nonexistant files in recursive diffs." + "`diff-mode' face used to highlight nonexistent files in recursive diffs." :group 'diff-mode) -(defvar diff-nonexistant-face 'diff-nonexistant-face) +(defvar diff-nonexistent-face 'diff-nonexistent-face) (defvar diff-font-lock-keywords '(("^\\(@@ -[0-9,]+ \\+[0-9,]+ @@\\)\\(.*\\)$" ;unified @@ -271,7 +271,7 @@ when editing big diffs)." ("^[+>].*\n" . diff-added-face) ("^[-<].*\n" . diff-removed-face) ("^Index: \\(.+\\).*\n" (0 diff-header-face) (1 diff-index-face prepend)) - ("^Only in .*\n" . diff-nonexistant-face) + ("^Only in .*\n" . diff-nonexistent-face) ("^#.*" . font-lock-string-face) ("^[^-=+*!<>].*\n" . diff-context-face)))