*** empty log message ***

[bpt/emacs.git] / lisp / faces.el

diff --git a/lisp/faces.el b/lisp/faces.el
index 83b69ca..88b0c54 100644 (file)
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1194,7 +1194,7 @@ arg, prompt for a regular expression."
       (error "No faces matching \"%s\"" regexp))
     (setq max-length (1+ max-length)
          line-format (format "%%-%ds" max-length))
-    (with-output-to-temp-buffer "*Faces*"
+    (with-help-window "*Faces*"
       (save-excursion
        (set-buffer standard-output)
        (setq truncate-lines t)
@@ -1235,8 +1235,7 @@ arg, prompt for a regular expression."
            (while (not (eobp))
              (insert-char ?\s max-length)
              (forward-line 1))))
-       (goto-char (point-min)))
-      (print-help-return-message))
+       (goto-char (point-min))))
     ;; If the *Faces* buffer appears in a different frame,
     ;; copy all the face definitions from FRAME,
     ;; so that the display will reflect the frame that was selected.
@@ -1281,7 +1280,7 @@ If FRAME is omitted or nil, use the selected frame."
       (setq face 'default))
     (if (not (listp face))
        (setq face (list face)))
-    (with-output-to-temp-buffer (help-buffer)
+    (with-help-window (help-buffer)
       (save-excursion
        (set-buffer standard-output)
        (dolist (f face)
@@ -1328,8 +1327,7 @@ If FRAME is omitted or nil, use the selected frame."
                        (re-search-backward ": \\([^:]+\\)" nil t)
                        (help-xref-button 1 'help-face attr)))
                  (insert "\n")))))
-         (terpri)))
-      (print-help-return-message))))
+         (terpri))))))
 
 \f
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -1518,28 +1516,6 @@ If there is neither a user setting nor a default for FACE, return nil."
       (get face 'saved-face)
       (face-default-spec face)))
 
-(defsubst face-normalize-spec (spec)
-  "Return a normalized face-spec of SPEC."
-  (let (normalized-spec)
-    (while spec
-      (let ((attribute (car spec))
-           (value (car (cdr spec))))
-       ;; Support some old-style attribute names and values.
-       (case attribute
-         (:bold (setq attribute :weight value (if value 'bold 'normal)))
-         (:italic (setq attribute :slant value (if value 'italic 'normal)))
-         ((:foreground :background)
-          ;; Compatibility with 20.x.  Some bogus face specs seem to
-          ;; exist containing things like `:foreground nil'.
-          (if (null value) (setq value 'unspecified)))
-         (t (unless (assq attribute face-x-resources)
-              (setq attribute nil))))
-       (when attribute
-         (push attribute normalized-spec)
-         (push value normalized-spec)))
-      (setq spec (cdr (cdr spec))))
-    (nreverse normalized-spec)))
-
 \f
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Frame-type independent color support.
@@ -1821,8 +1797,7 @@ according to the `background-mode' and `display-type' frame parameters."
        ;; be unmodified, so we can avoid consing in the common case.
        (dolist (face (face-list))
          (when (not (face-spec-match-p face
-                                       (face-normalize-spec
-                                        (face-user-default-spec face))
+                                       (face-user-default-spec face)
                                        (selected-frame)))
            (push face locally-modified-faces)))
        ;; Now change to the new frame parameters
@@ -1905,11 +1880,6 @@ Value is the new frame created."
          (x-handle-reverse-video frame parameters)
          (frame-set-background-mode frame)
          (face-set-after-frame-default frame)
-         ;; Arrange for the kill and yank functions to set and check the clipboard.
-         (modify-frame-parameters
-          frame '((interprogram-cut-function . x-select-text)))
-         (modify-frame-parameters
-          frame '((interprogram-paste-function . x-cut-buffer-or-selection-value)))
          ;; Make sure the tool-bar is ready to be enabled.  The
          ;; `tool-bar-lines' frame parameter will not take effect
          ;; without this call.
@@ -2012,10 +1982,6 @@ created."
        (with-selected-frame frame
          (tty-handle-reverse-video frame (frame-parameters frame))
 
-         ;; Make sure the kill and yank functions do not touch the X clipboard.
-         (modify-frame-parameters frame '((interprogram-cut-function . nil)))
-         (modify-frame-parameters frame '((interprogram-paste-function . nil)))
-
           (unless (terminal-parameter frame 'terminal-initted)
             (set-terminal-parameter frame 'terminal-initted t)
             (set-locale-environment nil frame)