emacs: lisp/facemenu.el comparison

comparison lisp/facemenu.el @ 90200:f9a65d7ebd29

Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-68 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 459-473) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 86-87) - Update from CVS

author	Miles Bader <miles@gnu.org>
date	Thu, 07 Jul 2005 12:43:14 +0000
parents	bb71c6cf2009 6fb026ad601f
children	fbb2bea03df9

comparison

equal deleted inserted replaced

-:bb71c6cf2009
+:f9a65d7ebd29
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02111-1307, USA.
+;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
 ;; This file defines a menu of faces (bold, italic, etc) which allows you to
 ;; set the face used for a region of the buffer.  Some faces also have
 ;; Global bindings:
 (define-key global-map [C-down-mouse-2] 'facemenu-menu)
 (define-key global-map "\M-o" 'facemenu-keymap)
 (defgroup facemenu nil
-"Create a face menu for interactively adding fonts to text"
+"Create a face menu for interactively adding fonts to text."
 :group 'faces
 :prefix "facemenu-")
 (defcustom facemenu-keybindings
 '((default     . "d")
 (defcustom facemenu-unlisted-faces
 `(modeline region secondary-selection highlight scratch-face
 ,(purecopy "^font-lock-") ,(purecopy "^gnus-") ,(purecopy "^message-")
 ,(purecopy "^ediff-") ,(purecopy "^term-") ,(purecopy "^vc-")
-,(purecopy "^widget-") ,(purecopy "^custom-") ,(purecopy "^vm-")
+,(purecopy "^widget-") ,(purecopy "^custom-") ,(purecopy "^vm-"))
-,(purecopy "^fg:") ,(purecopy "^bg:"))
 "*List of faces not to include in the Face menu.
 Each element may be either a symbol, which is the name of a face, or a string,
 which is a regular expression to be matched against face names.  Matching
 faces will not be added to the menu.
 		       (facemenu-read-color "Foreground color: "))
 		     (if (and mark-active (not current-prefix-arg))
 			 (region-beginning))
 		     (if (and mark-active (not current-prefix-arg))
 			 (region-end))))
-(facemenu-add-face (facemenu-add-new-color color 'facemenu-foreground-menu)
+(facemenu-set-face-from-menu
-		     start end))
+(facemenu-add-new-color color 'facemenu-foreground-menu)
+start end))
 ;;;###autoload
 (defun facemenu-set-background (color &optional start end)
 "Set the background COLOR of the region or next character typed.
 This command reads the color in the minibuffer.
 		       (facemenu-read-color "Background color: "))
 		     (if (and mark-active (not current-prefix-arg))
 			 (region-beginning))
 		     (if (and mark-active (not current-prefix-arg))
 			 (region-end))))
-(facemenu-add-face (facemenu-add-new-color color 'facemenu-background-menu)
+(facemenu-set-face-from-menu
-		     start end))
+(facemenu-add-new-color color 'facemenu-background-menu)
+start end))
 ;;;###autoload
 (defun facemenu-set-face-from-menu (face start end)
 "Set the FACE of the region or next character typed.
-This function is designed to be called from a menu; the face to use
+This function is designed to be called from a menu; FACE is determined
-is the menu item's name.
+using the event type of the menu entry.  If FACE is a symbol whose
+name starts with \"fg:\" or \"bg:\", then this functions sets the
+foreground or background to the color specified by the rest of the
+symbol's name.  Any other symbol is considered the name of a face.
 If the region is active (normally true except in Transient Mark mode)
 and there is no prefix argument, this command sets the region to the
 requested face.
 Otherwise, this command specifies the face for the next character
-inserted.  Moving point or switching buffers before
+inserted.  Moving point or switching buffers before typing a character
-typing a character to insert cancels the specification."
+to insert cancels the specification."
 (interactive (list last-command-event
 		     (if (and mark-active (not current-prefix-arg))
 			 (region-beginning))
 		     (if (and mark-active (not current-prefix-arg))
 			 (region-end))))
 (barf-if-buffer-read-only)
-(if start
+(facemenu-add-face
-(facemenu-add-face face start end)
+(let ((fn (symbol-name face)))
-(facemenu-add-face face)))
+(if (string-match "\\`\\([fb]\\)g:\\(.+\\)" fn)
+	 (list (list (if (string= (match-string 1 fn) "f")
+			 :foreground
+		       :background)
+		     (match-string 2 fn)))
+face))
+start end))
 ;;;###autoload
 (defun facemenu-set-invisible (start end)
 "Make the region invisible.
 This sets the `invisible' text property; it can be undone with
 nil) ; Return nil for facemenu-iterate
 (defun facemenu-add-new-color (color menu)
 "Add COLOR (a color name string) to the appropriate Face menu.
 MENU should be `facemenu-foreground-menu' or `facemenu-background-menu'.
-Create the appropriate face and return it.
+Return the event type (a symbol) of the added menu entry.
 This is called whenever you use a new color."
 (let (symbol docstring)
 (unless (color-defined-p color)
 (error "Color `%s' undefined" color))
 (cond ((eq menu 'facemenu-foreground-menu)
 	   (setq docstring
 		 (format "Select foreground color %s for subsequent insertion."
 			 color)
-		 symbol (intern (concat "fg:" color)))
+		 symbol (intern (concat "fg:" color))))
-	   (set-face-foreground (make-face symbol) color))
 	  ((eq menu 'facemenu-background-menu)
 	   (setq docstring
 		 (format "Select background color %s for subsequent insertion."
 			 color)
-		 symbol (intern (concat "bg:" color)))
+		 symbol (intern (concat "bg:" color))))
-	   (set-face-background (make-face symbol) color))
 	  (t (error "MENU should be `facemenu-foreground-menu' or `facemenu-background-menu'")))
-(cond ((facemenu-iterate ; check if equivalent face is already in the menu
+(unless (facemenu-iterate ; Check if color is already in the menu.
-	    (lambda (m) (and (listp m)
+	     (lambda (m) (and (listp m)
-			     (symbolp (car m))
+			      (eq (car m) symbol)))
-			     (stringp (cadr m))
+	     (cdr (symbol-function menu)))
-			     (string-equal (cadr m) color)))
+;; Color is not in the menu.  Figure out where to put it.
-	    (cdr (symbol-function menu))))
+(let ((key (vector symbol))
-	  (t	; No keyboard equivalent.  Figure out where to put it:
+	    (function 'facemenu-set-face-from-menu)
-	   (let ((key (vector symbol))
+	    (menu-val (symbol-function menu)))
-		 (function 'facemenu-set-face-from-menu)
+	(if (and facemenu-new-faces-at-end
-		 (menu-val (symbol-function menu)))
+		 (> (length menu-val) 3))
-	     (if (and facemenu-new-faces-at-end
+	    (define-key-after menu-val key (cons color function)
-		      (> (length menu-val) 3))
+	      (car (nth (- (length menu-val) 3) menu-val)))
-		 (define-key-after menu-val key (cons color function)
+	  (define-key menu key (cons color function)))))
-		   (car (nth (- (length menu-val) 3) menu-val)))
-	       (define-key menu key (cons color function))))))
 symbol))
 (defun facemenu-complete-face-list (&optional oldlist)
 "Return list of all faces that look different.
 Starts with given ALIST of faces, and adds elements only if they display

Mercurial > emacs

comparison lisp/facemenu.el @ 90200:f9a65d7ebd29