# HG changeset patch # User Glenn Morris # Date 1285987573 25200 # Node ID 515d80e174ba3a6662bbdbcbf92741d6c1b4910f # Parent 0554c384e09fbf729d8961dab2022fdd2aae1bf3 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. diff -r 0554c384e09f -r 515d80e174ba doc/emacs/ChangeLog --- a/doc/emacs/ChangeLog Fri Oct 01 19:30:11 2010 -0700 +++ b/doc/emacs/ChangeLog Fri Oct 01 19:46:13 2010 -0700 @@ -1,3 +1,7 @@ +2010-10-02 Glenn Morris + + * misc.texi (Shell Mode): Remove reference to old function name. + 2010-09-30 Eli Zaretskii * maintaining.texi (VC Mode Line): Mention all the possible VC status diff -r 0554c384e09f -r 515d80e174ba doc/emacs/misc.texi --- a/doc/emacs/misc.texi Fri Oct 01 19:30:11 2010 -0700 +++ b/doc/emacs/misc.texi Fri Oct 01 19:46:13 2010 -0700 @@ -786,8 +786,7 @@ @findex comint-delete-output Delete the last batch of output from a shell command (@code{comint-delete-output}). This is useful if a shell command spews -out lots of output that just gets in the way. This command used to be -called @code{comint-kill-output}. +out lots of output that just gets in the way. @item C-c C-s @kindex C-c C-s @r{(Shell mode)} diff -r 0554c384e09f -r 515d80e174ba etc/NEWS --- a/etc/NEWS Fri Oct 01 19:30:11 2010 -0700 +++ b/etc/NEWS Fri Oct 01 19:46:13 2010 -0700 @@ -538,6 +538,20 @@ versions, these regions were delineated by `mouse-drag-overlay', which has now been removed. +** The following functions and aliases, obsolete since at least Emacs 21.1, +have been removed: +comint-kill-output, decompose-composite-char, outline-visible, +internal-find-face, internal-get-face, frame-update-faces, +frame-update-face-colors, x-frob-font-weight, x-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, mldrag-drag-mode-line, mldrag-drag-vertical-line, +iswitchb-default-keybindings, char-bytes, isearch-return-char + +** The following variables and aliases, obsolete since at least Emacs 21.1, +have been removed: +checkdoc-minor-keymap + * Lisp changes in Emacs 24.1 diff -r 0554c384e09f -r 515d80e174ba lisp/ChangeLog --- a/lisp/ChangeLog Fri Oct 01 19:30:11 2010 -0700 +++ b/lisp/ChangeLog Fri Oct 01 19:46:13 2010 -0700 @@ -1,5 +1,39 @@ 2010-10-02 Glenn Morris + * emacs-lisp/checkdoc.el (checkdoc-minor-keymap): Remove obsolete alias. + + * subr.el (char-bytes): Remove obsolete function. + + * isearch.el (isearch-return-char): Remove obsolete function. + + * mouse.el: No longer provide mldrag. + (mldrag-drag-mode-line, mldrag-drag-vertical-line): + Remove obsolete aliases. + + * comint.el (comint-kill-output): Remove obsolete alias. + + * composite.el (decompose-composite-char): Remove obsolete function. + * ps-def.el (decompose-composite-char): Remove unused function. + + * iswitchb.el (iswitchb-default-keybindings): Remove obsolete function. + + * outline.el (outline-visible): Remove obsolete function. + + * term/pc-win.el (x-frob-font-slant, x-frob-font-weight): + * 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. + * emulation/viper-util.el (viper-get-face): + * obsolete/lucid.el (find-face, get-face): Use facep. + * vc/ediff-init.el (ediff-valid-color-p, ediff-get-face): + Remove unused functions. + * vc/ediff-util.el (ediff-submit-report): Doc fix. + * emacs-lisp/bytecomp.el (byte-compile-file): Use kill-emacs-hook to delete tempfile if interrupted during compilation. diff -r 0554c384e09f -r 515d80e174ba lisp/comint.el --- a/lisp/comint.el Fri Oct 01 19:30:11 2010 -0700 +++ b/lisp/comint.el Fri Oct 01 19:46:13 2010 -0700 @@ -2296,8 +2296,6 @@ (delete-region pmark (point)))) ;; Output message and put back prompt (comint-output-filter proc replacement))) -(define-obsolete-function-alias 'comint-kill-output - 'comint-delete-output "21.1") (defun comint-write-output (filename &optional append mustbenew) "Write output from interpreter since last input to FILENAME. diff -r 0554c384e09f -r 515d80e174ba lisp/composite.el --- a/lisp/composite.el Fri Oct 01 19:30:11 2010 -0700 +++ b/lisp/composite.el Fri Oct 01 19:46:13 2010 -0700 @@ -756,23 +756,6 @@ (defalias 'toggle-auto-composition 'auto-composition-mode) -;; The following codes are only for backward compatibility with Emacs -;; 20.4 and earlier. - -(defun decompose-composite-char (char &optional type with-composition-rule) - "Convert CHAR to string. - -If optional 2nd arg TYPE is non-nil, it is `string', `list', or -`vector'. In this case, CHAR is converted to string, list of CHAR, or -vector of CHAR respectively. -Optional 3rd arg WITH-COMPOSITION-RULE is ignored." - (cond ((or (null type) (eq type 'string)) (char-to-string char)) - ((eq type 'list) (list char)) - (t (vector char)))) - -(make-obsolete 'decompose-composite-char 'char-to-string "21.1") - - ;; arch-tag: ee703d77-1723-45d4-a31f-e9f0f867aa33 ;;; composite.el ends here diff -r 0554c384e09f -r 515d80e174ba lisp/emacs-lisp/checkdoc.el --- a/lisp/emacs-lisp/checkdoc.el Fri Oct 01 19:30:11 2010 -0700 +++ b/lisp/emacs-lisp/checkdoc.el Fri Oct 01 19:46:13 2010 -0700 @@ -1,7 +1,7 @@ ;;; checkdoc.el --- check documentation strings for style requirements -;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007, +;; 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam ;; Version: 0.6.2 @@ -1207,9 +1207,6 @@ map) "Keymap used to override evaluation key-bindings for documentation checking.") -(define-obsolete-variable-alias 'checkdoc-minor-keymap - 'checkdoc-minor-mode-map "21.1") - ;; Add in a menubar with easy-menu (easy-menu-define diff -r 0554c384e09f -r 515d80e174ba lisp/emulation/viper-util.el --- a/lisp/emulation/viper-util.el Fri Oct 01 19:30:11 2010 -0700 +++ b/lisp/emulation/viper-util.el Fri Oct 01 19:46:13 2010 -0700 @@ -1,7 +1,8 @@ ;;; viper-util.el --- Utilities used by viper.el ;; Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003, -;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 +;; Free Software Foundation, Inc. ;; Author: Michael Kifer ;; Package: viper @@ -77,7 +78,7 @@ (defalias 'viper-int-to-char (if (featurep 'xemacs) 'int-to-char 'identity)) (defalias 'viper-get-face - (if (featurep 'xemacs) 'get-face 'internal-get-face)) + (if (featurep 'xemacs) 'get-face 'facep)) (defalias 'viper-color-defined-p (if (featurep 'xemacs) 'valid-color-name-p 'x-color-defined-p)) (defalias 'viper-iconify diff -r 0554c384e09f -r 515d80e174ba lisp/faces.el --- a/lisp/faces.el Fri Oct 01 19:30:11 2010 -0700 +++ b/lisp/faces.el Fri Oct 01 19:46:13 2010 -0700 @@ -186,33 +186,6 @@ (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 @@ (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 @@ (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 diff -r 0554c384e09f -r 515d80e174ba lisp/isearch.el --- a/lisp/isearch.el Fri Oct 01 19:30:11 2010 -0700 +++ b/lisp/isearch.el Fri Oct 01 19:46:13 2010 -0700 @@ -1994,12 +1994,6 @@ (setq char (unibyte-char-to-multibyte char))) (isearch-process-search-char char)))) -(defun isearch-return-char () - "Convert return into newline for incremental search." - (interactive) - (isearch-process-search-char ?\n)) -(make-obsolete 'isearch-return-char 'isearch-printing-char "19.7") - (defun isearch-printing-char () "Add this ordinary printing character to the search string and search." (interactive) diff -r 0554c384e09f -r 515d80e174ba lisp/iswitchb.el --- a/lisp/iswitchb.el Fri Oct 01 19:30:11 2010 -0700 +++ b/lisp/iswitchb.el Fri Oct 01 19:46:13 2010 -0700 @@ -1,7 +1,7 @@ ;;; iswitchb.el --- switch between buffers using substrings -;; Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2005, 2006, +;; 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Stephen Eglen ;; Maintainer: Stephen Eglen @@ -1119,19 +1119,6 @@ (get-buffer-window buffer 0) ; better than 'visible ))) -(defun iswitchb-default-keybindings () - "Set up default keybindings for `iswitchb-buffer'. -Call this function to override the normal bindings. This function also -adds a hook to the minibuffer." - (interactive) - (add-hook 'minibuffer-setup-hook 'iswitchb-minibuffer-setup) - (global-set-key "\C-xb" 'iswitchb-buffer) - (global-set-key "\C-x4b" 'iswitchb-buffer-other-window) - (global-set-key "\C-x4\C-o" 'iswitchb-display-buffer) - (global-set-key "\C-x5b" 'iswitchb-buffer-other-frame)) - -(make-obsolete 'iswitchb-default-keybindings 'iswitchb-mode "21.1") - (defun iswitchb-buffer () "Switch to another buffer. diff -r 0554c384e09f -r 515d80e174ba lisp/mouse.el --- a/lisp/mouse.el Fri Oct 01 19:30:11 2010 -0700 +++ b/lisp/mouse.el Fri Oct 01 19:46:13 2010 -0700 @@ -2130,12 +2130,5 @@ (provide 'mouse) -;; This file contains the functionality of the old mldrag.el. -(defalias 'mldrag-drag-mode-line 'mouse-drag-mode-line) -(defalias 'mldrag-drag-vertical-line 'mouse-drag-vertical-line) -(make-obsolete 'mldrag-drag-mode-line 'mouse-drag-mode-line "21.1") -(make-obsolete 'mldrag-drag-vertical-line 'mouse-drag-vertical-line "21.1") -(provide 'mldrag) - ;; arch-tag: 9a710ce1-914a-4923-9b81-697f7bf82ab3 ;;; mouse.el ends here diff -r 0554c384e09f -r 515d80e174ba lisp/obsolete/lucid.el --- a/lisp/obsolete/lucid.el Fri Oct 01 19:30:11 2010 -0700 +++ b/lisp/obsolete/lucid.el Fri Oct 01 19:46:13 2010 -0700 @@ -1,7 +1,7 @@ ;;; lucid.el --- emulate some Lucid Emacs functions -;; Copyright (C) 1993, 1995, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007, +;; 2008, 2009, 2010 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: emulations @@ -89,8 +89,8 @@ ((display-grayscale-p device) 'grayscale) (t 'mono))) -(defalias 'find-face 'internal-find-face) -(defalias 'get-face 'internal-get-face) +(defalias 'find-face 'facep) +(defalias 'get-face 'facep) ;; internal-try-face-font was removed from faces.el in rev 1.139, 1999/07/21. ;;;(defalias 'try-face-font 'internal-try-face-font) diff -r 0554c384e09f -r 515d80e174ba lisp/outline.el --- a/lisp/outline.el Fri Oct 01 19:30:11 2010 -0700 +++ b/lisp/outline.el Fri Oct 01 19:46:13 2010 -0700 @@ -1,7 +1,8 @@ ;;; outline.el --- outline mode commands for Emacs ;; Copyright (C) 1986, 1993, 1994, 1995, 1997, 2000, 2001, 2002, -;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +;; Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: outlines @@ -445,10 +446,6 @@ "Non-nil if the character after point is invisible." (get-char-property (or pos (point)) 'invisible)) -(defun outline-visible () - (not (outline-invisible-p))) -(make-obsolete 'outline-visible 'outline-invisible-p "21.1") - (defun outline-back-to-heading (&optional invisible-ok) "Move to previous heading line, or beg of this line if it's a heading. Only visible heading lines are considered, unless INVISIBLE-OK is non-nil." diff -r 0554c384e09f -r 515d80e174ba lisp/ps-def.el --- a/lisp/ps-def.el Fri Oct 01 19:30:11 2010 -0700 +++ b/lisp/ps-def.el Fri Oct 01 19:46:13 2010 -0700 @@ -99,11 +99,6 @@ (setq count (1- count))) (+ (point) (* count step)))))) - (or (fboundp 'decompose-composite-char) - (defun decompose-composite-char (char &optional type - with-composition-rule) - nil)) - (or (fboundp 'encode-coding-string) (defun encode-coding-string (string coding-system &optional nocopy) (if nocopy diff -r 0554c384e09f -r 515d80e174ba lisp/shell.el --- a/lisp/shell.el Fri Oct 01 19:30:11 2010 -0700 +++ b/lisp/shell.el Fri Oct 01 19:46:13 2010 -0700 @@ -70,7 +70,7 @@ ;; c-c c-c comint-interrupt-subjob ^c ;; c-c c-z comint-stop-subjob ^z ;; c-c c-\ comint-quit-subjob ^\ -;; c-c c-o comint-kill-output Delete last batch of process output +;; c-c c-o comint-delete-output Delete last batch of process output ;; c-c c-r comint-show-output Show last batch of process output ;; c-c c-l comint-dynamic-list-input-ring List input history ;; send-invisible Read line w/o echo & send to proc diff -r 0554c384e09f -r 515d80e174ba lisp/subr.el --- a/lisp/subr.el Fri Oct 01 19:30:11 2010 -0700 +++ b/lisp/subr.el Fri Oct 01 19:46:13 2010 -0700 @@ -1,7 +1,8 @@ ;;; subr.el --- basic lisp subroutines for Emacs ;; Copyright (C) 1985, 1986, 1992, 1994, 1995, 1999, 2000, 2001, 2002, 2003, -;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 +;; Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal @@ -1017,7 +1018,6 @@ (define-obsolete-function-alias 'eval-current-buffer 'eval-buffer "22.1") (define-obsolete-function-alias 'string-to-int 'string-to-number "22.1") -(make-obsolete 'char-bytes "now always returns 1." "20.4") (make-obsolete 'forward-point "use (+ (point) N) instead." "23.1") (defun insert-string (&rest args) diff -r 0554c384e09f -r 515d80e174ba lisp/term/pc-win.el --- a/lisp/term/pc-win.el Fri Oct 01 19:30:11 2010 -0700 +++ b/lisp/term/pc-win.el Fri Oct 01 19:46:13 2010 -0700 @@ -286,15 +286,6 @@ (if (x-selection-owner-p selection) t)) -;; From lisp/faces.el: we only have one font, so always return -;; it, no matter which variety they've asked for. -(defun x-frob-font-slant (font which) - font) -(make-obsolete 'x-frob-font-slant 'make-face-... "21.1") -(defun x-frob-font-weight (font which) - font) -(make-obsolete 'x-frob-font-weight 'make-face-... "21.1") - ;; From src/fontset.c: (fset 'query-fontset 'ignore) diff -r 0554c384e09f -r 515d80e174ba lisp/vc/ediff-init.el --- a/lisp/vc/ediff-init.el Fri Oct 01 19:30:11 2010 -0700 +++ b/lisp/vc/ediff-init.el Fri Oct 01 19:46:13 2010 -0700 @@ -787,16 +787,6 @@ "") -(if (ediff-has-face-support-p) - (if (featurep 'xemacs) - (progn - (defalias 'ediff-valid-color-p 'valid-color-name-p) - (defalias 'ediff-get-face 'get-face)) - (defalias 'ediff-valid-color-p (if (fboundp 'color-defined-p) - 'color-defined-p - 'x-color-defined-p)) - (defalias 'ediff-get-face 'internal-get-face))) - (if (ediff-window-display-p) (if (featurep 'xemacs) (progn diff -r 0554c384e09f -r 515d80e174ba lisp/vc/ediff-util.el --- a/lisp/vc/ediff-util.el Fri Oct 01 19:30:11 2010 -0700 +++ b/lisp/vc/ediff-util.el Fri Oct 01 19:46:13 2010 -0700 @@ -1,7 +1,8 @@ ;;; ediff-util.el --- the core commands and utilities of ediff ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +;; Free Software Foundation, Inc. ;; Author: Michael Kifer ;; Package: ediff @@ -3994,7 +3995,7 @@ ........................ While compiling the end of the data: ** The following functions are not known to be defined: - ediff-valid-color-p, ediff-set-face, + xxx, yyy ........................ These are NOT errors, but inevitable warnings, which ought to be ignored. diff -r 0554c384e09f -r 515d80e174ba src/ChangeLog --- a/src/ChangeLog Fri Oct 01 19:30:11 2010 -0700 +++ b/src/ChangeLog Fri Oct 01 19:46:13 2010 -0700 @@ -1,5 +1,8 @@ 2010-10-02 Glenn Morris + * character.c (Fchar_bytes): Remove obsolete function. + (syms_of_character): Remove Schar_bytes. + * emacs.c (fatal_error_signal): Also run Fkill_emacs on SIGINT. (main) [!WINDOWSNT]: Handle SIGINT with fatal_error_signal in batch-mode. diff -r 0554c384e09f -r 515d80e174ba src/character.c --- a/src/character.c Fri Oct 01 19:30:11 2010 -0700 +++ b/src/character.c Fri Oct 01 19:46:13 2010 -0700 @@ -336,16 +336,6 @@ } } -DEFUN ("char-bytes", Fchar_bytes, Schar_bytes, 1, 1, 0, - doc: /* Return 1 regardless of the argument CHAR. -This is now an obsolete function. We keep it just for backward compatibility. -usage: (char-bytes CHAR) */) - (Lisp_Object ch) -{ - CHECK_CHARACTER (ch); - return make_number (1); -} - DEFUN ("char-width", Fchar_width, Schar_width, 1, 1, 0, doc: /* Return width of CHAR when displayed in the current buffer. The width is measured by how many columns it occupies on the screen. @@ -1073,7 +1063,6 @@ defsubr (&Scharacterp); defsubr (&Sunibyte_char_to_multibyte); defsubr (&Smultibyte_char_to_unibyte); - defsubr (&Schar_bytes); defsubr (&Schar_width); defsubr (&Sstring_width); defsubr (&Schar_direction);