(pc-select-selection-keys-only, pc-selection-mode): Fix spellings in docstrings.

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

diff --git a/lisp/facemenu.el b/lisp/facemenu.el
index c7e9cdd..cd39985 100644 (file)
--- a/lisp/facemenu.el
+++ b/lisp/facemenu.el
@@ -38,9 +38,9 @@
 ;; insertion.  It will be forgotten if you move point or make other
 ;; modifications before inserting or typing anything.
 ;;
 ;; insertion.  It will be forgotten if you move point or make other
 ;; modifications before inserting or typing anything.
 ;;

-;; Faces can be selected from the keyboard as well.  
-;; The standard keybindings are M-g (or ESC g) + letter:
-;; M-g i = "set italic",  M-g b = "set bold", etc.
+;; Faces can be selected from the keyboard as well.
+;; The standard keybindings are M-o (or ESC o) + letter:
+;; M-o i = "set italic",  M-o b = "set bold", etc.

 
 ;;; Customization:
 ;; An alternative set of keybindings that may be easier to type can be set up
 
 ;;; Customization:
 ;; An alternative set of keybindings that may be easier to type can be set up


@@ -86,19 +86,17 @@
 
 ;;; Code:
 
 
 ;;; Code:
 

-(provide 'facemenu)
-
-(eval-when-compile 
+(eval-when-compile

   (require 'help)
   (require 'button))
 
 ;;; Provide some binding for startup:
   (require 'help)
   (require 'button))
 
 ;;; Provide some binding for startup:

-;;;###autoload (define-key global-map "\M-g" 'facemenu-keymap)
+;;;###autoload (define-key global-map "\M-o" 'facemenu-keymap)

 ;;;###autoload (autoload 'facemenu-keymap "facemenu" "Keymap for face-changing commands." t 'keymap)
 ;;;###autoload (autoload 'facemenu-keymap "facemenu" "Keymap for face-changing commands." t 'keymap)

-  
+

 ;; Global bindings:
 (define-key global-map [C-down-mouse-2] 'facemenu-menu)
 ;; Global bindings:
 (define-key global-map [C-down-mouse-2] 'facemenu-menu)

-(define-key global-map "\M-g" 'facemenu-keymap)
+(define-key global-map "\M-o" 'facemenu-keymap)

 
 (defgroup facemenu nil
   "Create a face menu for interactively adding fonts to text"
 
 (defgroup facemenu nil
   "Create a face menu for interactively adding fonts to text"


@@ -118,7 +116,7 @@ the binding is made in `facemenu-keymap'.
 
 The faces specifically mentioned in this list are put at the top of
 the menu, in the order specified.  All other faces which are defined,
 
 The faces specifically mentioned in this list are put at the top of
 the menu, in the order specified.  All other faces which are defined,

-except for those in `facemenu-unlisted-faces', are listed after them, 
+except for those in `facemenu-unlisted-faces', are listed after them,

 but get no keyboard equivalents.
 
 If you change this variable after loading facemenu.el, you will need to call
 but get no keyboard equivalents.
 
 If you change this variable after loading facemenu.el, you will need to call


@@ -166,7 +164,7 @@ when they are created."
 (defalias 'facemenu-face-menu facemenu-face-menu)
 
 ;;;###autoload
 (defalias 'facemenu-face-menu facemenu-face-menu)
 
 ;;;###autoload

-(defvar facemenu-foreground-menu 
+(defvar facemenu-foreground-menu

   (let ((map (make-sparse-keymap "Foreground Color")))
     (define-key map "o" (cons "Other..." 'facemenu-set-foreground))
     map)
   (let ((map (make-sparse-keymap "Foreground Color")))
     (define-key map "o" (cons "Other..." 'facemenu-set-foreground))
     map)


@@ -184,7 +182,7 @@ when they are created."
 (defalias 'facemenu-background-menu facemenu-background-menu)
 
 ;;;###autoload
 (defalias 'facemenu-background-menu facemenu-background-menu)
 
 ;;;###autoload

-(defvar facemenu-special-menu 
+(defvar facemenu-special-menu

   (let ((map (make-sparse-keymap "Special")))
     (define-key map [?s] (cons (purecopy "Remove Special")
                               'facemenu-remove-special))
   (let ((map (make-sparse-keymap "Special")))
     (define-key map [?s] (cons (purecopy "Remove Special")
                               'facemenu-remove-special))


@@ -215,7 +213,7 @@ when they are created."
 ;;;###autoload
 (defvar facemenu-indentation-menu
   (let ((map (make-sparse-keymap "Indentation")))
 ;;;###autoload
 (defvar facemenu-indentation-menu
   (let ((map (make-sparse-keymap "Indentation")))

-    (define-key map [decrease-right-margin] 
+    (define-key map [decrease-right-margin]

       (cons (purecopy "Indent Right Less") 'decrease-right-margin))
     (define-key map [increase-right-margin]
       (cons (purecopy "Indent Right More") 'increase-right-margin))
       (cons (purecopy "Indent Right Less") 'decrease-right-margin))
     (define-key map [increase-right-margin]
       (cons (purecopy "Indent Right More") 'increase-right-margin))


@@ -238,8 +236,8 @@ when they are created."
 (let ((map facemenu-menu))
   (define-key map [dc] (cons (purecopy "Display Colors") 'list-colors-display))
   (define-key map [df] (cons (purecopy "Display Faces") 'list-faces-display))
 (let ((map facemenu-menu))
   (define-key map [dc] (cons (purecopy "Display Colors") 'list-colors-display))
   (define-key map [df] (cons (purecopy "Display Faces") 'list-faces-display))

-  (define-key map [dp] (cons (purecopy "Describe Text")
-                            'describe-text-at))
+  (define-key map [dp] (cons (purecopy "Describe Properties")
+                            'describe-text-properties))

   (define-key map [ra] (cons (purecopy "Remove Text Properties")
                             'facemenu-remove-all))
   (define-key map [rm] (cons (purecopy "Remove Face Properties")
   (define-key map [ra] (cons (purecopy "Remove Text Properties")
                             'facemenu-remove-all))
   (define-key map [rm] (cons (purecopy "Remove Face Properties")


@@ -247,23 +245,23 @@ when they are created."
   (define-key map [s1] (list (purecopy "--"))))
 ;;;###autoload
 (let ((map facemenu-menu))
   (define-key map [s1] (list (purecopy "--"))))
 ;;;###autoload
 (let ((map facemenu-menu))

-  (define-key map [in] (cons (purecopy "Indentation") 
+  (define-key map [in] (cons (purecopy "Indentation")

                             'facemenu-indentation-menu))
   (define-key map [ju] (cons (purecopy "Justification")
                             'facemenu-justification-menu))
   (define-key map [s2] (list (purecopy "--")))
                             'facemenu-indentation-menu))
   (define-key map [ju] (cons (purecopy "Justification")
                             'facemenu-justification-menu))
   (define-key map [s2] (list (purecopy "--")))

-  (define-key map [sp] (cons (purecopy "Special Properties") 
+  (define-key map [sp] (cons (purecopy "Special Properties")

                             'facemenu-special-menu))
                             'facemenu-special-menu))

-  (define-key map [bg] (cons (purecopy "Background Color") 
+  (define-key map [bg] (cons (purecopy "Background Color")

                             'facemenu-background-menu))
                             'facemenu-background-menu))

-  (define-key map [fg] (cons (purecopy "Foreground Color") 
+  (define-key map [fg] (cons (purecopy "Foreground Color")

                             'facemenu-foreground-menu))
                             'facemenu-foreground-menu))

-  (define-key map [fc] (cons (purecopy "Face") 
+  (define-key map [fc] (cons (purecopy "Face")

                             'facemenu-face-menu)))
 ;;;###autoload
 (defalias 'facemenu-menu facemenu-menu)
 
                             'facemenu-face-menu)))
 ;;;###autoload
 (defalias 'facemenu-menu facemenu-menu)
 

-(defvar facemenu-keymap 
+(defvar facemenu-keymap

   (let ((map (make-sparse-keymap "Set face")))
     (define-key map "o" (cons (purecopy "Other...") 'facemenu-set-face))
     map)
   (let ((map (make-sparse-keymap "Set face")))
     (define-key map "o" (cons (purecopy "Other...") 'facemenu-set-face))
     map)


@@ -330,7 +328,7 @@ requested face.
 
 Otherwise, this command specifies the face for the next character
 inserted.  Moving point or switching buffers before
 
 Otherwise, this command specifies the face for the next character
 inserted.  Moving point or switching buffers before

-typing a character to insert cancels the specification." 
+typing a character to insert cancels the specification."

   (interactive (list (progn
                       (barf-if-buffer-read-only)
                       (read-face-name "Use face"))
   (interactive (list (progn
                       (barf-if-buffer-read-only)
                       (read-face-name "Use face"))


@@ -352,7 +350,7 @@ requested face.
 
 Otherwise, this command specifies the face for the next character
 inserted.  Moving point or switching buffers before
 
 Otherwise, this command specifies the face for the next character
 inserted.  Moving point or switching buffers before

-typing a character to insert cancels the specification." 
+typing a character to insert cancels the specification."

   (interactive (list (progn
                       (barf-if-buffer-read-only)
                       (facemenu-read-color "Foreground color: "))
   (interactive (list (progn
                       (barf-if-buffer-read-only)
                       (facemenu-read-color "Foreground color: "))


@@ -376,7 +374,7 @@ requested face.
 
 Otherwise, this command specifies the face for the next character
 inserted.  Moving point or switching buffers before
 
 Otherwise, this command specifies the face for the next character
 inserted.  Moving point or switching buffers before

-typing a character to insert cancels the specification." 
+typing a character to insert cancels the specification."

   (interactive (list (progn
                       (barf-if-buffer-read-only)
                       (facemenu-read-color "Background color: "))
   (interactive (list (progn
                       (barf-if-buffer-read-only)
                       (facemenu-read-color "Background color: "))


@@ -401,7 +399,7 @@ requested face.
 
 Otherwise, this command specifies the face for the next character
 inserted.  Moving point or switching buffers before
 
 Otherwise, this command specifies the face for the next character
 inserted.  Moving point or switching buffers before

-typing a character to insert cancels the specification." 
+typing a character to insert cancels the specification."

   (interactive (list last-command-event
                     (if (and mark-active (not current-prefix-arg))
                         (region-beginning))
   (interactive (list last-command-event
                     (if (and mark-active (not current-prefix-arg))
                         (region-beginning))


@@ -409,7 +407,7 @@ typing a character to insert cancels the specification."
                         (region-end))))
   (barf-if-buffer-read-only)
   (facemenu-get-face face)
                         (region-end))))
   (barf-if-buffer-read-only)
   (facemenu-get-face face)

-  (if start 
+  (if start

       (facemenu-add-face face start end)
     (facemenu-add-face face)))
 
       (facemenu-add-face face start end)
     (facemenu-add-face face)))
 


@@ -442,7 +440,7 @@ This sets the `read-only' text property; it can be undone with
   "Remove `face' and `mouse-face' text properties."
   (interactive "*r") ; error if buffer is read-only despite the next line.
   (let ((inhibit-read-only t))
   "Remove `face' and `mouse-face' text properties."
   (interactive "*r") ; error if buffer is read-only despite the next line.
   (let ((inhibit-read-only t))

-    (remove-text-properties 
+    (remove-text-properties

      start end '(face nil mouse-face nil))))
 
 ;;;###autoload
      start end '(face nil mouse-face nil))))
 
 ;;;###autoload


@@ -458,55 +456,96 @@ This sets the `read-only' text property; it can be undone with
 These special properties include `invisible', `intangible' and `read-only'."
   (interactive "*r") ; error if buffer is read-only despite the next line.
   (let ((inhibit-read-only t))
 These special properties include `invisible', `intangible' and `read-only'."
   (interactive "*r") ; error if buffer is read-only despite the next line.
   (let ((inhibit-read-only t))

-    (remove-text-properties 
+    (remove-text-properties

      start end '(invisible nil intangible nil read-only nil))))
 \f
 ;;;###autoload
 (defun facemenu-read-color (&optional prompt)
   "Read a color using the minibuffer."
      start end '(invisible nil intangible nil read-only nil))))
 \f
 ;;;###autoload
 (defun facemenu-read-color (&optional prompt)
   "Read a color using the minibuffer."

-  (let ((col (completing-read (or prompt "Color: ") 
+  (let ((col (completing-read (or prompt "Color: ")

                              (or facemenu-color-alist
                              (or facemenu-color-alist

-                                 (mapcar 'list (defined-colors)))
+                                 (defined-colors))

                              nil t)))
     (if (equal "" col)
        nil
       col)))
 
 ;;;###autoload
                              nil t)))
     (if (equal "" col)
        nil
       col)))
 
 ;;;###autoload

-(defun list-colors-display (&optional list)
+(defun list-colors-display (&optional list buffer-name)

   "Display names of defined colors, and show what they look like.
 If the optional argument LIST is non-nil, it should be a list of
   "Display names of defined colors, and show what they look like.
 If the optional argument LIST is non-nil, it should be a list of

-colors to display.  Otherwise, this command computes a list
-of colors that the current display can handle."
+colors to display.  Otherwise, this command computes a list of
+colors that the current display can handle.  If the optional
+argument BUFFER-NAME is nil, it defaults to *Colors*."

   (interactive)
   (when (and (null list) (> (display-color-cells) 0))
   (interactive)
   (when (and (null list) (> (display-color-cells) 0))

-    (setq list (defined-colors))
-    ;; Delete duplicate colors.
-    (let ((l list))
-      (while (cdr l)
-       (if (facemenu-color-equal (car l) (car (cdr l)))
-           (setcdr l (cdr (cdr l)))
-         (setq l (cdr l)))))
+    (setq list (list-colors-duplicates (defined-colors)))

     (when (memq (display-visual-class) '(gray-scale pseudo-color direct-color))
       ;; Don't show more than what the display can handle.
       (let ((lc (nthcdr (1- (display-color-cells)) list)))
        (if lc
            (setcdr lc nil)))))
     (when (memq (display-visual-class) '(gray-scale pseudo-color direct-color))
       ;; Don't show more than what the display can handle.
       (let ((lc (nthcdr (1- (display-color-cells)) list)))
        (if lc
            (setcdr lc nil)))))

-  (with-output-to-temp-buffer "*Colors*"
+  (with-output-to-temp-buffer (or buffer-name "*Colors*")

     (save-excursion
       (set-buffer standard-output)
     (save-excursion
       (set-buffer standard-output)

-      (let (s)
-       (while list
-         (setq s (point))
-         (insert (car list))
-         (indent-to 20)
-         (put-text-property s (point) 'face 
-                            (cons 'background-color (car list)))
-         (setq s (point))
-         (insert "  " (car list) "\n")
-         (put-text-property s (point) 'face 
-                            (cons 'foreground-color (car list)))
-         (setq list (cdr list)))))))
+      (setq truncate-lines t)
+      (if temp-buffer-show-function
+         (list-colors-print list)
+       ;; Call list-colors-print from temp-buffer-show-hook
+       ;; to get the right value of window-width in list-colors-print
+       ;; after the buffer is displayed.
+       (add-hook 'temp-buffer-show-hook
+                 (lambda () (list-colors-print list)) nil t)))))
+
+(defun list-colors-print (list)
+  (dolist (color list)
+    (if (consp color)
+       (if (cdr color)
+           (setq color (sort color (lambda (a b)
+                                     (string< (downcase a)
+                                              (downcase b))))))
+      (setq color (list color)))
+    (put-text-property
+     (prog1 (point)
+       (insert (car color))
+       (indent-to 22))
+     (point)
+     'face (cons 'background-color (car color)))
+    (put-text-property
+     (prog1 (point)
+       (insert " " (if (cdr color)
+                      (mapconcat 'identity (cdr color) ", ")
+                    (car color))))
+     (point)
+     'face (cons 'foreground-color (car color)))
+    (indent-to (max (- (window-width) 8) 44))
+    (insert (apply 'format "#%02x%02x%02x"
+                  (mapcar (lambda (c) (lsh c -8))
+                          (color-values (car color)))))
+
+    (insert "\n"))
+  (goto-char (point-min)))
+
+(defun list-colors-duplicates (&optional list)
+  "Return a list of colors with grouped duplicate colors.
+If a color has no duplicates, then the element of the returned list
+has the form '(COLOR-NAME).  The element of the returned list with
+duplicate colors has the form '(COLOR-NAME DUPLICATE-COLOR-NAME ...).
+This function uses the predicate `facemenu-color-equal' to compare
+color names.  If the optional argument LIST is non-nil, it should
+be a list of colors to display.  Otherwise, this function uses
+a list of colors that the current display can handle."
+  (let* ((list (mapcar 'list (or list (defined-colors))))
+        (l list))
+    (while (cdr l)
+      (if (and (facemenu-color-equal (car (car l)) (car (car (cdr l))))
+              (not (if (boundp 'w32-default-color-map)
+                       (not (assoc (car (car l)) w32-default-color-map)))))
+         (progn
+           (setcdr (car l) (cons (car (car (cdr l))) (cdr (car l))))
+           (setcdr l (cdr (cdr l))))
+       (setq l (cdr l))))
+    list))

 
 (defun facemenu-color-equal (a b)
   "Return t if colors A and B are the same color.
 
 (defun facemenu-color-equal (a b)
   "Return t if colors A and B are the same color.


@@ -593,7 +632,7 @@ use the selected frame.  If t, then the global, non-frame faces are used."
                       (check-face (car face-list)))))
                (i mask-len)
                (useful nil))
                       (check-face (car face-list)))))
                (i mask-len)
                (useful nil))

-           (while (> (setq i (1- i)) 1)
+           (while (>= (setq i (1- i)) 0)

              (and (not (memq (aref face-atts i) '(nil unspecified)))
                   (memq (aref mask-atts i) '(nil unspecified))
                   (aset mask-atts i (setq useful t))))
              (and (not (memq (aref face-atts i) '(nil unspecified)))
                   (memq (aref mask-atts i) '(nil unspecified))
                   (aset mask-atts i (setq useful t))))


@@ -654,7 +693,7 @@ This is called whenever you create a new face."
           (define-key 'facemenu-keymap key (cons name function))
           (define-key menu key (cons name function)))
          ((facemenu-iterate ; check if equivalent face is already in the menu
           (define-key 'facemenu-keymap key (cons name function))
           (define-key menu key (cons name function)))
          ((facemenu-iterate ; check if equivalent face is already in the menu

-           (lambda (m) (and (listp m) 
+           (lambda (m) (and (listp m)

                             (symbolp (car m))
                             (face-equal (car m) symbol)))
            (cdr (symbol-function menu))))
                             (symbolp (car m))
                             (face-equal (car m) symbol)))
            (cdr (symbol-function menu))))


@@ -695,7 +734,7 @@ This is called whenever you use a new color."
                 (format "Select background color %s for subsequent insertion."
                         name))))
     (cond ((facemenu-iterate ; check if equivalent face is already in the menu
                 (format "Select background color %s for subsequent insertion."
                         name))))
     (cond ((facemenu-iterate ; check if equivalent face is already in the menu

-           (lambda (m) (and (listp m) 
+           (lambda (m) (and (listp m)

                             (symbolp (car m))
                             (stringp (cadr m))
                             (string-equal (cadr m) color)))
                             (symbolp (car m))
                             (stringp (cadr m))
                             (string-equal (cadr m) color)))


@@ -713,13 +752,13 @@ This is called whenever you use a new color."
 
 (defun facemenu-complete-face-list (&optional oldlist)
   "Return list of all faces that look different.
 
 (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 
+Starts with given ALIST of faces, and adds elements only if they display

 differently from any face already on the list.
 differently from any face already on the list.

-The faces on ALIST will end up at the end of the returned list, in reverse 
+The faces on ALIST will end up at the end of the returned list, in reverse

 order."
   (let ((list (nreverse (mapcar 'car oldlist))))
 order."
   (let ((list (nreverse (mapcar 'car oldlist))))

-    (facemenu-iterate 
-     (lambda (new-face) 
+    (facemenu-iterate
+     (lambda (new-face)

        (if (not (memq new-face list))
           (setq list (cons new-face list)))
        nil)
        (if (not (memq new-face list))
           (setq list (cons new-face list)))
        nil)


@@ -735,4 +774,7 @@ Returns the non-nil value it found, or nil if all were nil."
 
 (facemenu-update)
 
 
 (facemenu-update)
 

+(provide 'facemenu)
+
+;;; arch-tag: 85f6d02b-9085-420e-b651-0678f0e9c7eb

 ;;; facemenu.el ends here
 ;;; facemenu.el ends here