aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2001-05-04 17:56:03 +0000
committerStefan Monnier2001-05-04 17:56:03 +0000
commit7dfb000f42294f329cf85be99b9420f68ab0f6d9 (patch)
treead3ba7a8792388a625666e0f8b934414853babb3
parente8918aee02dbcf5f88b1e05dec33932e72acc20f (diff)
downloademacs-7dfb000f42294f329cf85be99b9420f68ab0f6d9.tar.gz
emacs-7dfb000f42294f329cf85be99b9420f68ab0f6d9.zip
(diff-nonexistent-face, diff-font-lock-keywords):
Typo `nonexistant' -> `nonexistent'.
-rw-r--r--lisp/ChangeLog11
-rw-r--r--lisp/diff-mode.el8
2 files changed, 12 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 30b52da45b5..dae87dbd851 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,11 +1,16 @@
12001-05-04 Stefan Monnier <monnier@cs.yale.edu>
2
3 * diff-mode.el (diff-nonexistent-face, diff-font-lock-keywords):
4 Typo `nonexistant' -> `nonexistent'.
5
12001-05-04 Martin Stjernholm <bug-cc-mode@gnu.org> 62001-05-04 Martin Stjernholm <bug-cc-mode@gnu.org>
2 7
3 * cc-cmds.el (c-electric-delete, c-electric-delete-forward): Split 8 * cc-cmds.el (c-electric-delete, c-electric-delete-forward):
4 `c-electric-delete' into two functions where 9 Split `c-electric-delete' into two functions where
5 `c-electric-delete-forward' always deletes forward and 10 `c-electric-delete-forward' always deletes forward and
6 `c-electric-delete' only contains the code necessary for XEmacs to 11 `c-electric-delete' only contains the code necessary for XEmacs to
7 choose between backward and forward deletion. 12 choose between backward and forward deletion.
8 13
9 * cc-mode.el: `c-electric-delete-forward' is now bound to C-d to 14 * cc-mode.el: `c-electric-delete-forward' is now bound to C-d to
10 get the electric behavior on that key too. 15 get the electric behavior on that key too.
11 (c-fill-paragraph): Fixed bogus direct use of 16 (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)."
249 :group 'diff-mode) 249 :group 'diff-mode)
250(defvar diff-context-face 'diff-context-face) 250(defvar diff-context-face 'diff-context-face)
251 251
252(defface diff-nonexistant-face 252(defface diff-nonexistent-face
253 '((t (:inherit diff-file-header-face))) 253 '((t (:inherit diff-file-header-face)))
254 "`diff-mode' face used to highlight nonexistant files in recursive diffs." 254 "`diff-mode' face used to highlight nonexistent files in recursive diffs."
255 :group 'diff-mode) 255 :group 'diff-mode)
256(defvar diff-nonexistant-face 'diff-nonexistant-face) 256(defvar diff-nonexistent-face 'diff-nonexistent-face)
257 257
258(defvar diff-font-lock-keywords 258(defvar diff-font-lock-keywords
259 '(("^\\(@@ -[0-9,]+ \\+[0-9,]+ @@\\)\\(.*\\)$" ;unified 259 '(("^\\(@@ -[0-9,]+ \\+[0-9,]+ @@\\)\\(.*\\)$" ;unified
@@ -271,7 +271,7 @@ when editing big diffs)."
271 ("^[+>].*\n" . diff-added-face) 271 ("^[+>].*\n" . diff-added-face)
272 ("^[-<].*\n" . diff-removed-face) 272 ("^[-<].*\n" . diff-removed-face)
273 ("^Index: \\(.+\\).*\n" (0 diff-header-face) (1 diff-index-face prepend)) 273 ("^Index: \\(.+\\).*\n" (0 diff-header-face) (1 diff-index-face prepend))
274 ("^Only in .*\n" . diff-nonexistant-face) 274 ("^Only in .*\n" . diff-nonexistent-face)
275 ("^#.*" . font-lock-string-face) 275 ("^#.*" . font-lock-string-face)
276 ("^[^-=+*!<>].*\n" . diff-context-face))) 276 ("^[^-=+*!<>].*\n" . diff-context-face)))
277 277