aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-11-21 00:27:13 -0800
committerGlenn Morris2012-11-21 00:27:13 -0800
commit3ca2f1bf25b46877497c34c70b36dd511678e29b (patch)
tree1c2954680cb86932d31b24aeec4491ab86628ea6
parent6ef2e5ef5278a807132b78c42de402925b20bfb3 (diff)
downloademacs-3ca2f1bf25b46877497c34c70b36dd511678e29b.tar.gz
emacs-3ca2f1bf25b46877497c34c70b36dd511678e29b.zip
Remove -p suffix from set-face-* functions
* lisp/faces.el (set-face-inverse-video, set-face-bold, set-face-italic): Remove -p suffix from names, for consistency with other set-face-*. (set-face-inverse-video): Fix interactive spec. * lisp/play/gamegrid.el (gamegrid-make-mono-tty-face): * lisp/textmodes/table.el (table--update-cell-face): Use set-face-inverse-video rather than now obsolete alias. * doc/lispref/display.texi (Attribute Functions): Update for set-face-* name changes.
-rw-r--r--doc/lispref/ChangeLog3
-rw-r--r--doc/lispref/display.texi6
-rw-r--r--lisp/ChangeLog9
-rw-r--r--lisp/faces.el17
-rw-r--r--lisp/play/gamegrid.el2
-rw-r--r--lisp/textmodes/table.el2
6 files changed, 27 insertions, 12 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index db896984c86..9dee3797bdd 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,5 +1,8 @@
12012-11-21 Glenn Morris <rgm@gnu.org> 12012-11-21 Glenn Morris <rgm@gnu.org>
2 2
3 * display.texi (Attribute Functions):
4 Update for set-face-* name changes.
5
3 * debugging.texi (Profiling): New section. 6 * debugging.texi (Profiling): New section.
4 (Debugging): Mention profiling in the introduction. 7 (Debugging): Mention profiling in the introduction.
5 * tips.texi (Compilation Tips): Move profiling to separate section. 8 * tips.texi (Compilation Tips): Move profiling to separate section.
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 475a9550f99..0932e8ceac2 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -2425,12 +2425,12 @@ This sets the @code{:stipple} attribute of @var{face} to
2425This sets the @code{:font} attribute of @var{face} to @var{font}. 2425This sets the @code{:font} attribute of @var{face} to @var{font}.
2426@end deffn 2426@end deffn
2427 2427
2428@defun set-face-bold-p face bold-p &optional frame 2428@defun set-face-bold face bold-p &optional frame
2429This sets the @code{:weight} attribute of @var{face} to @var{normal} 2429This sets the @code{:weight} attribute of @var{face} to @var{normal}
2430if @var{bold-p} is @code{nil}, and to @var{bold} otherwise. 2430if @var{bold-p} is @code{nil}, and to @var{bold} otherwise.
2431@end defun 2431@end defun
2432 2432
2433@defun set-face-italic-p face italic-p &optional frame 2433@defun set-face-italic face italic-p &optional frame
2434This sets the @code{:slant} attribute of @var{face} to @var{normal} if 2434This sets the @code{:slant} attribute of @var{face} to @var{normal} if
2435@var{italic-p} is @code{nil}, and to @var{italic} otherwise. 2435@var{italic-p} is @code{nil}, and to @var{italic} otherwise.
2436@end defun 2436@end defun
@@ -2440,7 +2440,7 @@ This sets the @code{:underline} attribute of @var{face} to
2440@var{underline}. 2440@var{underline}.
2441@end defun 2441@end defun
2442 2442
2443@defun set-face-inverse-video-p face inverse-video-p &optional frame 2443@defun set-face-inverse-video face inverse-video-p &optional frame
2444This sets the @code{:inverse-video} attribute of @var{face} to 2444This sets the @code{:inverse-video} attribute of @var{face} to
2445@var{inverse-video-p}. 2445@var{inverse-video-p}.
2446@end defun 2446@end defun
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 05f86ca22c0..19268a4f860 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
12012-11-21 Glenn Morris <rgm@gnu.org>
2
3 * faces.el (set-face-inverse-video, set-face-bold, set-face-italic):
4 Remove -p suffix from names, for consistency with other set-face-*.
5 (set-face-inverse-video): Fix interactive spec.
6 * play/gamegrid.el (gamegrid-make-mono-tty-face):
7 * textmodes/table.el (table--update-cell-face):
8 Use set-face-inverse-video rather than now obsolete alias.
9
12012-11-21 Eli Zaretskii <eliz@gnu.org> 102012-11-21 Eli Zaretskii <eliz@gnu.org>
2 11
3 * simple.el (line-move): Don't call line-move-partial if 12 * simple.el (line-move): Don't call line-move-partial if
diff --git a/lisp/faces.el b/lisp/faces.el
index 9e0ca962499..cb3470c167d 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -862,7 +862,7 @@ Use `set-face-attribute' to ``unspecify'' underlining."
862 'set-face-underline "24.3") 862 'set-face-underline "24.3")
863 863
864 864
865(defun set-face-inverse-video-p (face inverse-video-p &optional frame) 865(defun set-face-inverse-video (face inverse-video-p &optional frame)
866 "Specify whether face FACE is in inverse video. 866 "Specify whether face FACE is in inverse video.
867INVERSE-VIDEO-P non-nil means FACE displays explicitly in inverse video. 867INVERSE-VIDEO-P non-nil means FACE displays explicitly in inverse video.
868INVERSE-VIDEO-P nil means FACE explicitly is not in inverse video. 868INVERSE-VIDEO-P nil means FACE explicitly is not in inverse video.
@@ -870,14 +870,13 @@ FRAME nil or not specified means change face on all frames.
870Use `set-face-attribute' to ``unspecify'' the inverse video attribute." 870Use `set-face-attribute' to ``unspecify'' the inverse video attribute."
871 (interactive 871 (interactive
872 (let ((list (read-face-and-attribute :inverse-video))) 872 (let ((list (read-face-and-attribute :inverse-video)))
873 (list (car list) (eq (car (cdr list)) t)))) 873 (list (car list) (if (cadr list) t))))
874 (set-face-attribute face frame :inverse-video inverse-video-p)) 874 (set-face-attribute face frame :inverse-video inverse-video-p))
875 875
876(define-obsolete-function-alias 'set-face-inverse-video-p
877 'set-face-inverse-video "24.4")
876 878
877;; The -p suffix is a hostage to fortune. What if we want to extend 879(defun set-face-bold (face bold-p &optional frame)
878;; this to allow more than boolean options? Exactly this happened
879;; to set-face-underline-p.
880(defun set-face-bold-p (face bold-p &optional frame)
881 "Specify whether face FACE is bold. 880 "Specify whether face FACE is bold.
882BOLD-P non-nil means FACE should explicitly display bold. 881BOLD-P non-nil means FACE should explicitly display bold.
883BOLD-P nil means FACE should explicitly display non-bold. 882BOLD-P nil means FACE should explicitly display non-bold.
@@ -887,8 +886,10 @@ Use `set-face-attribute' or `modify-face' for finer control."
887 (make-face-unbold face frame) 886 (make-face-unbold face frame)
888 (make-face-bold face frame))) 887 (make-face-bold face frame)))
889 888
889(define-obsolete-function-alias 'set-face-bold-p 'set-face-bold "24.4")
890 890
891(defun set-face-italic-p (face italic-p &optional frame) 891
892(defun set-face-italic (face italic-p &optional frame)
892 "Specify whether face FACE is italic. 893 "Specify whether face FACE is italic.
893ITALIC-P non-nil means FACE should explicitly display italic. 894ITALIC-P non-nil means FACE should explicitly display italic.
894ITALIC-P nil means FACE should explicitly display non-italic. 895ITALIC-P nil means FACE should explicitly display non-italic.
@@ -898,6 +899,8 @@ Use `set-face-attribute' or `modify-face' for finer control."
898 (make-face-unitalic face frame) 899 (make-face-unitalic face frame)
899 (make-face-italic face frame))) 900 (make-face-italic face frame)))
900 901
902(define-obsolete-function-alias 'set-face-italic-p 'set-face-italic "24.4")
903
901 904
902(defalias 'set-face-background-pixmap 'set-face-stipple) 905(defalias 'set-face-background-pixmap 'set-face-stipple)
903 906
diff --git a/lisp/play/gamegrid.el b/lisp/play/gamegrid.el
index a3ea4af4651..8af877c7843 100644
--- a/lisp/play/gamegrid.el
+++ b/lisp/play/gamegrid.el
@@ -175,7 +175,7 @@ static unsigned char gamegrid_bits[] = {
175 175
176(defun gamegrid-make-mono-tty-face () 176(defun gamegrid-make-mono-tty-face ()
177 (let ((face (make-face 'gamegrid-mono-tty-face))) 177 (let ((face (make-face 'gamegrid-mono-tty-face)))
178 (set-face-inverse-video-p face t) 178 (set-face-inverse-video face t)
179 face)) 179 face))
180 180
181(defun gamegrid-make-color-tty-face (color) 181(defun gamegrid-make-color-tty-face (color)
diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el
index 3d9f88a43c9..6db15b7ec2a 100644
--- a/lisp/textmodes/table.el
+++ b/lisp/textmodes/table.el
@@ -5210,7 +5210,7 @@ instead of the current buffer and returns the OBJECT."
5210 "Update cell face according to the current mode." 5210 "Update cell face according to the current mode."
5211 (if (featurep 'xemacs) 5211 (if (featurep 'xemacs)
5212 (set-face-property 'table-cell 'underline table-fixed-width-mode) 5212 (set-face-property 'table-cell 'underline table-fixed-width-mode)
5213 (set-face-inverse-video-p 'table-cell table-fixed-width-mode))) 5213 (set-face-inverse-video 'table-cell table-fixed-width-mode)))
5214 5214
5215(table--update-cell-face) 5215(table--update-cell-face)
5216 5216