diff options
author | Glenn Morris <rgm@gnu.org> | 2010-10-01 19:46:13 -0700 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2010-10-01 19:46:13 -0700 |
commit | 3226d6cacf15156b8760600be0c6b2aac4dac26d (patch) | |
tree | b258fef6db752b6ccaff25e39297389b9c4e67c3 /lisp/faces.el | |
parent | 9c524fcb89871b321844de7297a1baee0bde0376 (diff) | |
download | emacs-3226d6cacf15156b8760600be0c6b2aac4dac26d.tar.gz |
Remove some functions, variables and aliases obsolete since at least 21.1.
* doc/misc/misc.texi (Shell Mode): Remove reference to old function name.
* src/character.c (Fchar_bytes): Remove obsolete function.
(syms_of_character): Remove Schar_bytes.
* lisp/subr.el (char-bytes): Remove obsolete function.
* lisp/emacs-lisp/checkdoc.el (checkdoc-minor-keymap): Remove obsolete alias.
* lisp/isearch.el (isearch-return-char): Remove obsolete function.
* lisp/mouse.el: No longer provide mldrag.
(mldrag-drag-mode-line, mldrag-drag-vertical-line):
Remove obsolete aliases.
* lisp/comint.el (comint-kill-output): Remove obsolete alias.
* lisp/shell.el: Comment fix.
* lisp/composite.el (decompose-composite-char): Remove obsolete function.
* lisp/ps-def.el (decompose-composite-char): Remove unused function.
* lisp/iswitchb.el (iswitchb-default-keybindings): Remove obsolete function.
* lisp/outline.el (outline-visible): Remove obsolete function.
* lisp/term/pc-win.el (x-frob-font-slant, x-frob-font-weight):
* lisp/faces.el (internal-find-face, internal-get-face)
(frame-update-faces, frame-update-face-colors)
(x-frob-font-weight, x-frob-font-slant)
(internal-frob-font-weight, internal-frob-font-slant)
(x-make-font-bold, x-make-font-demibold, x-make-font-unbold)
(x-make-font-italic, x-make-font-oblique, x-make-font-unitalic)
(x-make-font-bold-italic): Remove functions and aliases, obsolete
since Emacs 21.1.
* lisp/emulation/viper-util.el (viper-get-face):
* lisp/obsolete/lucid.el (find-face, get-face): Use facep.
* lisp/vc/ediff-init.el (ediff-valid-color-p, ediff-get-face):
Remove unused functions.
* lisp/vc/ediff-util.el (ediff-submit-report): Doc fix.
* etc/NEWS: Mention above changes.
Diffstat (limited to 'lisp/faces.el')
-rw-r--r-- | lisp/faces.el | 135 |
1 files changed, 0 insertions, 135 deletions
diff --git a/lisp/faces.el b/lisp/faces.el index 400a0f1c96e..338b55632f9 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -186,33 +186,6 @@ to NEW-FACE on frame NEW-FRAME. In this case, FRAME may not be nil." (internal-copy-lisp-face old-face new-face frame new-frame)) new-face)) - - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;; Obsolete functions -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -;; The functions in this section are defined because Lisp packages use -;; them, despite the prefix `internal-' suggesting that they are -;; private to the face implementation. - -(defun internal-find-face (name &optional frame) - "Retrieve the face named NAME. -Return nil if there is no such face. -If NAME is already a face, it is simply returned. -The optional argument FRAME is ignored." - (facep name)) -(make-obsolete 'internal-find-face 'facep "21.1") - - -(defun internal-get-face (name &optional frame) - "Retrieve the face named NAME; error if there is none. -If NAME is already a face, it is simply returned. -The optional argument FRAME is ignored." - (or (facep name) - (check-face name))) -(make-obsolete 'internal-get-face "see `facep' and `check-face'." "21.1") - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; Predicates, type checks. @@ -2153,23 +2126,6 @@ terminal type to a different value." (face-set-after-frame-default frame))) - - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;; Compatibility with 20.2 -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -;; Update a frame's faces when we change its default font. - -(defalias 'frame-update-faces 'ignore "") -(make-obsolete 'frame-update-faces "no longer necessary." "21.1") - -;; Update the colors of FACE, after FRAME's own colors have been -;; changed. - -(define-obsolete-function-alias 'frame-update-face-colors - 'frame-set-background-mode "21.1") - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; Standard faces. @@ -2620,97 +2576,6 @@ also the same size as FACE on FRAME, or fail." (car fonts)) (cdr (assq 'font (frame-parameters (selected-frame)))))) - -(defun x-frob-font-weight (font which) - (let ((case-fold-search t)) - (cond ((string-match x-font-regexp font) - (concat (substring font 0 - (match-beginning x-font-regexp-weight-subnum)) - which - (substring font (match-end x-font-regexp-weight-subnum) - (match-beginning x-font-regexp-adstyle-subnum)) - ;; Replace the ADD_STYLE_NAME field with * - ;; because the info in it may not be the same - ;; for related fonts. - "*" - (substring font (match-end x-font-regexp-adstyle-subnum)))) - ((string-match x-font-regexp-head font) - (concat (substring font 0 (match-beginning 1)) which - (substring font (match-end 1)))) - ((string-match x-font-regexp-weight font) - (concat (substring font 0 (match-beginning 1)) which - (substring font (match-end 1))))))) -(make-obsolete 'x-frob-font-weight 'make-face-... "21.1") - -(defun x-frob-font-slant (font which) - (let ((case-fold-search t)) - (cond ((string-match x-font-regexp font) - (concat (substring font 0 - (match-beginning x-font-regexp-slant-subnum)) - which - (substring font (match-end x-font-regexp-slant-subnum) - (match-beginning x-font-regexp-adstyle-subnum)) - ;; Replace the ADD_STYLE_NAME field with * - ;; because the info in it may not be the same - ;; for related fonts. - "*" - (substring font (match-end x-font-regexp-adstyle-subnum)))) - ((string-match x-font-regexp-head font) - (concat (substring font 0 (match-beginning 2)) which - (substring font (match-end 2)))) - ((string-match x-font-regexp-slant font) - (concat (substring font 0 (match-beginning 1)) which - (substring font (match-end 1))))))) -(make-obsolete 'x-frob-font-slant 'make-face-... "21.1") - -;; These aliases are here so that we don't get warnings about obsolete -;; functions from the byte compiler. -(defalias 'internal-frob-font-weight 'x-frob-font-weight) -(defalias 'internal-frob-font-slant 'x-frob-font-slant) - -(defun x-make-font-bold (font) - "Given an X font specification, make a bold version of it. -If that can't be done, return nil." - (internal-frob-font-weight font "bold")) -(make-obsolete 'x-make-font-bold 'make-face-bold "21.1") - -(defun x-make-font-demibold (font) - "Given an X font specification, make a demibold version of it. -If that can't be done, return nil." - (internal-frob-font-weight font "demibold")) -(make-obsolete 'x-make-font-demibold 'make-face-bold "21.1") - -(defun x-make-font-unbold (font) - "Given an X font specification, make a non-bold version of it. -If that can't be done, return nil." - (internal-frob-font-weight font "medium")) -(make-obsolete 'x-make-font-unbold 'make-face-unbold "21.1") - -(defun x-make-font-italic (font) - "Given an X font specification, make an italic version of it. -If that can't be done, return nil." - (internal-frob-font-slant font "i")) -(make-obsolete 'x-make-font-italic 'make-face-italic "21.1") - -(defun x-make-font-oblique (font) ; you say tomayto... - "Given an X font specification, make an oblique version of it. -If that can't be done, return nil." - (internal-frob-font-slant font "o")) -(make-obsolete 'x-make-font-oblique 'make-face-italic "21.1") - -(defun x-make-font-unitalic (font) - "Given an X font specification, make a non-italic version of it. -If that can't be done, return nil." - (internal-frob-font-slant font "r")) -(make-obsolete 'x-make-font-unitalic 'make-face-unitalic "21.1") - -(defun x-make-font-bold-italic (font) - "Given an X font specification, make a bold and italic version of it. -If that can't be done, return nil." - (and (setq font (internal-frob-font-weight font "bold")) - (internal-frob-font-slant font "i"))) -(make-obsolete 'x-make-font-bold-italic 'make-face-bold-italic "21.1") - (provide 'faces) ;; arch-tag: 19a4759f-2963-445f-b004-425b9aadd7d6 |