[Emacs-diffs] Changes to emacs/lisp/faces.el

[Juri Linkov]

Index: emacs/lisp/faces.el
diff -c emacs/lisp/faces.el:1.333 emacs/lisp/faces.el:1.334
*** emacs/lisp/faces.el:1.333   Sat Aug  6 22:13:42 2005
--- emacs/lisp/faces.el Mon Aug 22 19:53:05 2005
***************
*** 770,776 ****
    (set-face-attribute face frame :stipple (or stipple 'unspecified)))
  
  
! (defun set-face-underline (face underline &optional frame)
    "Specify whether face FACE is underlined.
  UNDERLINE nil means FACE explicitly doesn't underline.
  UNDERLINE non-nil means FACE explicitly does underlining
--- 770,776 ----
    (set-face-attribute face frame :stipple (or stipple 'unspecified)))
  
  
! (defun set-face-underline-p (face underline-p &optional frame)
    "Specify whether face FACE is underlined.
  UNDERLINE nil means FACE explicitly doesn't underline.
  UNDERLINE non-nil means FACE explicitly does underlining
***************
*** 781,800 ****
    (interactive
     (let ((list (read-face-and-attribute :underline)))
       (list (car list) (eq (car (cdr list)) t))))
-   (set-face-attribute face frame :underline underline))
- 
- 
- (defun set-face-underline-p (face underline-p &optional frame)
-   "Specify whether face FACE is underlined.
- UNDERLINE-P nil means FACE explicitly doesn't underline.
- UNDERLINE-P non-nil means FACE explicitly does underlining.
- FRAME nil or not specified means change face on all frames.
- Use `set-face-attribute' to ``unspecify'' underlining."
-   (interactive
-    (let ((list (read-face-and-attribute :underline)))
-      (list (car list) (eq (car (cdr list)) t))))
    (set-face-attribute face frame :underline underline-p))
  
  
  (defun set-face-inverse-video-p (face inverse-video-p &optional frame)
    "Specify whether face FACE is in inverse video.
--- 781,791 ----
    (interactive
     (let ((list (read-face-and-attribute :underline)))
       (list (car list) (eq (car (cdr list)) t))))
    (set-face-attribute face frame :underline underline-p))
  
+ (define-obsolete-function-alias 'set-face-underline
+                                 'set-face-underline-p "22.1")
+ 
  
  (defun set-face-inverse-video-p (face inverse-video-p &optional frame)
    "Specify whether face FACE is in inverse video.
***************
*** 1318,1324 ****
              (dolist (a attrs)
                (let ((attr (face-attribute f (car a) frame)))
                  (insert (make-string (- max-width (length (cdr a))) ?\s)
!                         (cdr a) ": " (format "%s" attr) "\n")))))
          (terpri)))
        (print-help-return-message))))
  
--- 1309,1322 ----
              (dolist (a attrs)
                (let ((attr (face-attribute f (car a) frame)))
                  (insert (make-string (- max-width (length (cdr a))) ?\s)
!                         (cdr a) ": " (format "%s" attr))
!                 (if (and (eq (car a) :inherit)
!                          (not (eq attr 'unspecified)))
!                     ;; Make a hyperlink to the parent face.
!                     (save-excursion
!                       (re-search-backward ": \\([^:]+\\)" nil t)
!                       (help-xref-button 1 'help-face attr)))
!                 (insert "\n")))))
          (terpri)))
        (print-help-return-message))))