[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/faces.el,v [EMACS_22_BASE]
From: |
Richard M. Stallman |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/faces.el,v [EMACS_22_BASE] |
Date: |
Sun, 23 Dec 2007 18:08:38 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Branch: EMACS_22_BASE
Changes by: Richard M. Stallman <rms> 07/12/23 18:08:38
Index: faces.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/faces.el,v
retrieving revision 1.370.2.5
retrieving revision 1.370.2.6
diff -u -b -r1.370.2.5 -r1.370.2.6
--- faces.el 9 Nov 2007 08:44:50 -0000 1.370.2.5
+++ faces.el 23 Dec 2007 18:08:38 -0000 1.370.2.6
@@ -158,13 +158,18 @@
If the optional fourth argument NEW-FRAME is given,
copy the information from face OLD-FACE on frame FRAME
-to NEW-FACE on frame NEW-FRAME."
+to NEW-FACE on frame NEW-FRAME. In this case, FRAME may not be nil."
(let ((inhibit-quit t))
(if (null frame)
(progn
+ (when new-frame
+ (error "Copying face %s from all frames to one frame"
+ old-face))
+ (make-empty-face new-face)
(dolist (frame (frame-list))
(copy-face old-face new-face frame))
(copy-face old-face new-face t))
+ (make-empty-face new-face)
(internal-copy-lisp-face old-face new-face frame new-frame))
new-face))
- [Emacs-diffs] Changes to emacs/lisp/faces.el,v [EMACS_22_BASE],
Richard M. Stallman <=