mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-26 07:33:47 +00:00
Code Issues Releases Activity

(facemenu-next): Variable deleted.

Browse Source 
(facemenu-self-insert-face): New function.
(facemenu-set-face): Use facemenu-self-insert-face.
(facemenu-set-face-from-menu): Likewise.
(facemenu-after-change): Function deleted.  Don't use it as hook.
This commit is contained in:
Richard M. Stallman 1995-02-13 16:56:19 +00:00
parent 189fad68dd
commit 7fce8c916f
1 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lisp/facemenu.el
View File

@ -216,7 +216,6 @@ requested in `facemenu-keybindings'.")
"Alist of colors, used for completion.
If null, `facemenu-read-color' will set it.")
(defvar facemenu-next nil) ; set when we are going to set a face on next char.
(defvar facemenu-loc nil)
(defun facemenu-update ()
@ -252,8 +251,7 @@ typing a character cancels the request."
(let ((start (or start (region-beginning)))
(end (or end (region-end))))
(facemenu-add-face face start end))
(setq facemenu-next face
facemenu-loc (point))))
(facemenu-self-insert-face face)))
;;;###autoload
(defun facemenu-set-foreground (color &optional start end)
@ -301,7 +299,11 @@ typing a character cancels the request."
(facemenu-get-face face)
(if start
(facemenu-add-face face start end)
(setq facemenu-next face facemenu-loc (point))))
(facemenu-self-insert-face face)))
(defun facemenu-self-insert-face (face)
(setq self-insert-face face
self-insert-face-command this-command))
(defun facemenu-set-invisible (start end)
"Make the region invisible.
@ -489,18 +491,6 @@ Automatically called when a new face is created."
(define-key menu key (cons name function))))))
nil) ; Return nil for facemenu-iterate
(defun facemenu-after-change (begin end old-length)
"May set the face of just-inserted text to user's request.
This only happens if the change is an insertion, and
`facemenu-set-face[-from-menu]' was called with point at the
beginning of the insertion."
(if (null facemenu-next) ; exit immediately if no work
nil
(if (and (= 0 old-length) ; insertion
(= facemenu-loc begin)) ; point wasn't moved in between
(facemenu-add-face facemenu-next begin end))
(setq facemenu-next nil)))
(defun facemenu-complete-face-list (&optional oldlist)
"Return list of all faces that are look different.
Starts with given ALIST of faces, and adds elements only if they display
@ -524,6 +514,5 @@ Returns the non-nil value it found, or nil if all were nil."
(car iterate-list))
(facemenu-update)
(add-hook 'after-change-functions 'facemenu-after-change)
;;; facemenu.el ends here