diff options
| author | Richard M. Stallman | 1994-08-11 07:11:51 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1994-08-11 07:11:51 +0000 |
| commit | 52267b568dd193b37f0125a71acb7db94399d28a (patch) | |
| tree | 3eb92f46d915df8793e740a8b469e6da7def1a7e | |
| parent | b4718ffa3a367c539719ca29db2d88a192a30ba5 (diff) | |
| download | emacs-52267b568dd193b37f0125a71acb7db94399d28a.tar.gz emacs-52267b568dd193b37f0125a71acb7db94399d28a.zip | |
(copy-face): Ignore errors in set-face-font.
| -rw-r--r-- | lisp/faces.el | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lisp/faces.el b/lisp/faces.el index 6eb43677408..9af2a9a9371 100644 --- a/lisp/faces.el +++ b/lisp/faces.el | |||
| @@ -323,7 +323,13 @@ to NEW-FACE on frame NEW-FRAME." | |||
| 323 | (setq old-face (internal-get-face old-face frame)) | 323 | (setq old-face (internal-get-face old-face frame)) |
| 324 | (setq new-face (or (internal-find-face new-face new-frame) | 324 | (setq new-face (or (internal-find-face new-face new-frame) |
| 325 | (make-face new-face))) | 325 | (make-face new-face))) |
| 326 | (set-face-font new-face (face-font old-face frame) new-frame) | 326 | (condition-case nil |
| 327 | ;; A face that has a global symbolic font modifier such as `bold' | ||
| 328 | ;; might legitimately get an error here. | ||
| 329 | ;; Use the frame's default font in that case. | ||
| 330 | (set-face-font new-face (face-font old-face frame) new-frame) | ||
| 331 | (error | ||
| 332 | (set-face-font new-face nil new-frame))) | ||
| 327 | (set-face-foreground new-face (face-foreground old-face frame) new-frame) | 333 | (set-face-foreground new-face (face-foreground old-face frame) new-frame) |
| 328 | (set-face-background new-face (face-background old-face frame) new-frame) | 334 | (set-face-background new-face (face-background old-face frame) new-frame) |
| 329 | ;;; (set-face-background-pixmap | 335 | ;;; (set-face-background-pixmap |