aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/woman.el4
2 files changed, 5 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 75004181ee1..73db20178ad 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12012-11-24 Chong Yidong <cyd@gnu.org> 12012-11-24 Chong Yidong <cyd@gnu.org>
2 2
3 * woman.el (woman-default-faces, woman-monochrome-faces): Mark as
4 obsolete.
5
3 * custom.el (custom-theme-set-variables): Use a topological sort 6 * custom.el (custom-theme-set-variables): Use a topological sort
4 for ordering by custom dependencies (Bug#12952). 7 for ordering by custom dependencies (Bug#12952).
5 (custom--sort-vars, custom--sort-vars-1): New functions. 8 (custom--sort-vars, custom--sort-vars-1): New functions.
diff --git a/lisp/woman.el b/lisp/woman.el
index 1410a8971ad..c7f9b08d404 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -949,6 +949,7 @@ or different fonts."
949 949
950(defun woman-default-faces () 950(defun woman-default-faces ()
951 "Set foreground colors of italic and bold faces to their default values." 951 "Set foreground colors of italic and bold faces to their default values."
952 (declare (obsolete choose-completion-guess-base-position "23.2"))
952 (interactive) 953 (interactive)
953 (face-spec-set 'woman-italic (face-user-default-spec 'woman-italic)) 954 (face-spec-set 'woman-italic (face-user-default-spec 'woman-italic))
954 (face-spec-set 'woman-bold (face-user-default-spec 'woman-bold))) 955 (face-spec-set 'woman-bold (face-user-default-spec 'woman-bold)))
@@ -956,6 +957,7 @@ or different fonts."
956(defun woman-monochrome-faces () 957(defun woman-monochrome-faces ()
957 "Set foreground colors of italic and bold faces to that of the default face. 958 "Set foreground colors of italic and bold faces to that of the default face.
958This is usually either black or white." 959This is usually either black or white."
960 (declare (obsolete choose-completion-guess-base-position "23.2"))
959 (interactive) 961 (interactive)
960 (set-face-foreground 'woman-italic 'unspecified) 962 (set-face-foreground 'woman-italic 'unspecified)
961 (set-face-foreground 'woman-bold 'unspecified)) 963 (set-face-foreground 'woman-bold 'unspecified))
@@ -1828,8 +1830,6 @@ Argument EVENT is the invoking mouse event."
1828 ["Use Full Frame Width" woman-toggle-fill-frame 1830 ["Use Full Frame Width" woman-toggle-fill-frame
1829 :active t :style toggle :selected woman-fill-frame] 1831 :active t :style toggle :selected woman-fill-frame]
1830 ["Reformat Last Man Page" woman-reformat-last-file t] 1832 ["Reformat Last Man Page" woman-reformat-last-file t]
1831 ["Use Monochrome Main Faces" woman-monochrome-faces t]
1832 ["Use Default Main Faces" woman-default-faces t]
1833 ["Make Contents Menu" (woman-imenu t) (not woman-imenu-done)] 1833 ["Make Contents Menu" (woman-imenu t) (not woman-imenu-done)]
1834 "--" 1834 "--"
1835 ["Describe (Wo)Man Mode" describe-mode t] 1835 ["Describe (Wo)Man Mode" describe-mode t]