aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog12
-rw-r--r--lisp/faces.el2
2 files changed, 9 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 911b7cf8704..5f0ef4e3e65 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,4 +1,8 @@
12008-05-18 David Hull <david@snap.com> (tiny change) 12008-05-19 Juanma Barranquero <lekktu@gmail.com>
2
3 * faces.el (font-weight-table): Fix typo in docstring.
4
52008-05-18 David Hull <david@snap.com> (tiny change)
2 6
3 * vc-hg.el (vc-hg-annotate-re): Recognize the output of --follow. 7 * vc-hg.el (vc-hg-annotate-re): Recognize the output of --follow.
4 (vc-hg-annotate-command): Allow white space before version number. 8 (vc-hg-annotate-command): Allow white space before version number.
@@ -81,7 +85,7 @@
81 85
82 * vc.el (vc-default-status-printer) 86 * vc.el (vc-default-status-printer)
83 (vc-default-prettify-state-info): Enhance the state prettyprinter 87 (vc-default-prettify-state-info): Enhance the state prettyprinter
84 to deall better with unknown states and indirect through it when 88 to deal better with unknown states and indirect through it when
85 painting vc-dir buffers. 89 painting vc-dir buffers.
86 90
872008-05-16 John Paul Wallington <jpw@pobox.com> 912008-05-16 John Paul Wallington <jpw@pobox.com>
@@ -92,8 +96,8 @@
92 96
932008-05-16 Michael Albinus <michael.albinus@gmx.de> 972008-05-16 Michael Albinus <michael.albinus@gmx.de>
94 98
95 * net/tramp.el (tramp-handle-write-region): Fix check for short 99 * net/tramp.el (tramp-handle-write-region): Fix check for short track.
96 track. Reported by Glenn Morris <rgm@gnu.org>. 100 Reported by Glenn Morris <rgm@gnu.org>.
97 101
982008-05-16 Eric S. Raymond <esr@snark.thyrsus.com> 1022008-05-16 Eric S. Raymond <esr@snark.thyrsus.com>
99 103
diff --git a/lisp/faces.el b/lisp/faces.el
index 2b03572c670..0da556befc8 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -114,7 +114,7 @@ REGISTRY, ALTERNATIVE1, ALTERNATIVE2, and etc."
114 (ultra-bold 210 ultrabold black)) 114 (ultra-bold 210 ultrabold black))
115 "Alist of font weight symbols vs the corresponding numeric values. 115 "Alist of font weight symbols vs the corresponding numeric values.
116Each element has the form: 116Each element has the form:
117 \(SYMBOLIC-VALUE NUMERIC-VALUE ALISE-SYMBOL ...) 117 \(SYMBOLIC-VALUE NUMERIC-VALUE ALIAS-SYMBOL ...)
118") 118")
119 119
120(defconst font-slant-table 120(defconst font-slant-table